net: dsa: mv88e6xxx: wait for 88E6185 PPU disabled

The PPU state of 88E6185 can be either "Disabled at Reset" or
"Disabled after Initialization". Because we intentionally clear the
PPU Enabled bit before checking its state, it is safe to wait for the
MV88E6185_G1_STS_PPU_STATE_DISABLED state explicitly instead of waiting
for any state different than MV88E6185_G1_STS_PPU_STATE_POLLING.

Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/mv88e6xxx/global1.c b/drivers/net/dsa/mv88e6xxx/global1.c
index 1323ef30a5e98e432959e865c485e3615505e857..bbd31c9f8b4873cabf34eda5a01e2551942805d9 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/global1.c
+++ b/drivers/net/dsa/mv88e6xxx/global1.c
@@ -46,7 +46,7 @@ static int mv88e6185_g1_wait_ppu_disabled(struct mv88e6xxx_chip *chip)
 
                /* Check the value of the PPUState bits 15:14 */
                state &= MV88E6185_G1_STS_PPU_STATE_MASK;
-               if (state != MV88E6185_G1_STS_PPU_STATE_POLLING)
+               if (state == MV88E6185_G1_STS_PPU_STATE_DISABLED)
                        return 0;
 
                usleep_range(1000, 2000);