mirror of
https://github.com/VIKINGYFY/immortalwrt.git
synced 2025-12-17 01:26:01 +00:00
738876e76b
changelogs: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.58 Removed upstreamed patches: 1. target/linux/generic/backport-6.12/612-01-v6.17-net-dsa-tag_brcm-legacy-reorganize-functions.patch Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.58&id=a4daaf063f8269a5881154c5b77c5ef6639d65d3 2. target/linux/qualcommax/patches-6.12/0151-arm64-qcom-ipq6018-nss_port5.patch Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.58&id=9a7a5d50ee2e035325de9c720e4842d6759d2374 3. target/linux/realtek/patches-6.12/020-01-v6.18-timer-rtl-otto-work-around-dying-timers.patch Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.58&id=d0e217b33d42bfe52ef7ef447916a23a586e6e5c 4. target/linux/realtek/patches-6.12/020-03-v6.18-timer-rtl-otto-do-not-interfere-with-interrupts.patch Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.58&id=8cc561dd9d02f1753ae34dfdd565662828be9a9d Additional changes: - Manually adapted bcm27xx patch: * 950-0410-media-i2c-adv7180-Add-support-for-V4L2_CID_LINK_FREQ.patch Rebased and adjusted for kernel 6.12 to fix context conflicts. - Synced lantiq DTS (danube.dtsi) with upstream bindings to fix DT validation issues on kernel 6.12. - Manually adapted DTS to match OpenWrt's lantiq DTS layout. Compile-tested on x86_64 Run-tested on x86_64 Signed-off-by: gongzi miao <miaogongzi0227@gmail.com> Link: https://github.com/openwrt/openwrt/pull/20777 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>
|
|
@@ -1369,24 +1370,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));
|
|
@@ -1537,7 +1531,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) {
|