Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a11f5756 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'bnxt_en-firmware-message-delay-fixes' 



Michael Chan says:

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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ab01f251 0000b81a

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+2 −2
Original line number Diff line number Diff line
@@ -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
@@ -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
Original line number Diff line number Diff line
@@ -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