bnxt: no max_tpa until v5.4-rc1~131^2~335^2~12

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

2 files changed, 0 insertions, 60 deletions

diff --git a/queue/bnxt_en-Fix-completion-ring-sizing-with-TPA-enabled.patch b/queue/bnxt_en-Fix-completion-ring-sizing-with-TPA-enabled.patch
deleted file mode 100644
index 6ee9a3ca..00000000
--- a/queue/bnxt_en-Fix-completion-ring-sizing-with-TPA-enabled.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 27640ce68d21e556b66bc5fa022aacd26e53c947 Mon Sep 17 00:00:00 2001
-From: Michael Chan <michael.chan@broadcom.com>
-Date: Sat, 11 Jul 2020 20:48:25 -0400
-Subject: [PATCH] bnxt_en: Fix completion ring sizing with TPA enabled.
-
-commit 27640ce68d21e556b66bc5fa022aacd26e53c947 upstream.
-
-The current completion ring sizing formula is wrong with TPA enabled.
-The formula assumes that the number of TPA completions are bound by the
-RX ring size, but that's not true.  TPA_START completions are immediately
-recycled so they are not bound by the RX ring size.  We must add
-bp->max_tpa to the worst case maximum RX and TPA completions.
-
-The completion ring can overflow because of this mistake.  This will
-cause hardware to disable the completion ring when this happens,
-leading to RX and TX traffic to stall on that ring.  This issue is
-generally exposed only when the RX ring size is set very small.
-
-Fix the formula by adding bp->max_tpa to the number of RX completions
-if TPA is enabled.
-
-Fixes: c0c050c58d84 ("bnxt_en: New Broadcom ethernet driver.");
-Reviewed-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
-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
-index 28147e414081..7463a1847ceb 100644
---- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
-+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
-@@ -3418,7 +3418,7 @@ void bnxt_set_tpa_flags(struct bnxt *bp)
-  */
- void bnxt_set_ring_params(struct bnxt *bp)
- {
--	u32 ring_size, rx_size, rx_space;
-+	u32 ring_size, rx_size, rx_space, max_rx_cmpl;
- 	u32 agg_factor = 0, agg_ring_size = 0;
- 
- 	/* 8 for CRC and VLAN */
-@@ -3474,7 +3474,15 @@ void bnxt_set_ring_params(struct bnxt *bp)
- 	bp->tx_nr_pages = bnxt_calc_nr_ring_pages(ring_size, TX_DESC_CNT);
- 	bp->tx_ring_mask = (bp->tx_nr_pages * TX_DESC_CNT) - 1;
- 
--	ring_size = bp->rx_ring_size * (2 + agg_factor) + bp->tx_ring_size;
-+	max_rx_cmpl = bp->rx_ring_size;
-+	/* MAX TPA needs to be added because TPA_START completions are
-+	 * immediately recycled, so the TPA completions are not bound by
-+	 * the RX ring size.
-+	 */
-+	if (bp->flags & BNXT_FLAG_TPA)
-+		max_rx_cmpl += bp->max_tpa;
-+	/* RX and TPA completions are 32-byte, all others are 16-byte */
-+	ring_size = max_rx_cmpl * 2 + agg_ring_size + bp->tx_ring_size;
- 	bp->cp_ring_size = ring_size;
- 
- 	bp->cp_nr_pages = bnxt_calc_nr_ring_pages(ring_size, CP_DESC_CNT);
--- 
-2.27.0
-
diff --git a/queue/series b/queue/series
index 8a2b5d46..ee8a4dfb 100644
--- a/queue/series
+++ b/queue/series
@@ -29,7 +29,6 @@ btrfs-fix-double-free-on-ulist-after-backref-resolut.patch
 btrfs-fix-mount-failure-caused-by-race-with-umount.patch
 btrfs-fix-page-leaks-after-failure-to-lock-page-for-.patch
 bnxt_en-Fix-race-when-modifying-pause-settings.patch
-bnxt_en-Fix-completion-ring-sizing-with-TPA-enabled.patch
 fpga-dfl-fix-bug-in-port-reset-handshake.patch
 hippi-Fix-a-size-used-in-a-pci_free_consistent-in-an.patch
 RDMA-mlx5-Use-xa_lock_irq-when-access-to-SRQ-table.patch