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>
76 lines
2.7 KiB
Diff
76 lines
2.7 KiB
Diff
From db81ca153814475d7e07365d46a4d1134bd122e2 Mon Sep 17 00:00:00 2001
|
|
From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
|
|
Date: Tue, 16 Nov 2021 10:06:48 +0000
|
|
Subject: [PATCH] net: mtk_eth_soc: remove interface checks in mtk_validate()
|
|
|
|
As phylink checks the interface mode against the supported_interfaces
|
|
bitmap, we no longer need to validate the interface mode, nor handle
|
|
PHY_INTERFACE_MODE_NA in the validation function. Remove these to
|
|
simplify the implementation.
|
|
|
|
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 | 34 ---------------------
|
|
1 file changed, 34 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
@@ -568,24 +568,8 @@ static void mtk_validate(struct phylink_
|
|
unsigned long *supported,
|
|
struct phylink_link_state *state)
|
|
{
|
|
- struct mtk_mac *mac = container_of(config, struct mtk_mac,
|
|
- phylink_config);
|
|
__ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };
|
|
|
|
- if (state->interface != PHY_INTERFACE_MODE_NA &&
|
|
- state->interface != PHY_INTERFACE_MODE_MII &&
|
|
- state->interface != PHY_INTERFACE_MODE_GMII &&
|
|
- !(MTK_HAS_CAPS(mac->hw->soc->caps, MTK_RGMII) &&
|
|
- phy_interface_mode_is_rgmii(state->interface)) &&
|
|
- !(MTK_HAS_CAPS(mac->hw->soc->caps, MTK_TRGMII) &&
|
|
- !mac->id && state->interface == PHY_INTERFACE_MODE_TRGMII) &&
|
|
- !(MTK_HAS_CAPS(mac->hw->soc->caps, MTK_SGMII) &&
|
|
- (state->interface == PHY_INTERFACE_MODE_SGMII ||
|
|
- phy_interface_mode_is_8023z(state->interface)))) {
|
|
- linkmode_zero(supported);
|
|
- return;
|
|
- }
|
|
-
|
|
phylink_set_port_modes(mask);
|
|
phylink_set(mask, Autoneg);
|
|
|
|
@@ -612,7 +596,6 @@ static void mtk_validate(struct phylink_
|
|
case PHY_INTERFACE_MODE_MII:
|
|
case PHY_INTERFACE_MODE_RMII:
|
|
case PHY_INTERFACE_MODE_REVMII:
|
|
- case PHY_INTERFACE_MODE_NA:
|
|
default:
|
|
phylink_set(mask, 10baseT_Half);
|
|
phylink_set(mask, 10baseT_Full);
|
|
@@ -621,23 +604,6 @@ static void mtk_validate(struct phylink_
|
|
break;
|
|
}
|
|
|
|
- if (state->interface == PHY_INTERFACE_MODE_NA) {
|
|
- if (MTK_HAS_CAPS(mac->hw->soc->caps, MTK_SGMII)) {
|
|
- phylink_set(mask, 1000baseT_Full);
|
|
- phylink_set(mask, 1000baseX_Full);
|
|
- phylink_set(mask, 2500baseX_Full);
|
|
- }
|
|
- if (MTK_HAS_CAPS(mac->hw->soc->caps, MTK_RGMII)) {
|
|
- phylink_set(mask, 1000baseT_Full);
|
|
- phylink_set(mask, 1000baseT_Half);
|
|
- phylink_set(mask, 1000baseX_Full);
|
|
- }
|
|
- if (MTK_HAS_CAPS(mac->hw->soc->caps, MTK_GEPHY)) {
|
|
- phylink_set(mask, 1000baseT_Full);
|
|
- phylink_set(mask, 1000baseT_Half);
|
|
- }
|
|
- }
|
|
-
|
|
phylink_set(mask, Pause);
|
|
phylink_set(mask, Asym_Pause);
|
|
|