82 lines
2.8 KiB
Diff
82 lines
2.8 KiB
Diff
From a4c2233b1e4359b6c64b6f9ba98c8718a11fffee Mon Sep 17 00:00:00 2001
|
|
From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
|
|
Date: Sat, 22 Jul 2023 21:32:54 +0100
|
|
Subject: [PATCH 097/250] net: ethernet: mtk_eth_soc: remove mac_pcs_get_state
|
|
and modernise
|
|
|
|
Remove the .mac_pcs_get_state function, since as far as I can tell is
|
|
never called - no DT appears to specify an in-band-status management
|
|
nor SFP support for this driver.
|
|
|
|
Removal of this, along with the previous patch to remove the incorrect
|
|
clocking configuration, means that the driver becomes non-legacy, so
|
|
we can remove the "legacy_pre_march2020" status from this driver.
|
|
|
|
Reviewed-by: Daniel Golle <daniel@makrotopia.org>
|
|
Tested-by: Daniel Golle <daniel@makrotopia.org>
|
|
Tested-by: Frank Wunderlich <frank-w@public-files.de>
|
|
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
|
|
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
---
|
|
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 35 ---------------------
|
|
1 file changed, 35 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
@@ -554,38 +554,6 @@ static int mtk_mac_finish(struct phylink
|
|
return 0;
|
|
}
|
|
|
|
-static void mtk_mac_pcs_get_state(struct phylink_config *config,
|
|
- struct phylink_link_state *state)
|
|
-{
|
|
- struct mtk_mac *mac = container_of(config, struct mtk_mac,
|
|
- phylink_config);
|
|
- u32 pmsr = mtk_r32(mac->hw, MTK_MAC_MSR(mac->id));
|
|
-
|
|
- state->link = (pmsr & MAC_MSR_LINK);
|
|
- state->duplex = (pmsr & MAC_MSR_DPX) >> 1;
|
|
-
|
|
- switch (pmsr & (MAC_MSR_SPEED_1000 | MAC_MSR_SPEED_100)) {
|
|
- case 0:
|
|
- state->speed = SPEED_10;
|
|
- break;
|
|
- case MAC_MSR_SPEED_100:
|
|
- state->speed = SPEED_100;
|
|
- break;
|
|
- case MAC_MSR_SPEED_1000:
|
|
- state->speed = SPEED_1000;
|
|
- break;
|
|
- default:
|
|
- state->speed = SPEED_UNKNOWN;
|
|
- break;
|
|
- }
|
|
-
|
|
- state->pause &= (MLO_PAUSE_RX | MLO_PAUSE_TX);
|
|
- if (pmsr & MAC_MSR_RX_FC)
|
|
- state->pause |= MLO_PAUSE_RX;
|
|
- if (pmsr & MAC_MSR_TX_FC)
|
|
- state->pause |= MLO_PAUSE_TX;
|
|
-}
|
|
-
|
|
static void mtk_mac_link_down(struct phylink_config *config, unsigned int mode,
|
|
phy_interface_t interface)
|
|
{
|
|
@@ -707,7 +675,6 @@ static void mtk_mac_link_up(struct phyli
|
|
|
|
static const struct phylink_mac_ops mtk_phylink_ops = {
|
|
.mac_select_pcs = mtk_mac_select_pcs,
|
|
- .mac_pcs_get_state = mtk_mac_pcs_get_state,
|
|
.mac_config = mtk_mac_config,
|
|
.mac_finish = mtk_mac_finish,
|
|
.mac_link_down = mtk_mac_link_down,
|
|
@@ -4308,8 +4275,6 @@ static int mtk_add_mac(struct mtk_eth *e
|
|
|
|
mac->phylink_config.dev = ð->netdev[id]->dev;
|
|
mac->phylink_config.type = PHYLINK_NETDEV;
|
|
- /* This driver makes use of state->speed in mac_config */
|
|
- mac->phylink_config.legacy_pre_march2020 = true;
|
|
mac->phylink_config.mac_capabilities = MAC_ASYM_PAUSE | MAC_SYM_PAUSE |
|
|
MAC_10 | MAC_100 | MAC_1000 | MAC_2500FD;
|
|
|