From: Michael Chan <michael.chan@broadcom.com>

Date: Wed, 20 Feb 2019 19:07:32 -0500

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

Patch-mainline: v5.0-rc8

Git-commit: 0000b81a063b5f3ab82fa18041c28327ce72c312

References: bsc#1086282 FATE#324873

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: 9751e8e71487 ("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>

Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>

---

 drivers/net/ethernet/broadcom/bnxt/bnxt.c |    2 +-

 drivers/net/ethernet/broadcom/bnxt/bnxt.h |    2 +-

 2 files changed, 2 insertions(+), 2 deletions(-)

--- 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

 			dma_rmb();

 			if (*valid)

 				break;

-			udelay(1);

+			usleep_range(1, 5);

 		}

 		if (j >= HWRM_VALID_BIT_DELAY_USEC) {

--- 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