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>
85 lines
2.7 KiB
Diff
85 lines
2.7 KiB
Diff
From a4238f6ce151afa331375d74a5033b76da637644 Mon Sep 17 00:00:00 2001
|
|
From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
|
|
Date: Tue, 16 Nov 2021 10:06:58 +0000
|
|
Subject: [PATCH] net: mtk_eth_soc: use phylink_generic_validate()
|
|
|
|
mtk_eth_soc has no special behaviour in its validation implementation,
|
|
so can be switched to phylink_generic_validate().
|
|
|
|
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 | 53 ++-------------------
|
|
1 file changed, 4 insertions(+), 49 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
@@ -564,56 +564,8 @@ static void mtk_mac_link_up(struct phyli
|
|
mtk_w32(mac->hw, mcr, MTK_MAC_MCR(mac->id));
|
|
}
|
|
|
|
-static void mtk_validate(struct phylink_config *config,
|
|
- unsigned long *supported,
|
|
- struct phylink_link_state *state)
|
|
-{
|
|
- __ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };
|
|
-
|
|
- phylink_set_port_modes(mask);
|
|
- phylink_set(mask, Autoneg);
|
|
-
|
|
- switch (state->interface) {
|
|
- case PHY_INTERFACE_MODE_TRGMII:
|
|
- phylink_set(mask, 1000baseT_Full);
|
|
- break;
|
|
- case PHY_INTERFACE_MODE_1000BASEX:
|
|
- phylink_set(mask, 1000baseX_Full);
|
|
- break;
|
|
- case PHY_INTERFACE_MODE_2500BASEX:
|
|
- phylink_set(mask, 2500baseX_Full);
|
|
- break;
|
|
- case PHY_INTERFACE_MODE_GMII:
|
|
- case PHY_INTERFACE_MODE_RGMII:
|
|
- case PHY_INTERFACE_MODE_RGMII_ID:
|
|
- case PHY_INTERFACE_MODE_RGMII_RXID:
|
|
- case PHY_INTERFACE_MODE_RGMII_TXID:
|
|
- phylink_set(mask, 1000baseT_Half);
|
|
- fallthrough;
|
|
- case PHY_INTERFACE_MODE_SGMII:
|
|
- phylink_set(mask, 1000baseT_Full);
|
|
- phylink_set(mask, 1000baseX_Full);
|
|
- fallthrough;
|
|
- case PHY_INTERFACE_MODE_MII:
|
|
- case PHY_INTERFACE_MODE_RMII:
|
|
- case PHY_INTERFACE_MODE_REVMII:
|
|
- default:
|
|
- phylink_set(mask, 10baseT_Half);
|
|
- phylink_set(mask, 10baseT_Full);
|
|
- phylink_set(mask, 100baseT_Half);
|
|
- phylink_set(mask, 100baseT_Full);
|
|
- break;
|
|
- }
|
|
-
|
|
- phylink_set(mask, Pause);
|
|
- phylink_set(mask, Asym_Pause);
|
|
-
|
|
- linkmode_and(supported, supported, mask);
|
|
- linkmode_and(state->advertising, state->advertising, mask);
|
|
-}
|
|
-
|
|
static const struct phylink_mac_ops mtk_phylink_ops = {
|
|
- .validate = mtk_validate,
|
|
+ .validate = phylink_generic_validate,
|
|
.mac_pcs_get_state = mtk_mac_pcs_get_state,
|
|
.mac_an_restart = mtk_mac_an_restart,
|
|
.mac_config = mtk_mac_config,
|
|
@@ -3317,6 +3269,9 @@ static int mtk_add_mac(struct mtk_eth *e
|
|
|
|
mac->phylink_config.dev = ð->netdev[id]->dev;
|
|
mac->phylink_config.type = PHYLINK_NETDEV;
|
|
+ mac->phylink_config.mac_capabilities = MAC_ASYM_PAUSE | MAC_SYM_PAUSE |
|
|
+ MAC_10 | MAC_100 | MAC_1000 | MAC_2500FD;
|
|
+
|
|
__set_bit(PHY_INTERFACE_MODE_MII,
|
|
mac->phylink_config.supported_interfaces);
|
|
__set_bit(PHY_INTERFACE_MODE_GMII,
|