8590531048
Manually rebased: bcm4908/patches-5.15/071-v6.1-0001-net-broadcom-bcm4908_enet-handle-EPROBE_DEFER-when-g.patch bcm53xx/patches-5.15/180-usb-xhci-add-support-for-performing-fake-doorbell.patch ipq40xx/patches-5.15/902-dts-ipq4019-ap-dk04.1.patch[*] Removed upstreamed: backport-5.15/735-v6.5-net-bgmac-postpone-turning-IRQs-off-to-avoid-SoC-han.patch[1] backport-5.15/817-v6.5-01-leds-trigger-netdev-Recheck-NETDEV_LED_MODE_LINKUP-o.patch[2] pending-5.15/143-jffs2-reduce-stack-usage-in-jffs2_build_xattr_subsys.patch[3] pending-5.15/160-workqueue-fix-enum-type-for-gcc-13.patch[4] bcm53xx/patches-5.15/036-v6.5-0003-ARM-dts-BCM5301X-Drop-clock-names-from-the-SPI-node.patch[5] bcm53xx/patches-5.15/036-v6.5-0015-ARM-dts-BCM5301X-fix-duplex-full-full-duplex.patch[6] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.123&id=02474292a44205c1eb5a03634ead155a3c9134f4 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.123&id=86b93cbfe104e99fd3d25a49748b99fb88101573 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.123&id=79b9ab357b6f5675007f4c02ff8765cbd8dc06a2 4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.123&id=d528faa9e828b9fc46dfb684a2a9fd8c2e860ed8 5. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.123&id=5899bc4058e89d5110a23797ff94439c53b77c25 6. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.123&id=95afd2c7c7d26087730dc938709e025a303e5499 Build system: x86/64 Build-tested: ramips/tplink_archer-a6-v3 Run-tested: ramips/tplink_archer-a6-v3 Co-authored-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: John Audia <therealgraysky@proton.me> [rebased ipq40xx/patches-5.15/902-dts-ipq4019-ap-dk04.1.patch ] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
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,
|
|
@@ -3310,6 +3262,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,
|