As there is a mechanism in PHY drivers to switch the PHY interface
between SGMII and 2500BaseX according to link speed. In this case,
the in-band AN mode should be switching based on the PHY interface
as well, if the PHY interface has been changed/updated by PHY driver.
For e.g., disable in-band AN in 2500BaseX mode, or enable in-band AN
back for SGMII mode (10/100/1000Mbps).
Signed-off-by: Choong Yong Liang <yong.liang.choong@xxxxxxxxxxxxxxx>
---
drivers/net/phy/phylink.c | 30 +++++++++++++++++++++++++++++-
1 file changed, 29 insertions(+), 1 deletion(-)
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 0d7354955d62..5811c8086149 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -1723,6 +1723,34 @@ bool phylink_expects_phy(struct phylink *pl)
}
EXPORT_SYMBOL_GPL(phylink_expects_phy);
+/**
+ * phylink_interface_change() - update both cfg_link_an_mode and
+ * cur_link_an_mode when there is a change in the interface.
+ * @phydev: pointer to &struct phy_device
+ *
+ * When the PHY interface switches between SGMII and 2500BaseX in
+ * accordance with the link speed, the in-band AN mode should also switch
+ * based on the PHY interface
+ */
+static void phylink_interface_change(struct phy_device *phydev)
+{
+ struct phylink *pl = phydev->phylink;
+
+ if (pl->phy_state.interface != phydev->interface) {
+ /* Fallback to the correct AN mode. */
+ if (phy_interface_mode_is_8023z(phydev->interface) &&
+ pl->cfg_link_an_mode == MLO_AN_INBAND) {
+ pl->cfg_link_an_mode = MLO_AN_PHY;
+ pl->cur_link_an_mode = MLO_AN_PHY;
+ } else if (pl->config->ovr_an_inband) {
+ pl->cfg_link_an_mode = MLO_AN_INBAND;
+ pl->cur_link_an_mode = MLO_AN_INBAND;
+ }
+
+ pl->phy_state.interface = phydev->interface;
+ }
+}
+
static void phylink_phy_change(struct phy_device *phydev, bool up)
{
struct phylink *pl = phydev->phylink;
@@ -1739,7 +1767,7 @@ static void phylink_phy_change(struct phy_device *phydev, bool up)
pl->phy_state.pause |= MLO_PAUSE_TX;
if (rx_pause)
pl->phy_state.pause |= MLO_PAUSE_RX;
- pl->phy_state.interface = phydev->interface;
+ phylink_interface_change(phydev);
pl->phy_state.link = up;
mutex_unlock(&pl->state_mutex);
--
2.25.1
