diff options
| author |   Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2021-10-27 10:49:24 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-10-28 12:55:44 +0100 |
| commit | 76947a635874f740198f73a4e5b06d040fdae5e3 (patch) | |
| tree | 8b5153ef9c1820ae14c5e9fd892462b93b5aa619 /drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | |
| parent | net: mvpp2: remove interface checks in mvpp2_phylink_validate() (diff) | |
| download | linux-dev-76947a635874f740198f73a4e5b06d040fdae5e3.tar.xz linux-dev-76947a635874f740198f73a4e5b06d040fdae5e3.zip | |
net: mvpp2: 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>
Diffstat (limited to 'drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c')
| -rw-r--r-- | drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c index 48703b6dff1e..d5904408e3a5 100644 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c @@ -6303,17 +6303,14 @@ static void mvpp2_phylink_validate(struct phylink_config *config, break; fallthrough; case PHY_INTERFACE_MODE_1000BASEX: + phylink_set(mask, 1000baseT_Full); + phylink_set(mask, 1000baseX_Full); + if (state->interface != PHY_INTERFACE_MODE_NA) + break; + fallthrough; case PHY_INTERFACE_MODE_2500BASEX: - if (port->comphy || - state->interface != PHY_INTERFACE_MODE_2500BASEX) { - phylink_set(mask, 1000baseT_Full); - phylink_set(mask, 1000baseX_Full); - } - if (port->comphy || - state->interface == PHY_INTERFACE_MODE_2500BASEX) { - phylink_set(mask, 2500baseT_Full); - phylink_set(mask, 2500baseX_Full); - } + phylink_set(mask, 2500baseT_Full); + phylink_set(mask, 2500baseX_Full); break; default: goto empty_set; @@ -6321,8 +6318,6 @@ static void mvpp2_phylink_validate(struct phylink_config *config, linkmode_and(supported, supported, mask); linkmode_and(state->advertising, state->advertising, mask); - - phylink_helper_basex_speed(state); return; empty_set: |