3 files changed, 27 insertions, 3 deletions

diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
index a7d16db5c4b2..937f37a5dcb2 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
@@ -1323,7 +1323,7 @@ static int xgbe_read_ext_mii_regs(struct xgbe_prv_data *pdata, int addr,
 static int xgbe_set_ext_mii_mode(struct xgbe_prv_data *pdata, unsigned int port,
                                  enum xgbe_mdio_mode mode)
 {
-        unsigned int reg_val = 0;
+        unsigned int reg_val = XGMAC_IOREAD(pdata, MAC_MDIOCL22R);
 
         switch (mode) {
         case XGBE_MDIO_MODE_CL22:
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
index 3aa457c8ca21..248f60d171a5 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
@@ -1131,12 +1131,12 @@ static void xgbe_stop(struct xgbe_prv_data *pdata)
         hw_if->disable_tx(pdata);
         hw_if->disable_rx(pdata);
 
+        phy_if->phy_stop(pdata);
+
         xgbe_free_irqs(pdata);
 
         xgbe_napi_disable(pdata, 1);
 
-        phy_if->phy_stop(pdata);
-
         hw_if->exit(pdata);
 
         channel = pdata->channel;
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c b/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c
index 9d8c953083b4..e707c49cc55a 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c
@@ -716,6 +716,8 @@ static void xgbe_phy_sfp_phy_settings(struct xgbe_prv_data *pdata)
                 pdata->phy.duplex = DUPLEX_UNKNOWN;
                 pdata->phy.autoneg = AUTONEG_ENABLE;
                 pdata->phy.advertising = pdata->phy.supported;
+
+                return;
         }
 
         pdata->phy.advertising &= ~ADVERTISED_Autoneg;
@@ -875,6 +877,16 @@ static int xgbe_phy_find_phy_device(struct xgbe_prv_data *pdata)
             !phy_data->sfp_phy_avail)
                 return 0;
 
+        /* Set the proper MDIO mode for the PHY */
+        ret = pdata->hw_if.set_ext_mii_mode(pdata, phy_data->mdio_addr,
+                                            phy_data->phydev_mode);
+        if (ret) {
+                netdev_err(pdata->netdev,
+                           "mdio port/clause not compatible (%u/%u)\n",
+                           phy_data->mdio_addr, phy_data->phydev_mode);
+                return ret;
+        }
+
         /* Create and connect to the PHY device */
         phydev = get_phy_device(phy_data->mii, phy_data->mdio_addr,
                                 (phy_data->phydev_mode == XGBE_MDIO_MODE_CL45));
@@ -2722,6 +2734,18 @@ static int xgbe_phy_start(struct xgbe_prv_data *pdata)
         if (ret)
                 return ret;
 
+        /* Set the proper MDIO mode for the re-driver */
+        if (phy_data->redrv && !phy_data->redrv_if) {
+                ret = pdata->hw_if.set_ext_mii_mode(pdata, phy_data->redrv_addr,
+                                                    XGBE_MDIO_MODE_CL22);
+                if (ret) {
+                        netdev_err(pdata->netdev,
+                                   "redriver mdio port not compatible (%u)\n",
+                                   phy_data->redrv_addr);
+                        return ret;
+                }
+        }
+
         /* Start in highest supported mode */
         xgbe_phy_set_mode(pdata, phy_data->start_mode);