mirror of
https://github.com/immortalwrt/immortalwrt.git
synced 2025-08-11 06:11:53 +08:00
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>
71 lines
2.4 KiB
Diff
71 lines
2.4 KiB
Diff
From 75f4f7b2b13008803f84768ff90396f9d7553221 Mon Sep 17 00:00:00 2001
|
|
From: Jonas Gorski <jonas.gorski@gmail.com>
|
|
Date: Mon, 2 Jun 2025 21:39:51 +0200
|
|
Subject: [PATCH] net: dsa: b53: do not configure bcm63xx's IMP port interface
|
|
|
|
The IMP port is not a valid RGMII interface, but hard wired to internal,
|
|
so we shouldn't touch the undefined register B53_RGMII_CTRL_IMP.
|
|
|
|
While this does not seem to have any side effects, let's not touch it at
|
|
all, so limit RGMII configuration on bcm63xx to the actual RGMII ports.
|
|
|
|
Fixes: ce3bf94871f7 ("net: dsa: b53: add support for BCM63xx RGMIIs")
|
|
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
|
|
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
|
|
Link: https://patch.msgid.link/20250602193953.1010487-4-jonas.gorski@gmail.com
|
|
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
---
|
|
drivers/net/dsa/b53/b53_common.c | 22 ++++++++--------------
|
|
1 file changed, 8 insertions(+), 14 deletions(-)
|
|
|
|
--- a/drivers/net/dsa/b53/b53_common.c
|
|
+++ b/drivers/net/dsa/b53/b53_common.c
|
|
@@ -22,6 +22,7 @@
|
|
#include <linux/gpio.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/math.h>
|
|
+#include <linux/minmax.h>
|
|
#include <linux/module.h>
|
|
#include <linux/platform_data/b53.h>
|
|
#include <linux/phy.h>
|
|
@@ -1322,24 +1323,17 @@ static void b53_adjust_63xx_rgmii(struct
|
|
phy_interface_t interface)
|
|
{
|
|
struct b53_device *dev = ds->priv;
|
|
- u8 rgmii_ctrl = 0, off;
|
|
-
|
|
- if (port == dev->imp_port)
|
|
- off = B53_RGMII_CTRL_IMP;
|
|
- else
|
|
- off = B53_RGMII_CTRL_P(port);
|
|
+ u8 rgmii_ctrl = 0;
|
|
|
|
- b53_read8(dev, B53_CTRL_PAGE, off, &rgmii_ctrl);
|
|
+ b53_read8(dev, B53_CTRL_PAGE, B53_RGMII_CTRL_P(port), &rgmii_ctrl);
|
|
rgmii_ctrl &= ~(RGMII_CTRL_DLL_RXC | RGMII_CTRL_DLL_TXC);
|
|
|
|
- if (port != dev->imp_port) {
|
|
- if (is63268(dev))
|
|
- rgmii_ctrl |= RGMII_CTRL_MII_OVERRIDE;
|
|
+ if (is63268(dev))
|
|
+ rgmii_ctrl |= RGMII_CTRL_MII_OVERRIDE;
|
|
|
|
- rgmii_ctrl |= RGMII_CTRL_ENABLE_GMII;
|
|
- }
|
|
+ rgmii_ctrl |= RGMII_CTRL_ENABLE_GMII;
|
|
|
|
- b53_write8(dev, B53_CTRL_PAGE, off, rgmii_ctrl);
|
|
+ b53_write8(dev, B53_CTRL_PAGE, B53_RGMII_CTRL_P(port), rgmii_ctrl);
|
|
|
|
dev_dbg(ds->dev, "Configured port %d for %s\n", port,
|
|
phy_modes(interface));
|
|
@@ -1490,7 +1484,7 @@ static void b53_phylink_mac_config(struc
|
|
struct b53_device *dev = ds->priv;
|
|
int port = dp->index;
|
|
|
|
- if (is63xx(dev) && port >= B53_63XX_RGMII0)
|
|
+ if (is63xx(dev) && in_range(port, B53_63XX_RGMII0, 4))
|
|
b53_adjust_63xx_rgmii(ds, port, interface);
|
|
|
|
if (mode == MLO_AN_FIXED) {
|