[PATCH net 0/3] bnxt_en: 3 bug fixes.

[PATCH net 0/3] bnxt_en: 3 bug fixes.

[Michael Chan]

2 Fixes related to PHY/link settings.  The last one fixes the sizing of
the completion ring.

Please also queue for -stable.  Thanks.

Michael Chan (1):
  bnxt_en: Fix completion ring sizing with TPA enabled.

Vasundhara Volam (2):
  bnxt_en: Fix race when modifying pause settings.
  bnxt_en: Init ethtool link settings after reading updated PHY
    configuration.

 drivers/net/ethernet/broadcom/bnxt/bnxt.c         | 22 +++++++++++++++-------
 drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c |  5 ++++-
 2 files changed, 19 insertions(+), 8 deletions(-)

-- 
1.8.3.1

Re: [PATCH net 0/3] bnxt_en: 3 bug fixes.

[David Miller]

From: Michael Chan <michael.chan@broadcom.com>
Date: Sat, 11 Jul 2020 20:48:22 -0400

> 2 Fixes related to PHY/link settings.  The last one fixes the sizing of
> the completion ring.
> 
> Please also queue for -stable.  Thanks.

Series applied and queued up for -stable, thanks.

[PATCH net 0/3] bnxt_en: 3 Bug fixes

[Michael Chan]

[-- Attachment #1: Type: text/plain, Size: 601 bytes --]

This series contains 3 small bug fixes covering ethtool self test, PCI
ID string typos, and some missing 200G link speed ethtool reporting logic.

Kalesh AP (2):
  bnxt_en: Fix reporting of test result in ethtool selftest
  bnxt_en: Fix typo in PCI id to device description string mapping

Michael Chan (1):
  bnxt_en: Add missing 200G link speed reporting

 drivers/net/ethernet/broadcom/bnxt/bnxt.c         | 8 ++++----
 drivers/net/ethernet/broadcom/bnxt/bnxt.h         | 1 +
 drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 3 +++
 3 files changed, 8 insertions(+), 4 deletions(-)

-- 
2.18.1


[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4209 bytes --]

Re: [PATCH net 0/3] bnxt_en: 3 Bug fixes

[patchwork-bot+netdevbpf]

Hello:

This series was applied to netdev/net.git (main)
by Jakub Kicinski <kuba@kernel.org>:

On Tue, 28 Mar 2023 18:30:18 -0700 you wrote:
> This series contains 3 small bug fixes covering ethtool self test, PCI
> ID string typos, and some missing 200G link speed ethtool reporting logic.
> 
> Kalesh AP (2):
>   bnxt_en: Fix reporting of test result in ethtool selftest
>   bnxt_en: Fix typo in PCI id to device description string mapping
> 
> [...]

Here is the summary with links:
  - [net,1/3] bnxt_en: Fix reporting of test result in ethtool selftest
    https://git.kernel.org/netdev/net/c/83714dc3db0e
  - [net,2/3] bnxt_en: Fix typo in PCI id to device description string mapping
    https://git.kernel.org/netdev/net/c/62aad36ed31a
  - [net,3/3] bnxt_en: Add missing 200G link speed reporting
    https://git.kernel.org/netdev/net/c/581bce7bcb7e

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

[PATCH net 0/3] bnxt_en: 3 bug fixes

[Michael Chan]

The first one fixes a possible failure when setting DCB ETS.  The
second one fixes the ethtool coredump (-W 2) not containing all the FW
traces.  The third one fixes the DMA unmap length when transmitting
XDP_REDIRECT packets.

Shravya KN (1):
  bnxt_en: Fix DCB ETS validation

Shruti Parab (1):
  bnxt_en: Flush FW trace before copying to the coredump

Somnath Kotur (1):
  bnxt_en: Set DMA unmap len correctly for XDP_REDIRECT

 .../net/ethernet/broadcom/bnxt/bnxt_coredump.c | 18 +++++++++++-------
 drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c  |  2 ++
 drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c  |  2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)

-- 
2.30.1

Re: [PATCH net 0/3] bnxt_en: 3 bug fixes

[patchwork-bot+netdevbpf]

Hello:

This series was applied to netdev/net.git (main)
by Jakub Kicinski <kuba@kernel.org>:

On Thu, 10 Jul 2025 14:39:35 -0700 you wrote:
> The first one fixes a possible failure when setting DCB ETS.  The
> second one fixes the ethtool coredump (-W 2) not containing all the FW
> traces.  The third one fixes the DMA unmap length when transmitting
> XDP_REDIRECT packets.
> 
> Shravya KN (1):
>   bnxt_en: Fix DCB ETS validation
> 
> [...]

Here is the summary with links:
  - [net,1/3] bnxt_en: Fix DCB ETS validation
    https://git.kernel.org/netdev/net/c/b74c2a2e9cc4
  - [net,2/3] bnxt_en: Flush FW trace before copying to the coredump
    https://git.kernel.org/netdev/net/c/100c08c89d17
  - [net,3/3] bnxt_en: Set DMA unmap len correctly for XDP_REDIRECT
    https://git.kernel.org/netdev/net/c/3cdf199d4755

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

[PATCH net 0/3] bnxt_en: 3 bug fixes

[Michael Chan]

The first one fixes a memory corruption issue that can happen when
FW resources change during ifdown with TCs created.  The next two
fix FW resource reservation logic for TX rings and stats context.

Michael Chan (2):
  bnxt_en: Adjust TX rings if reservation is less than requested
  bnxt_en: Fix stats context reservation logic

Sreekanth Reddy (1):
  bnxt_en: Fix memory corruption when FW resources change during ifdown

 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 36 +++++++++++++++++++----
 1 file changed, 30 insertions(+), 6 deletions(-)

-- 
2.30.1

[PATCH net 1/3] bnxt_en: Fix memory corruption when FW resources change during ifdown

[Michael Chan]

From: Sreekanth Reddy <sreekanth.reddy@broadcom.com>

bnxt_set_dflt_rings() assumes that it is always called before any TC has
been created.  So it doesn't take bp->num_tc into account and assumes
that it is always 0 or 1.

In the FW resource or capability change scenario, the FW will return
flags in bnxt_hwrm_if_change() that will cause the driver to
reinitialize and call bnxt_cancel_reservations().  This will lead to
bnxt_init_dflt_ring_mode() calling bnxt_set_dflt_rings() and bp->num_tc
may be greater than 1.  This will cause bp->tx_ring[] to be sized too
small and cause memory corruption in bnxt_alloc_cp_rings().

Fix it by properly scaling the TX rings by bp->num_tc in the code
paths mentioned above.  Add 2 helper functions to determine
bp->tx_nr_rings and bp->tx_nr_rings_per_tc.

Fixes: ec5d31e3c15d ("bnxt_en: Handle firmware reset status during IF_UP.")
Reviewed-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Reviewed-by: Andy Gospodarek <andrew.gospodarek@broadcom.com>
Signed-off-by: Sreekanth Reddy <sreekanth.reddy@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
---
 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 207a8bb36ae5..1f5c06f1296b 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -12851,6 +12851,17 @@ static int bnxt_set_xps_mapping(struct bnxt *bp)
 	return rc;
 }
 
+static int bnxt_tx_nr_rings(struct bnxt *bp)
+{
+	return bp->num_tc ? bp->tx_nr_rings_per_tc * bp->num_tc :
+			    bp->tx_nr_rings_per_tc;
+}
+
+static int bnxt_tx_nr_rings_per_tc(struct bnxt *bp)
+{
+	return bp->num_tc ? bp->tx_nr_rings / bp->num_tc : bp->tx_nr_rings;
+}
+
 static int __bnxt_open_nic(struct bnxt *bp, bool irq_re_init, bool link_re_init)
 {
 	int rc = 0;
@@ -16325,7 +16336,7 @@ static void bnxt_trim_dflt_sh_rings(struct bnxt *bp)
 	bp->cp_nr_rings = min_t(int, bp->tx_nr_rings_per_tc, bp->rx_nr_rings);
 	bp->rx_nr_rings = bp->cp_nr_rings;
 	bp->tx_nr_rings_per_tc = bp->cp_nr_rings;
-	bp->tx_nr_rings = bp->tx_nr_rings_per_tc;
+	bp->tx_nr_rings = bnxt_tx_nr_rings(bp);
 }
 
 static int bnxt_set_dflt_rings(struct bnxt *bp, bool sh)
@@ -16357,7 +16368,7 @@ static int bnxt_set_dflt_rings(struct bnxt *bp, bool sh)
 		bnxt_trim_dflt_sh_rings(bp);
 	else
 		bp->cp_nr_rings = bp->tx_nr_rings_per_tc + bp->rx_nr_rings;
-	bp->tx_nr_rings = bp->tx_nr_rings_per_tc;
+	bp->tx_nr_rings = bnxt_tx_nr_rings(bp);
 
 	avail_msix = bnxt_get_max_func_irqs(bp) - bp->cp_nr_rings;
 	if (avail_msix >= BNXT_MIN_ROCE_CP_RINGS) {
@@ -16370,7 +16381,7 @@ static int bnxt_set_dflt_rings(struct bnxt *bp, bool sh)
 	rc = __bnxt_reserve_rings(bp);
 	if (rc && rc != -ENODEV)
 		netdev_warn(bp->dev, "Unable to reserve tx rings\n");
-	bp->tx_nr_rings_per_tc = bp->tx_nr_rings;
+	bp->tx_nr_rings_per_tc = bnxt_tx_nr_rings_per_tc(bp);
 	if (sh)
 		bnxt_trim_dflt_sh_rings(bp);
 
@@ -16379,7 +16390,7 @@ static int bnxt_set_dflt_rings(struct bnxt *bp, bool sh)
 		rc = __bnxt_reserve_rings(bp);
 		if (rc && rc != -ENODEV)
 			netdev_warn(bp->dev, "2nd rings reservation failed.\n");
-		bp->tx_nr_rings_per_tc = bp->tx_nr_rings;
+		bp->tx_nr_rings_per_tc = bnxt_tx_nr_rings_per_tc(bp);
 	}
 	if (BNXT_CHIP_TYPE_NITRO_A0(bp)) {
 		bp->rx_nr_rings++;
@@ -16413,7 +16424,7 @@ static int bnxt_init_dflt_ring_mode(struct bnxt *bp)
 	if (rc)
 		goto init_dflt_ring_err;
 
-	bp->tx_nr_rings_per_tc = bp->tx_nr_rings;
+	bp->tx_nr_rings_per_tc = bnxt_tx_nr_rings_per_tc(bp);
 
 	bnxt_set_dflt_rfs(bp);
 
-- 
2.30.1

[PATCH net 2/3] bnxt_en: Adjust TX rings if reservation is less than requested

[Michael Chan]

Before we accept an ethtool request to increase a resource (such as
rings), we call the FW to check that the requested resource is likely
available first before we commit.  But it is still possible that
the actual reservation or allocation can fail.  The existing code
is missing the logic to adjust the TX rings in case the reserved
TX rings are less than requested.  Add a warning message (a similar
message for RX rings already exists) and add the logic to adjust
the TX rings.  Without this fix, the number of TX rings reported
to the stack can exceed the actual TX rings and ethtool -l will
report more than the actual TX rings.

Fixes: 674f50a5b026 ("bnxt_en: Implement new method to reserve rings.")
Reviewed-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Reviewed-by: Somnath Kotur <somnath.kotur@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
---
 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 1f5c06f1296b..86fc9d340dab 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -8024,6 +8024,11 @@ static int __bnxt_reserve_rings(struct bnxt *bp)
 		hwr.rx = rx_rings << 1;
 	tx_cp = bnxt_num_tx_to_cp(bp, hwr.tx);
 	hwr.cp = sh ? max_t(int, tx_cp, rx_rings) : tx_cp + rx_rings;
+	if (hwr.tx != bp->tx_nr_rings) {
+		netdev_warn(bp->dev,
+			    "Able to reserve only %d out of %d requested TX rings\n",
+			    hwr.tx, bp->tx_nr_rings);
+	}
 	bp->tx_nr_rings = hwr.tx;
 
 	/* If we cannot reserve all the RX rings, reset the RSS map only
@@ -12879,6 +12884,13 @@ static int __bnxt_open_nic(struct bnxt *bp, bool irq_re_init, bool link_re_init)
 	if (rc)
 		return rc;
 
+	/* Make adjustments if reserved TX rings are less than requested */
+	bp->tx_nr_rings -= bp->tx_nr_rings_xdp;
+	bp->tx_nr_rings_per_tc = bnxt_tx_nr_rings_per_tc(bp);
+	if (bp->tx_nr_rings_xdp) {
+		bp->tx_nr_rings_xdp = bp->tx_nr_rings_per_tc;
+		bp->tx_nr_rings += bp->tx_nr_rings_xdp;
+	}
 	rc = bnxt_alloc_mem(bp, irq_re_init);
 	if (rc) {
 		netdev_err(bp->dev, "bnxt_alloc_mem err: %x\n", rc);
-- 
2.30.1

[PATCH net 3/3] bnxt_en: Fix stats context reservation logic

[Michael Chan]

The HW resource reservation logic allows the L2 driver to use the
RoCE resources if the RoCE driver is not registered.  When calculating
the stats contexts available for L2, we should not blindly subtract
the stats contexts reserved for RoCE unless the RoCE driver is
registered.  This bug may cause the L2 rings to be less than the
number requested when we are close to running out of stats contexts.

Fixes: 2e4592dc9bee ("bnxt_en: Change MSIX/NQs allocation policy")
Reviewed-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Reviewed-by: Somnath Kotur <somnath.kotur@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.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 86fc9d340dab..31e3d825b4bc 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -8016,7 +8016,8 @@ static int __bnxt_reserve_rings(struct bnxt *bp)
 	}
 	rx_rings = min_t(int, rx_rings, hwr.grp);
 	hwr.cp = min_t(int, hwr.cp, bp->cp_nr_rings);
-	if (hwr.stat > bnxt_get_ulp_stat_ctxs(bp))
+	if (bnxt_ulp_registered(bp->edev) &&
+	    hwr.stat > bnxt_get_ulp_stat_ctxs(bp))
 		hwr.stat -= bnxt_get_ulp_stat_ctxs(bp);
 	hwr.cp = min_t(int, hwr.cp, hwr.stat);
 	rc = bnxt_trim_rings(bp, &rx_rings, &hwr.tx, hwr.cp, sh);
-- 
2.30.1

Re: [PATCH net 0/3] bnxt_en: 3 bug fixes

[patchwork-bot+netdevbpf]

Hello:

This series was applied to netdev/net.git (main)
by Jakub Kicinski <kuba@kernel.org>:

On Mon, 25 Aug 2025 10:59:24 -0700 you wrote:
> The first one fixes a memory corruption issue that can happen when
> FW resources change during ifdown with TCs created.  The next two
> fix FW resource reservation logic for TX rings and stats context.
> 
> Michael Chan (2):
>   bnxt_en: Adjust TX rings if reservation is less than requested
>   bnxt_en: Fix stats context reservation logic
> 
> [...]

Here is the summary with links:
  - [net,1/3] bnxt_en: Fix memory corruption when FW resources change during ifdown
    https://git.kernel.org/netdev/net/c/2747328ba271
  - [net,2/3] bnxt_en: Adjust TX rings if reservation is less than requested
    https://git.kernel.org/netdev/net/c/1ee581c24dfd
  - [net,3/3] bnxt_en: Fix stats context reservation logic
    https://git.kernel.org/netdev/net/c/b4fc8faacfea

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html