cb1b656027
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.34 Remove upstreamed patches: generic/backport-6.12/421-01-v6.16-spi-bcm63xx-spi-fix-shared-reset.patch [1] generic/backport-6.12/421-02-v6.16-spi-bcm63xx-hsspi-fix-shared-reset.patch [2] generic/backport-6.12/610-06-v6.16-net-dsa-b53-do-not-enable-RGMII-delay-on-bcm63xx.patch [3] generic/backport-6.12/610-08-v6.16-net-dsa-b53-allow-RGMII-for-bcm63xx-RGMII-ports.patch [4] generic/backport-6.12/610-09-v6.16-net-dsa-b53-do-not-touch-DLL_IQQD-on-bcm53115.patch [5] generic/backport-6.12/611-v6.16-net-dsa-tag_brcm-legacy-fix-pskb_may_pull-length.patch [6] Manually rebased patches: bcm27xx/patches-6.12/950-0665-drm-vc4-tests-Drop-drm-parameter-for-vc4_find_crtc_f.patch [7] [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.34&id=408ca1d1803b223d615f9021055f9ccb4f4863ea [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.34&id=2a98786e258718ff93ef6d6bd26a9a39076e0cb7 [3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.34&id=6d1c93a5c6b0ae87bb7001d8d6fdef3b3be9c6c6 [4] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.34&id=1aa31695bf0dc1ee3e6c559c14db7fd05b6bb102 [5] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.34&id=b2fc08d276797e529cacad6fa9d704a7367090b5 [6] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.34&id=2c32fc56c05aa69439fdfd5e0b25f57e2a158627 [7] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.34&id=aba86d49e5ac3700295ab8c417436abacc19cc32 Signed-off-by: Shiji Yang <yangshiji66@outlook.com> Link: https://github.com/openwrt/openwrt/pull/19184 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
47 lines
1.6 KiB
Diff
47 lines
1.6 KiB
Diff
From 1237c2d4a8db79dfd4369bff6930b0e385ed7d5c Mon Sep 17 00:00:00 2001
|
|
From: Jonas Gorski <jonas.gorski@gmail.com>
|
|
Date: Mon, 2 Jun 2025 21:39:49 +0200
|
|
Subject: [PATCH] net: dsa: b53: do not enable EEE on bcm63xx
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
BCM63xx internal switches do not support EEE, but provide multiple RGMII
|
|
ports where external PHYs may be connected. If one of these PHYs are EEE
|
|
capable, we may try to enable EEE for the MACs, which then hangs the
|
|
system on access of the (non-existent) EEE registers.
|
|
|
|
Fix this by checking if the switch actually supports EEE before
|
|
attempting to configure it.
|
|
|
|
Fixes: 22256b0afb12 ("net: dsa: b53: Move EEE functions to b53")
|
|
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
|
|
Tested-by: Álvaro Fernández Rojas <noltari@gmail.com>
|
|
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
|
|
Link: https://patch.msgid.link/20250602193953.1010487-2-jonas.gorski@gmail.com
|
|
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
---
|
|
drivers/net/dsa/b53/b53_common.c | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/net/dsa/b53/b53_common.c
|
|
+++ b/drivers/net/dsa/b53/b53_common.c
|
|
@@ -2338,6 +2338,9 @@ int b53_eee_init(struct dsa_switch *ds,
|
|
{
|
|
int ret;
|
|
|
|
+ if (!b53_support_eee(ds, port))
|
|
+ return 0;
|
|
+
|
|
ret = phy_init_eee(phy, false);
|
|
if (ret)
|
|
return 0;
|
|
@@ -2352,7 +2355,7 @@ bool b53_support_eee(struct dsa_switch *
|
|
{
|
|
struct b53_device *dev = ds->priv;
|
|
|
|
- return !is5325(dev) && !is5365(dev);
|
|
+ return !is5325(dev) && !is5365(dev) && !is63xx(dev);
|
|
}
|
|
EXPORT_SYMBOL(b53_support_eee);
|
|
|