net: phy: mscc: improved serdes calibration applied to VSC8584
authorBjarni Jonasson <bjarni.jonasson@microchip.com>
Fri, 19 Mar 2021 13:29:04 +0000 (14:29 +0100)
committerDavid S. Miller <davem@davemloft.net>
Fri, 19 Mar 2021 19:17:30 +0000 (12:17 -0700)
Introduced 'FOJI' serdes calibration in commit 85e97f0b984e
("net: phy: mscc: improved serdes calibration applied to VSC8514")
Now including the VSC8584 family.

Fixes: a5afc1678044a ("net: phy: mscc: add support for VSC8584 PHY.")
Signed-off-by: Bjarni Jonasson <bjarni.jonasson@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/phy/mscc/mscc_main.c

index 2c2a342..2f105da 100644 (file)
@@ -1472,6 +1472,24 @@ static int vsc8584_config_pre_init(struct phy_device *phydev)
        if (ret)
                goto out;
 
+       /* Write patch vector 0, to skip IB cal polling  */
+       phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS, MSCC_PHY_PAGE_EXTENDED_GPIO);
+       reg = MSCC_ROM_TRAP_SERDES_6G_CFG; /* ROM address to trap, for patch vector 0 */
+       ret = phy_base_write(phydev, MSCC_TRAP_ROM_ADDR(1), reg);
+       if (ret)
+               goto out;
+
+       reg = MSCC_RAM_TRAP_SERDES_6G_CFG; /* RAM address to jump to, when patch vector 0 enabled */
+       ret = phy_base_write(phydev, MSCC_PATCH_RAM_ADDR(1), reg);
+       if (ret)
+               goto out;
+
+       reg = phy_base_read(phydev, MSCC_INT_MEM_CNTL);
+       reg |= PATCH_VEC_ZERO_EN; /* bit 8, enable patch vector 0 */
+       ret = phy_base_write(phydev, MSCC_INT_MEM_CNTL, reg);
+       if (ret)
+               goto out;
+
        vsc8584_micro_deassert_reset(phydev, true);
 
 out:
@@ -1537,62 +1555,81 @@ static void vsc85xx_coma_mode_release(struct phy_device *phydev)
        vsc85xx_phy_write_page(phydev, MSCC_PHY_PAGE_STANDARD);
 }
 
-static int vsc8584_config_init(struct phy_device *phydev)
+static int vsc8584_config_host_serdes(struct phy_device *phydev)
 {
        struct vsc8531_private *vsc8531 = phydev->priv;
-       int ret, i;
+       int ret;
        u16 val;
 
-       phydev->mdix_ctrl = ETH_TP_MDI_AUTO;
+       ret = phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS,
+                            MSCC_PHY_PAGE_EXTENDED_GPIO);
+       if (ret)
+               return ret;
 
-       phy_lock_mdio_bus(phydev);
+       val = phy_base_read(phydev, MSCC_PHY_MAC_CFG_FASTLINK);
+       val &= ~MAC_CFG_MASK;
+       if (phydev->interface == PHY_INTERFACE_MODE_QSGMII) {
+               val |= MAC_CFG_QSGMII;
+       } else if (phydev->interface == PHY_INTERFACE_MODE_SGMII) {
+               val |= MAC_CFG_SGMII;
+       } else {
+               ret = -EINVAL;
+               return ret;
+       }
 
-       /* Some parts of the init sequence are identical for every PHY in the
-        * package. Some parts are modifying the GPIO register bank which is a
-        * set of registers that are affecting all PHYs, a few resetting the
-        * microprocessor common to all PHYs. The CRC check responsible of the
-        * checking the firmware within the 8051 microprocessor can only be
-        * accessed via the PHY whose internal address in the package is 0.
-        * All PHYs' interrupts mask register has to be zeroed before enabling
-        * any PHY's interrupt in this register.
-        * For all these reasons, we need to do the init sequence once and only
-        * once whatever is the first PHY in the package that is initialized and
-        * do the correct init sequence for all PHYs that are package-critical
-        * in this pre-init function.
-        */
-       if (phy_package_init_once(phydev)) {
-               /* The following switch statement assumes that the lowest
-                * nibble of the phy_id_mask is always 0. This works because
-                * the lowest nibble of the PHY_ID's below are also 0.
-                */
-               WARN_ON(phydev->drv->phy_id_mask & 0xf);
+       ret = phy_base_write(phydev, MSCC_PHY_MAC_CFG_FASTLINK, val);
+       if (ret)
+               return ret;
 
-               switch (phydev->phy_id & phydev->drv->phy_id_mask) {
-               case PHY_ID_VSC8504:
-               case PHY_ID_VSC8552:
-               case PHY_ID_VSC8572:
-               case PHY_ID_VSC8574:
-                       ret = vsc8574_config_pre_init(phydev);
-                       break;
-               case PHY_ID_VSC856X:
-               case PHY_ID_VSC8575:
-               case PHY_ID_VSC8582:
-               case PHY_ID_VSC8584:
-                       ret = vsc8584_config_pre_init(phydev);
-                       break;
-               default:
-                       ret = -EINVAL;
-                       break;
-               }
+       ret = phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS,
+                            MSCC_PHY_PAGE_STANDARD);
+       if (ret)
+               return ret;
 
-               if (ret)
-                       goto err;
-       }
+       val = PROC_CMD_MCB_ACCESS_MAC_CONF | PROC_CMD_RST_CONF_PORT |
+               PROC_CMD_READ_MOD_WRITE_PORT;
+       if (phydev->interface == PHY_INTERFACE_MODE_QSGMII)
+               val |= PROC_CMD_QSGMII_MAC;
+       else
+               val |= PROC_CMD_SGMII_MAC;
+
+       ret = vsc8584_cmd(phydev, val);
+       if (ret)
+               return ret;
+
+       usleep_range(10000, 20000);
+
+       /* Disable SerDes for 100Base-FX */
+       ret = vsc8584_cmd(phydev, PROC_CMD_FIBER_MEDIA_CONF |
+                         PROC_CMD_FIBER_PORT(vsc8531->addr) |
+                         PROC_CMD_FIBER_DISABLE |
+                         PROC_CMD_READ_MOD_WRITE_PORT |
+                         PROC_CMD_RST_CONF_PORT | PROC_CMD_FIBER_100BASE_FX);
+       if (ret)
+               return ret;
+
+       /* Disable SerDes for 1000Base-X */
+       ret = vsc8584_cmd(phydev, PROC_CMD_FIBER_MEDIA_CONF |
+                         PROC_CMD_FIBER_PORT(vsc8531->addr) |
+                         PROC_CMD_FIBER_DISABLE |
+                         PROC_CMD_READ_MOD_WRITE_PORT |
+                         PROC_CMD_RST_CONF_PORT | PROC_CMD_FIBER_1000BASE_X);
+       if (ret)
+               return ret;
+
+       return vsc85xx_sd6g_config_v2(phydev);
+}
+
+static int vsc8574_config_host_serdes(struct phy_device *phydev)
+{
+       struct vsc8531_private *vsc8531 = phydev->priv;
+       int ret;
+       u16 val;
 
        ret = phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS,
                             MSCC_PHY_PAGE_EXTENDED_GPIO);
        if (ret)
-               goto err;
+               return ret;
 
        val = phy_base_read(phydev, MSCC_PHY_MAC_CFG_FASTLINK);
        val &= ~MAC_CFG_MASK;
@@ -1604,17 +1641,17 @@ static int vsc8584_config_init(struct phy_device *phydev)
                val |= MAC_CFG_RGMII;
        } else {
                ret = -EINVAL;
-               goto err;
+               return ret;
        }
 
        ret = phy_base_write(phydev, MSCC_PHY_MAC_CFG_FASTLINK, val);
        if (ret)
-               goto err;
+               return ret;
 
        ret = phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS,
                             MSCC_PHY_PAGE_STANDARD);
        if (ret)
-               goto err;
+               return ret;
 
        if (!phy_interface_is_rgmii(phydev)) {
                val = PROC_CMD_MCB_ACCESS_MAC_CONF | PROC_CMD_RST_CONF_PORT |
@@ -1626,7 +1663,7 @@ static int vsc8584_config_init(struct phy_device *phydev)
 
                ret = vsc8584_cmd(phydev, val);
                if (ret)
-                       goto err;
+                       return ret;
 
                usleep_range(10000, 20000);
        }
@@ -1638,16 +1675,77 @@ static int vsc8584_config_init(struct phy_device *phydev)
                          PROC_CMD_READ_MOD_WRITE_PORT |
                          PROC_CMD_RST_CONF_PORT | PROC_CMD_FIBER_100BASE_FX);
        if (ret)
-               goto err;
+               return ret;
 
        /* Disable SerDes for 1000Base-X */
-       ret = vsc8584_cmd(phydev, PROC_CMD_FIBER_MEDIA_CONF |
-                         PROC_CMD_FIBER_PORT(vsc8531->addr) |
-                         PROC_CMD_FIBER_DISABLE |
-                         PROC_CMD_READ_MOD_WRITE_PORT |
-                         PROC_CMD_RST_CONF_PORT | PROC_CMD_FIBER_1000BASE_X);
-       if (ret)
-               goto err;
+       return vsc8584_cmd(phydev, PROC_CMD_FIBER_MEDIA_CONF |
+                          PROC_CMD_FIBER_PORT(vsc8531->addr) |
+                          PROC_CMD_FIBER_DISABLE |
+                          PROC_CMD_READ_MOD_WRITE_PORT |
+                          PROC_CMD_RST_CONF_PORT | PROC_CMD_FIBER_1000BASE_X);
+}
+
+static int vsc8584_config_init(struct phy_device *phydev)
+{
+       struct vsc8531_private *vsc8531 = phydev->priv;
+       int ret, i;
+       u16 val;
+
+       phydev->mdix_ctrl = ETH_TP_MDI_AUTO;
+
+       phy_lock_mdio_bus(phydev);
+
+       /* Some parts of the init sequence are identical for every PHY in the
+        * package. Some parts are modifying the GPIO register bank which is a
+        * set of registers that are affecting all PHYs, a few resetting the
+        * microprocessor common to all PHYs. The CRC check responsible of the
+        * checking the firmware within the 8051 microprocessor can only be
+        * accessed via the PHY whose internal address in the package is 0.
+        * All PHYs' interrupts mask register has to be zeroed before enabling
+        * any PHY's interrupt in this register.
+        * For all these reasons, we need to do the init sequence once and only
+        * once whatever is the first PHY in the package that is initialized and
+        * do the correct init sequence for all PHYs that are package-critical
+        * in this pre-init function.
+        */
+       if (phy_package_init_once(phydev)) {
+               /* The following switch statement assumes that the lowest
+                * nibble of the phy_id_mask is always 0. This works because
+                * the lowest nibble of the PHY_ID's below are also 0.
+                */
+               WARN_ON(phydev->drv->phy_id_mask & 0xf);
+
+               switch (phydev->phy_id & phydev->drv->phy_id_mask) {
+               case PHY_ID_VSC8504:
+               case PHY_ID_VSC8552:
+               case PHY_ID_VSC8572:
+               case PHY_ID_VSC8574:
+                       ret = vsc8574_config_pre_init(phydev);
+                       if (ret)
+                               goto err;
+                       ret = vsc8574_config_host_serdes(phydev);
+                       if (ret)
+                               goto err;
+                       break;
+               case PHY_ID_VSC856X:
+               case PHY_ID_VSC8575:
+               case PHY_ID_VSC8582:
+               case PHY_ID_VSC8584:
+                       ret = vsc8584_config_pre_init(phydev);
+                       if (ret)
+                               goto err;
+                       ret = vsc8584_config_host_serdes(phydev);
+                       if (ret)
+                               goto err;
+                       break;
+               default:
+                       ret = -EINVAL;
+                       break;
+               }
+
+               if (ret)
+                       goto err;
+       }
 
        phy_unlock_mdio_bus(phydev);