aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSunil Goutham <[email protected]>2018-10-16 16:57:05 +0530
committerDavid S. Miller <[email protected]>2018-10-17 21:33:42 -0700
commit6ca3ee2f7d3a4b6063c14f5ebd1c6076035310ef (patch)
tree9a64837f6433f333f2915caf2e4717f3d25a1fb9
parent53e50a6ec24d83e9d79e6a95a33b7adcd610f772 (diff)
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 <[email protected]> Suggested-by: Arnd Bergmann <[email protected]> Signed-off-by: David S. Miller <[email protected]>
-rw-r--r--drivers/net/ethernet/marvell/octeontx2/af/rvu.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu.c
index 2033f42c3226..7cf5865254bb 100644
--- 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;