| From 29cd215aaf6c2050c43e4de03aee436c16f90b96 Mon Sep 17 00:00:00 2001 |
| From: Russell King <rmk+kernel@armlinux.org.uk> |
| Date: Thu, 21 Nov 2019 17:27:14 +0000 |
| Subject: [PATCH 643/660] net: sfp: remove incomplete 100BASE-FX and 100BASE-LX |
| support |
| |
| The 100BASE-FX and 100BASE-LX support assumes a PHY is present; this |
| is probably an incorrect assumption. In any case, sfp_parse_support() |
| will fail such a module. Let's stop pretending we support these |
| modules. |
| |
| Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> |
| --- |
| drivers/net/phy/sfp-bus.c | 4 +--- |
| drivers/net/phy/sfp.c | 13 +------------ |
| 2 files changed, 2 insertions(+), 15 deletions(-) |
| |
| --- a/drivers/net/phy/sfp-bus.c |
| +++ b/drivers/net/phy/sfp-bus.c |
| @@ -342,9 +342,7 @@ phy_interface_t sfp_select_interface(str |
| if (phylink_test(link_modes, 2500baseX_Full)) |
| return PHY_INTERFACE_MODE_2500BASEX; |
| |
| - if (id->base.e1000_base_t || |
| - id->base.e100_base_lx || |
| - id->base.e100_base_fx) |
| + if (id->base.e1000_base_t) |
| return PHY_INTERFACE_MODE_SGMII; |
| |
| if (phylink_test(link_modes, 1000baseX_Full)) |
| --- a/drivers/net/phy/sfp.c |
| +++ b/drivers/net/phy/sfp.c |
| @@ -1513,18 +1513,7 @@ static void sfp_sm_fault(struct sfp *sfp |
| |
| static void sfp_sm_probe_for_phy(struct sfp *sfp) |
| { |
| - /* Setting the serdes link mode is guesswork: there's no |
| - * field in the EEPROM which indicates what mode should |
| - * be used. |
| - * |
| - * If it's a gigabit-only fiber module, it probably does |
| - * not have a PHY, so switch to 802.3z negotiation mode. |
| - * Otherwise, switch to SGMII mode (which is required to |
| - * support non-gigabit speeds) and probe for a PHY. |
| - */ |
| - if (sfp->id.base.e1000_base_t || |
| - sfp->id.base.e100_base_lx || |
| - sfp->id.base.e100_base_fx) |
| + if (sfp->id.base.e1000_base_t) |
| sfp_sm_probe_phy(sfp); |
| } |
| |