Pārlūkot izejas kodu

net: dsa: b53: Also include SGMII for mac_config and mac_link_state

In both 802.3z and SGMII modes we need to configure the MAC accordingly
to flip between Fiber and SGMII modes, and we need to read the MAC
status from the SGMII in-band control word.

Fixes: 0e01491de646 ("net: dsa: b53: Add SerDes support")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Florian Fainelli 7 gadi atpakaļ
vecāks
revīzija
55a4d2eac3
1 mainītis faili ar 6 papildinājumiem un 4 dzēšanām
  1. 6 4
      drivers/net/dsa/b53/b53_common.c

+ 6 - 4
drivers/net/dsa/b53/b53_common.c

@@ -1172,8 +1172,9 @@ int b53_phylink_mac_link_state(struct dsa_switch *ds, int port,
 	struct b53_device *dev = ds->priv;
 	struct b53_device *dev = ds->priv;
 	int ret = -EOPNOTSUPP;
 	int ret = -EOPNOTSUPP;
 
 
-	if (phy_interface_mode_is_8023z(state->interface) &&
-	    dev->ops->serdes_link_state)
+	if ((phy_interface_mode_is_8023z(state->interface) ||
+	     state->interface == PHY_INTERFACE_MODE_SGMII) &&
+	     dev->ops->serdes_link_state)
 		ret = dev->ops->serdes_link_state(dev, port, state);
 		ret = dev->ops->serdes_link_state(dev, port, state);
 
 
 	return ret;
 	return ret;
@@ -1195,8 +1196,9 @@ void b53_phylink_mac_config(struct dsa_switch *ds, int port,
 		return;
 		return;
 	}
 	}
 
 
-	if (phy_interface_mode_is_8023z(state->interface) &&
-	    dev->ops->serdes_config)
+	if ((phy_interface_mode_is_8023z(state->interface) ||
+	     state->interface == PHY_INTERFACE_MODE_SGMII) &&
+	     dev->ops->serdes_config)
 		dev->ops->serdes_config(dev, port, mode, state);
 		dev->ops->serdes_config(dev, port, mode, state);
 }
 }
 EXPORT_SYMBOL(b53_phylink_mac_config);
 EXPORT_SYMBOL(b53_phylink_mac_config);