net: phy: aquantia: wait for phy init sequence to finish
authorFlorin Chiculita <florinlaurentiu.chiculita@nxp.com>
Mon, 14 Oct 2019 14:27:07 +0000 (17:27 +0300)
committerJoe Hershberger <joe.hershberger@ni.com>
Mon, 9 Dec 2019 15:47:42 +0000 (09:47 -0600)
Aquantia quad-phys may take longer to initialize. This commit adds
a polling mechanism for a global alarm bit that tells if phy init
sequence is completed.

Signed-off-by: Florin Chiculita <florinlaurentiu.chiculita@nxp.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
drivers/net/phy/aquantia.c

index 465ec2d34230342510ab66f0e06937c4543fe2ef..1061fdfc16b525166ed66381fe5b58c38e4003c5 100644 (file)
@@ -37,6 +37,9 @@
 #define GLOBAL_FAULT 0xc850
 #define GLOBAL_RSTATUS_1 0xc885
 
+#define GLOBAL_ALARM_1 0xcc00
+#define SYSTEM_READY_BIT 0x40
+
 #define GLOBAL_STANDARD_CONTROL 0x0
 #define SOFT_RESET BIT(15)
 #define LOW_POWER BIT(11)
@@ -258,6 +261,18 @@ int aquantia_config(struct phy_device *phydev)
 {
        u32 val, id, rstatus, fault;
        u32 reg_val1 = 0;
+       int num_retries = 5;
+
+       /*
+        * check if the system is out of reset and init sequence completed.
+        * chip-wide reset for gen1 quad phys takes longer
+        */
+       while (--num_retries) {
+               rstatus = phy_read(phydev, MDIO_MMD_VEND1, GLOBAL_ALARM_1);
+               if (rstatus & SYSTEM_READY_BIT)
+                       break;
+               mdelay(10);
+       }
 
        id = phy_read(phydev, MDIO_MMD_VEND1, GLOBAL_FIRMWARE_ID);
        rstatus = phy_read(phydev, MDIO_MMD_VEND1, GLOBAL_RSTATUS_1);