From 0fe91559d9999183757c74e720ee48501f1e8b85 Mon Sep 17 00:00:00 2001

From: Edwin Peer <edwin.peer@broadcom.com>

Date: Thu, 11 Feb 2021 02:24:23 -0500

Subject: [PATCH 01/19] bnxt_en: reverse order of TX disable and carrier off

Git-commit: 132e0b65dc2b8bfa9721bfce834191f24fd1d7ed

Patch-mainline: v5.12-rc1

References: git-fixes

A TX queue can potentially immediately timeout after it is stopped

and the last TX timestamp on that queue was more than 5 seconds ago with

carrier still up.  Prevent these intermittent false TX timeouts

by bringing down carrier first before calling netif_tx_disable().

Fixes: c0c050c58d84 ("bnxt_en: New Broadcom ethernet driver.")

Signed-off-by: Edwin Peer <edwin.peer@broadcom.com>

Signed-off-by: Michael Chan <michael.chan@broadcom.com>

Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Denis Kirjanov <denis.kirjanov@suse.com>

---

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

 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c

index b1ba6df8911d..3c14d1a2efaa 100644

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

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

@@ -7776,9 +7776,10 @@ void bnxt_tx_disable(struct bnxt *bp)

 			txr->dev_state = BNXT_DEV_STATE_CLOSING;

 		}

 	}

+	/* Drop carrier first to prevent TX timeout */

+	netif_carrier_off(bp->dev);

 	/* Stop all TX queues */

 	netif_tx_disable(bp->dev);

-	netif_carrier_off(bp->dev);

 }

 void bnxt_tx_enable(struct bnxt *bp)

-- 

2.16.4