bnxt_en: Wait longer for the firmware message response to complete.

Michael Chan · davem330 · commit 0000b81a063b · 2019-02-22T15:16:56.000-08:00
The code waits up to 20 usec for the firmware response to complete once we've seen the valid response header in the buffer. It turns out that in some scenarios, this wait time is not long enough. Extend it to 150 usec and use usleep_range() instead of udelay(). Fixes: 9751e8e ("bnxt_en: reduce timeout on initial HWRM calls") Signed-off-by: Michael Chan <michael.chan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -3926,7 +3926,7 @@ static int bnxt_hwrm_do_send_msg(struct bnxt *bp, void *msg, u32 msg_len,
 			dma_rmb();
 			if (*valid)
 				break;
-			udelay(1);
+			usleep_range(1, 5);
 		}
 
 		if (j >= HWRM_VALID_BIT_DELAY_USEC) {
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -582,7 +582,7 @@ struct nqe_cn {
 	(HWRM_SHORT_TIMEOUT_COUNTER * HWRM_SHORT_MIN_TIMEOUT +		\
 	 ((n) - HWRM_SHORT_TIMEOUT_COUNTER) * HWRM_MIN_TIMEOUT))
 
-#define HWRM_VALID_BIT_DELAY_USEC	20
+#define HWRM_VALID_BIT_DELAY_USEC	150
 
 #define BNXT_HWRM_CHNL_CHIMP	0
 #define BNXT_HWRM_CHNL_KONG	1

Original file line number	Diff line number	Diff line change
`@@ -3926,7 +3926,7 @@ static int bnxt_hwrm_do_send_msg(struct bnxt bp, void msg, u32 msg_len,`
`3926`	`3926`	`dma_rmb();`
`3927`	`3927`	`if (*valid)`
`3928`	`3928`	`break;`
`3929`		`- udelay(1);`
	`3929`	`+ usleep_range(1, 5);`
`3930`	`3930`	`}`
`3931`	`3931`
`3932`	`3932`	`if (j >= HWRM_VALID_BIT_DELAY_USEC) {`