amd-xgbe: Be sure to set MDIO modes on device (re)start

The MDIO register mode is set when the device is probed. But when the
device is brought down and then back up, the MDIO register mode has been
reset.  Be sure to reset the mode during device startup and only change
the mode of the address specified.

Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
index a7d16db5c4b21d8f9d80d9801259419da8def379..937f37a5dcb2cded9963b3732bddb08557ad50ba 100644 (file)
--- 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-phy-v2.c b/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c
index 9d8c953083b4efa0c430c8b3e539625a90f4b1fb..04804cbb7dc1cd694567667074900e90ae3c6768 100644 (file)
--- a/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c
@@ -875,6 +875,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 +2732,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);