mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
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
|
|
@@ -577,24 +577,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);
|
|
|
|
@@ -621,7 +605,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);
|
|
@@ -630,23 +613,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);
|
|
|