From: Vivien Didelot Date: Fri, 9 Aug 2019 22:47:53 +0000 (-0400) Subject: net: dsa: mv88e6xxx: wait for 88E6185 PPU disabled X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=929938536fc0b1628fec8aff62a756e1c4f506d2;p=linux.git 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 Signed-off-by: David S. Miller --- diff --git a/drivers/net/dsa/mv88e6xxx/global1.c b/drivers/net/dsa/mv88e6xxx/global1.c index 1323ef30a5e98..bbd31c9f8b487 100644 --- 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);