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>
70 lines
2.6 KiB
Diff
70 lines
2.6 KiB
Diff
From c86692fc2cb77d94dd8c166c2b9017f196d02a84 Mon Sep 17 00:00:00 2001
|
|
From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
|
|
Date: Tue, 10 Dec 2024 14:18:26 +0000
|
|
Subject: [PATCH] net: dsa: b53/bcm_sf2: implement .support_eee() method
|
|
|
|
Implement the .support_eee() method to indicate that EEE is not
|
|
supported by two switch variants, rather than making these checks in
|
|
the .set_mac_eee() and .get_mac_eee() methods.
|
|
|
|
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
|
|
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
|
|
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
|
|
Link: https://patch.msgid.link/E1tL14E-006cZU-Nc@rmk-PC.armlinux.org.uk
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/dsa/b53/b53_common.c | 13 +++++++------
|
|
drivers/net/dsa/b53/b53_priv.h | 1 +
|
|
2 files changed, 8 insertions(+), 6 deletions(-)
|
|
|
|
--- a/drivers/net/dsa/b53/b53_common.c
|
|
+++ b/drivers/net/dsa/b53/b53_common.c
|
|
@@ -2343,13 +2343,16 @@ int b53_eee_init(struct dsa_switch *ds,
|
|
}
|
|
EXPORT_SYMBOL(b53_eee_init);
|
|
|
|
-int b53_get_mac_eee(struct dsa_switch *ds, int port, struct ethtool_keee *e)
|
|
+bool b53_support_eee(struct dsa_switch *ds, int port)
|
|
{
|
|
struct b53_device *dev = ds->priv;
|
|
|
|
- if (is5325(dev) || is5365(dev))
|
|
- return -EOPNOTSUPP;
|
|
+ return !is5325(dev) && !is5365(dev);
|
|
+}
|
|
+EXPORT_SYMBOL(b53_support_eee);
|
|
|
|
+int b53_get_mac_eee(struct dsa_switch *ds, int port, struct ethtool_keee *e)
|
|
+{
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL(b53_get_mac_eee);
|
|
@@ -2359,9 +2362,6 @@ int b53_set_mac_eee(struct dsa_switch *d
|
|
struct b53_device *dev = ds->priv;
|
|
struct ethtool_keee *p = &dev->ports[port].eee;
|
|
|
|
- if (is5325(dev) || is5365(dev))
|
|
- return -EOPNOTSUPP;
|
|
-
|
|
p->eee_enabled = e->eee_enabled;
|
|
b53_eee_enable_set(ds, port, e->eee_enabled);
|
|
|
|
@@ -2418,6 +2418,7 @@ static const struct dsa_switch_ops b53_s
|
|
.port_setup = b53_setup_port,
|
|
.port_enable = b53_enable_port,
|
|
.port_disable = b53_disable_port,
|
|
+ .support_eee = b53_support_eee,
|
|
.get_mac_eee = b53_get_mac_eee,
|
|
.set_mac_eee = b53_set_mac_eee,
|
|
.port_bridge_join = b53_br_join,
|
|
--- a/drivers/net/dsa/b53/b53_priv.h
|
|
+++ b/drivers/net/dsa/b53/b53_priv.h
|
|
@@ -387,6 +387,7 @@ int b53_enable_port(struct dsa_switch *d
|
|
void b53_disable_port(struct dsa_switch *ds, int port);
|
|
void b53_brcm_hdr_setup(struct dsa_switch *ds, int port);
|
|
int b53_eee_init(struct dsa_switch *ds, int port, struct phy_device *phy);
|
|
+bool b53_support_eee(struct dsa_switch *ds, int port);
|
|
int b53_get_mac_eee(struct dsa_switch *ds, int port, struct ethtool_keee *e);
|
|
int b53_set_mac_eee(struct dsa_switch *ds, int port, struct ethtool_keee *e);
|
|
|