amd-xgbe: fix link status handling in xgbe_rx_adaptation

The link status bit is latched low to allow detection of momentary
link drops. If the status indicates that the link is already down,
read it again to obtain the current state.

Fixes: 4f3b20bfbb75 ("amd-xgbe: add support for rx-adaptation")
Signed-off-by: Raju Rangoju <Raju.Rangoju@amd.com>
Link: https://patch.msgid.link/20260306111629.1515676-2-Raju.Rangoju@amd.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c b/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c
index c63ddb12237eaa0f8685e729e4a084ce5d0a94fa..13c556dc0d67af927f58714c3c963242de3bb2af 100644 (file)
--- a/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c
@@ -1942,7 +1942,7 @@ static void xgbe_set_rx_adap_mode(struct xgbe_prv_data *pdata,
 static void xgbe_rx_adaptation(struct xgbe_prv_data *pdata)
 {
        struct xgbe_phy_data *phy_data = pdata->phy_data;
-       unsigned int reg;
+       int reg;
 
        /* step 2: force PCS to send RX_ADAPT Req to PHY */
        XMDIO_WRITE_BITS(pdata, MDIO_MMD_PMAPMD, MDIO_PMA_RX_EQ_CTRL4,
@@ -1964,11 +1964,20 @@ static void xgbe_rx_adaptation(struct xgbe_prv_data *pdata)
 
        /* Step 4: Check for Block lock */
 
-       /* Link status is latched low, so read once to clear
-        * and then read again to get current state
-        */
-       reg = XMDIO_READ(pdata, MDIO_MMD_PCS, MDIO_STAT1);
        reg = XMDIO_READ(pdata, MDIO_MMD_PCS, MDIO_STAT1);
+       if (reg < 0)
+               goto set_mode;
+
+       /* Link status is latched low so that momentary link drops
+        * can be detected. If link was already down read again
+        * to get the latest state.
+        */
+       if (!pdata->phy.link && !(reg & MDIO_STAT1_LSTATUS)) {
+               reg = XMDIO_READ(pdata, MDIO_MMD_PCS, MDIO_STAT1);
+               if (reg < 0)
+                       goto set_mode;
+       }
+
        if (reg & MDIO_STAT1_LSTATUS) {
                /* If the block lock is found, update the helpers
                 * and declare the link up