octeontx2-af: Modify rvu_reg_poll() to check reg atleast twice

Currently on the first check if the operation is still not
finished, the poll goes to sleep for 2-5 usecs. But if for
some reason (due to other priority stuff like interrupts etc) by
the time the poll wakes up the 10ms time is expired then we don't
check if operation is finished or not and return failure.

This patch modifies poll logic to check HW operation after sleep so
that the status is checked atleast twice.

Signed-off-by: Sunil Goutham <sgoutham@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu.c
index 3b794df..5ff25bf 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu.c
@@ -88,13 +88,15 @@ int rvu_poll_reg(struct rvu *rvu, u64 block, u64 offset, u64 mask, bool zero)
        u64 reg_val;
 
        reg = rvu->afreg_base + ((block << 28) | offset);
-       while (time_before(jiffies, timeout)) {
-               reg_val = readq(reg);
-               if (zero && !(reg_val & mask))
-                       return 0;
-               if (!zero && (reg_val & mask))
-                       return 0;
+again:
+       reg_val = readq(reg);
+       if (zero && !(reg_val & mask))
+               return 0;
+       if (!zero && (reg_val & mask))
+               return 0;
+       if (time_before(jiffies, timeout)) {
                usleep_range(1, 5);
+               goto again;
        }
        return -EBUSY;
 }