d59d69f9e1
Manually rebased:
backport-5.15/704-15-v5.19-net-mtk_eth_soc-move-MAC_MCR-setting-to-mac_finish.patch
Removed upstreamed:
backport-5.15/060-v6.0-01-tools-build-Add-feature-test-for-init_disassemble_in.patch[1]
backport-5.15/060-v6.0-02-tools-include-add-dis-asm-compat.h-to-handle-version.patch[2]
backport-5.15/060-v6.0-03-tools-perf-Fix-compilation-error-with-new-binutils.patch[3]
backport-5.15/060-v6.0-04-tools-bpf_jit_disasm-Fix-compilation-error-with-new-.patch[4]
backport-5.15/060-v6.0-05-tools-bpftool-Fix-compilation-error-with-new-binutil.patch[5]
pending-5.15/733-02-net-ethernet-mtk_eth_soc-fix-RX-data-corruption-issu.patch[6]
bcm47xx/patches-5.15/170-bgmac-fix-initial-chip-reset-to-support-BCM5358.patch[7]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=51b99dc38c1a053e2e732d7f9e2740e343ae7eae
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=451c9d7b16169645ed291ebb2ca9844caa088f2d
3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=97f005c0bdbaf656a7808586d234965385a06c58
4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=1c27fab243333821375e4d63128d60093fdbe149
5. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=4441a90091931fd81607567961dc122f24f735bb
6. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=2adc29350a5b4669544566f71f208d2abaec60ab
7. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=04bfc5bcdfc0fdb73587487c71b04d63807ae15a
Build system: x86_64
Build-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod
Run-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod
Signed-off-by: John Audia <therealgraysky@proton.me>
43 lines
1.6 KiB
Diff
43 lines
1.6 KiB
Diff
From 71d927494463c4f016d828e1134da26b7e961af5 Mon Sep 17 00:00:00 2001
|
|
From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
|
|
Date: Tue, 16 Nov 2021 10:06:53 +0000
|
|
Subject: [PATCH] net: mtk_eth_soc: drop use of phylink_helper_basex_speed()
|
|
|
|
Now that we have a better method to select SFP interface modes, we
|
|
no longer need to use phylink_helper_basex_speed() in a driver's
|
|
validation function, and we can also get rid of our hack to indicate
|
|
both 1000base-X and 2500base-X if the comphy is present to make that
|
|
work. Remove this hack and use of phylink_helper_basex_speed().
|
|
|
|
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 8 ++------
|
|
1 file changed, 2 insertions(+), 6 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
@@ -578,8 +578,9 @@ static void mtk_validate(struct phylink_
|
|
phylink_set(mask, 1000baseT_Full);
|
|
break;
|
|
case PHY_INTERFACE_MODE_1000BASEX:
|
|
- case PHY_INTERFACE_MODE_2500BASEX:
|
|
phylink_set(mask, 1000baseX_Full);
|
|
+ break;
|
|
+ case PHY_INTERFACE_MODE_2500BASEX:
|
|
phylink_set(mask, 2500baseX_Full);
|
|
break;
|
|
case PHY_INTERFACE_MODE_GMII:
|
|
@@ -609,11 +610,6 @@ static void mtk_validate(struct phylink_
|
|
|
|
linkmode_and(supported, supported, mask);
|
|
linkmode_and(state->advertising, state->advertising, mask);
|
|
-
|
|
- /* We can only operate at 2500BaseX or 1000BaseX. If requested
|
|
- * to advertise both, only report advertising at 2500BaseX.
|
|
- */
|
|
- phylink_helper_basex_speed(state);
|
|
}
|
|
|
|
static const struct phylink_mac_ops mtk_phylink_ops = {
|