forked from Openwrt/openwrt
ee035de0fd
Import patches from Linux v5.16 and v5.17 to get 2500Base-X SFP working
again with mvneta driver after the generic phylink validate backport.
Fixes: aab466f422 ("kernel: backport generic phylink validate")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
56 lines
2.2 KiB
Diff
56 lines
2.2 KiB
Diff
From 099cbfa286ab937d8213c2dc5c0b401969b78042 Mon Sep 17 00:00:00 2001
|
|
From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
|
|
Date: Wed, 27 Oct 2021 10:03:53 +0100
|
|
Subject: [PATCH] net: mvneta: drop use of phylink_helper_basex_speed()
|
|
|
|
Now that we have a better method to select SFP interface modes, we
|
|
no longer need to use phylink_helper_basex_speed() in a driver's
|
|
validation function, and we can also get rid of our hack to indicate
|
|
both 1000base-X and 2500base-X if the comphy is present to make that
|
|
work. Remove this hack and use of phylink_helper_basex_speed().
|
|
|
|
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/ethernet/marvell/mvneta.c | 12 +++---------
|
|
1 file changed, 3 insertions(+), 9 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/marvell/mvneta.c
|
|
+++ b/drivers/net/ethernet/marvell/mvneta.c
|
|
@@ -3824,8 +3824,6 @@ static void mvneta_validate(struct phyli
|
|
unsigned long *supported,
|
|
struct phylink_link_state *state)
|
|
{
|
|
- struct net_device *ndev = to_net_dev(config->dev);
|
|
- struct mvneta_port *pp = netdev_priv(ndev);
|
|
__ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };
|
|
|
|
/* We only support QSGMII, SGMII, 802.3z and RGMII modes.
|
|
@@ -3847,11 +3845,12 @@ static void mvneta_validate(struct phyli
|
|
phylink_set(mask, Pause);
|
|
|
|
/* Half-duplex at speeds higher than 100Mbit is unsupported */
|
|
- if (pp->comphy || state->interface != PHY_INTERFACE_MODE_2500BASEX) {
|
|
+ if (state->interface != PHY_INTERFACE_MODE_2500BASEX) {
|
|
phylink_set(mask, 1000baseT_Full);
|
|
phylink_set(mask, 1000baseX_Full);
|
|
}
|
|
- if (pp->comphy || state->interface == PHY_INTERFACE_MODE_2500BASEX) {
|
|
+
|
|
+ if (state->interface == PHY_INTERFACE_MODE_2500BASEX) {
|
|
phylink_set(mask, 2500baseT_Full);
|
|
phylink_set(mask, 2500baseX_Full);
|
|
}
|
|
@@ -3866,11 +3865,6 @@ static void mvneta_validate(struct phyli
|
|
|
|
linkmode_and(supported, supported, mask);
|
|
linkmode_and(state->advertising, state->advertising, mask);
|
|
-
|
|
- /* We can only operate at 2500BaseX or 1000BaseX. If requested
|
|
- * to advertise both, only report advertising at 2500BaseX.
|
|
- */
|
|
- phylink_helper_basex_speed(state);
|
|
}
|
|
|
|
static void mvneta_mac_pcs_get_state(struct phylink_config *config,
|