octeontx2-af: Improve register polling loop

Instead of looping on a integer timeout, use time_before(jiffies),
so that maximum poll time is capped.

Signed-off-by: Sunil Goutham <sgoutham@marvell.com>
Suggested-by: Arnd Bergmann <arnd@arndb.de>
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 2033f42c322679722783ba2c0e04a9e27df23b17..7cf5865254bb67fe42e5ed3da44473714263dcdf 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu.c
@@ -47,18 +47,18 @@ MODULE_DEVICE_TABLE(pci, rvu_id_table);
  */
 int rvu_poll_reg(struct rvu *rvu, u64 block, u64 offset, u64 mask, bool zero)
 {
+       unsigned long timeout = jiffies + usecs_to_jiffies(100);
        void __iomem *reg;
-       int timeout = 100;
        u64 reg_val;
 
        reg = rvu->afreg_base + ((block << 28) | offset);
-       while (timeout) {
+       while (time_before(jiffies, timeout)) {
                reg_val = readq(reg);
                if (zero && !(reg_val & mask))
                        return 0;
                if (!zero && (reg_val & mask))
                        return 0;
-               usleep_range(1, 2);
+               usleep_range(1, 5);
                timeout--;
        }
        return -EBUSY;