bnxt_en: firmware message delay fixes.
Michael Chan
maintainercover bnxt_en: firmware message delay fixes.
We were seeing some intermittent firmware message timeouts in our lab and these 2 small patches fix them. Please apply to stable as well. Thanks.
Michael Chan (2):
bnxt_en: Fix typo in firmware message timeout logic.
bnxt_en: Wait longer for the firmware message response to complete.
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 4 ++-- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
Signature · 1 line
2.5.1
Michael Chan
maintainerPATCH 1/2 bnxt_en: Fix typo in firmware message timeout logic.
The logic that polls for the firmware message response uses a shorter sleep interval for the first few passes. But there was a typo so it was using the wrong counter (larger counter) for these short sleep passes. The result is a slightly shorter timeout period for these firmware messages than intended. Fix it by using the proper counter.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +1 -1
@@ -3903,7 +3903,7 @@ static int bnxt_hwrm_do_send_msg(struct bnxt *bp, void *msg, u32 msg_len,if (len)break ;/* on first few passes, just barely sleep */ -if (i <DFLT_HWRM_CMD_TIMEOUT ) +if (i <HWRM_SHORT_TIMEOUT_COUNTER )usleep_range (HWRM_SHORT_MIN_TIMEOUT ,HWRM_SHORT_MAX_TIMEOUT );else
Signature · 1 line
2.5.1
Michael Chan
maintainerPATCH 2/2 bnxt_en: Wait longer for the firmware message response to complete.
In reply to Michael ChanThe 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().
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +1 -1
@@ -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 ) {
drivers/net/ethernet/broadcom/bnxt/bnxt.h +1 -1
@@ -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
Signature · 1 line
2.5.1
David Miller
maintainerFrom: Michael Chan <[email protected]>
Date: Wed, 20 Feb 2019 19:07:30 -0500
Quoted 2 lines
We were seeing some intermittent firmware message timeouts in our lab and these 2 small patches fix them. Please apply to stable as well. Thanks.
Applied and queued up, thanks!