git.openwrt.org Git - openwrt/staging/ldir.git/blob

   1 From 099cbfa286ab937d8213c2dc5c0b401969b78042 Mon Sep 17 00:00:00 2001
   2 From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
   3 Date: Wed, 27 Oct 2021 10:03:53 +0100
   4 Subject: [PATCH] net: mvneta: drop use of phylink_helper_basex_speed()
   5
   6 Now that we have a better method to select SFP interface modes, we
   7 no longer need to use phylink_helper_basex_speed() in a driver's
   8 validation function, and we can also get rid of our hack to indicate
   9 both 1000base-X and 2500base-X if the comphy is present to make that
  10 work. Remove this hack and use of phylink_helper_basex_speed().
  11
  12 Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
  13 Signed-off-by: David S. Miller <davem@davemloft.net>
  14 ---
  15  drivers/net/ethernet/marvell/mvneta.c | 12 +++---------
  16  1 file changed, 3 insertions(+), 9 deletions(-)
  17
  18 --- a/drivers/net/ethernet/marvell/mvneta.c
  19 +++ b/drivers/net/ethernet/marvell/mvneta.c
  20 @@ -3824,8 +3824,6 @@ static void mvneta_validate(struct phyli
  21                             unsigned long *supported,
  22                             struct phylink_link_state *state)
  23  {
  24 -       struct net_device *ndev = to_net_dev(config->dev);
  25 -       struct mvneta_port *pp = netdev_priv(ndev);
  26         __ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };
  27
  28         /* We only support QSGMII, SGMII, 802.3z and RGMII modes.
  29 @@ -3847,11 +3845,12 @@ static void mvneta_validate(struct phyli
  30         phylink_set(mask, Pause);
  31
  32         /* Half-duplex at speeds higher than 100Mbit is unsupported */
  33 -       if (pp->comphy || state->interface != PHY_INTERFACE_MODE_2500BASEX) {
  34 +       if (state->interface != PHY_INTERFACE_MODE_2500BASEX) {
  35                 phylink_set(mask, 1000baseT_Full);
  36                 phylink_set(mask, 1000baseX_Full);
  37         }
  38 -       if (pp->comphy || state->interface == PHY_INTERFACE_MODE_2500BASEX) {
  39 +
  40 +       if (state->interface == PHY_INTERFACE_MODE_2500BASEX) {
  41                 phylink_set(mask, 2500baseT_Full);
  42                 phylink_set(mask, 2500baseX_Full);
  43         }
  44 @@ -3866,11 +3865,6 @@ static void mvneta_validate(struct phyli
  45
  46         linkmode_and(supported, supported, mask);
  47         linkmode_and(state->advertising, state->advertising, mask);
  48 -
  49 -       /* We can only operate at 2500BaseX or 1000BaseX.  If requested
  50 -        * to advertise both, only report advertising at 2500BaseX.
  51 -        */
  52 -       phylink_helper_basex_speed(state);
  53  }
  54
  55  static void mvneta_mac_pcs_get_state(struct phylink_config *config,