[PATCH net 0/4] bnxt_en: Bug fixes.

[PATCH net 0/4] bnxt_en: Bug fixes.

[Michael Chan]

3 patches that fix some issues in the firmware reset logic, starting
with a small patch to refactor the code that re-enables SRIOV.  The
last patch fixes a TC queue mapping issue.

Michael Chan (3):
  bnxt_en: Refactor logic to re-enable SRIOV after firmware reset
    detected.
  bnxt_en: Fix RDMA driver failure with SRIOV after firmware reset.
  bnxt_en: Fix TC queue mapping.

Vasundhara Volam (1):
  bnxt_en: Fix logic that disables Bus Master during firmware reset.

 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 37 ++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 13 deletions(-)

-- 
2.5.1

[PATCH net 1/4] bnxt_en: Refactor logic to re-enable SRIOV after firmware reset detected.

[Michael Chan]

Put the current logic in bnxt_open() to re-enable SRIOV after detecting
firmware reset into a new function bnxt_reenable_sriov().  This call
needs to be invoked in the firmware reset path also in the next patch.

Signed-off-by: Michael Chan <michael.chan@broadcom.com>
---
 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 483935b..0253a8f 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -9241,6 +9241,17 @@ void bnxt_half_close_nic(struct bnxt *bp)
 	bnxt_free_mem(bp, false);
 }
 
+static void bnxt_reenable_sriov(struct bnxt *bp)
+{
+	if (BNXT_PF(bp)) {
+		struct bnxt_pf_info *pf = &bp->pf;
+		int n = pf->active_vfs;
+
+		if (n)
+			bnxt_cfg_hw_sriov(bp, &n, true);
+	}
+}
+
 static int bnxt_open(struct net_device *dev)
 {
 	struct bnxt *bp = netdev_priv(dev);
@@ -9259,13 +9270,7 @@ static int bnxt_open(struct net_device *dev)
 		bnxt_hwrm_if_change(bp, false);
 	} else {
 		if (test_and_clear_bit(BNXT_STATE_FW_RESET_DET, &bp->state)) {
-			if (BNXT_PF(bp)) {
-				struct bnxt_pf_info *pf = &bp->pf;
-				int n = pf->active_vfs;
-
-				if (n)
-					bnxt_cfg_hw_sriov(bp, &n, true);
-			}
+			bnxt_reenable_sriov(bp);
 			if (!test_bit(BNXT_STATE_IN_FW_RESET, &bp->state))
 				bnxt_ulp_start(bp, 0);
 		}
-- 
2.5.1

[PATCH net 2/4] bnxt_en: Fix RDMA driver failure with SRIOV after firmware reset.

[Michael Chan]

bnxt_ulp_start() needs to be called before SRIOV is re-enabled after
firmware reset.  Re-enabling SRIOV may consume all the resources and
may cause the RDMA driver to fail to get MSIX and other resources.
Fix it by calling bnxt_ulp_start() first before calling
bnxt_reenable_sriov().

We re-arrange the logic so that we call bnxt_ulp_start() and
bnxt_reenable_sriov() in proper sequence in bnxt_fw_reset_task() and
bnxt_open().  The former is the normal coordinated firmware reset sequence
and the latter is firmware reset while the function is down.  This new
logic is now more straight forward and will now fix both scenarios.

Fixes: f3a6d206c25a ("bnxt_en: Call bnxt_ulp_stop()/bnxt_ulp_start() during error recovery.")
Reported-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
---
 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 0253a8f..a69e4662 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -9270,9 +9270,10 @@ static int bnxt_open(struct net_device *dev)
 		bnxt_hwrm_if_change(bp, false);
 	} else {
 		if (test_and_clear_bit(BNXT_STATE_FW_RESET_DET, &bp->state)) {
-			bnxt_reenable_sriov(bp);
-			if (!test_bit(BNXT_STATE_IN_FW_RESET, &bp->state))
+			if (!test_bit(BNXT_STATE_IN_FW_RESET, &bp->state)) {
 				bnxt_ulp_start(bp, 0);
+				bnxt_reenable_sriov(bp);
+			}
 		}
 		bnxt_hwmon_open(bp);
 	}
@@ -10836,6 +10837,8 @@ static void bnxt_fw_reset_task(struct work_struct *work)
 		smp_mb__before_atomic();
 		clear_bit(BNXT_STATE_IN_FW_RESET, &bp->state);
 		bnxt_ulp_start(bp, rc);
+		if (!rc)
+			bnxt_reenable_sriov(bp);
 		bnxt_dl_health_recovery_done(bp);
 		bnxt_dl_health_status_update(bp, true);
 		rtnl_unlock();
-- 
2.5.1

[PATCH net 3/4] bnxt_en: Fix logic that disables Bus Master during firmware reset.

[Michael Chan]

From: Vasundhara Volam <vasundhara-v.volam@broadcom.com>

The current logic that calls pci_disable_device() in __bnxt_close_nic()
during firmware reset is flawed.  If firmware is still alive, we're
disabling the device too early, causing some firmware commands to
not reach the firmware.

Fix it by moving the logic to bnxt_reset_close().  If firmware is
in fatal condition, we call pci_disable_device() before we free
any of the rings to prevent DMA corruption of the freed rings.  If
firmware is still alive, we call pci_disable_device() after the
last firmware message has been sent.

Fixes: 3bc7d4a352ef ("bnxt_en: Add BNXT_STATE_IN_FW_RESET state.")
Signed-off-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
---
 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index a69e4662..cea6033 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -9313,10 +9313,6 @@ static void __bnxt_close_nic(struct bnxt *bp, bool irq_re_init,
 	bnxt_debug_dev_exit(bp);
 	bnxt_disable_napi(bp);
 	del_timer_sync(&bp->timer);
-	if (test_bit(BNXT_STATE_IN_FW_RESET, &bp->state) &&
-	    pci_is_enabled(bp->pdev))
-		pci_disable_device(bp->pdev);
-
 	bnxt_free_skbs(bp);
 
 	/* Save ring stats before shutdown */
@@ -10102,9 +10098,16 @@ static void bnxt_reset(struct bnxt *bp, bool silent)
 static void bnxt_fw_reset_close(struct bnxt *bp)
 {
 	bnxt_ulp_stop(bp);
+	/* When firmware is fatal state, disable PCI device to prevent
+	 * any potential bad DMAs before freeing kernel memory.
+	 */
+	if (test_bit(BNXT_STATE_FW_FATAL_COND, &bp->state))
+		pci_disable_device(bp->pdev);
 	__bnxt_close_nic(bp, true, false);
 	bnxt_clear_int_mode(bp);
 	bnxt_hwrm_func_drv_unrgtr(bp);
+	if (pci_is_enabled(bp->pdev))
+		pci_disable_device(bp->pdev);
 	bnxt_free_ctx_mem(bp);
 	kfree(bp->ctx);
 	bp->ctx = NULL;
-- 
2.5.1

[PATCH net 4/4] bnxt_en: Fix TC queue mapping.

[Michael Chan]

The driver currently only calls netdev_set_tc_queue when the number of
TCs is greater than 1.  Instead, the comparison should be greater than
or equal to 1.  Even with 1 TC, we need to set the queue mapping.

This bug can cause warnings when the number of TCs is changed back to 1.

Fixes: 7809592d3e2e ("bnxt_en: Enable MSIX early in bnxt_init_one().")
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
---
 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index cea6033..597e6fd 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -7893,7 +7893,7 @@ static void bnxt_setup_msix(struct bnxt *bp)
 	int tcs, i;
 
 	tcs = netdev_get_num_tc(dev);
-	if (tcs > 1) {
+	if (tcs) {
 		int i, off, count;
 
 		for (i = 0; i < tcs; i++) {
-- 
2.5.1

Re: [PATCH net 0/4] bnxt_en: Bug fixes.

[Jakub Kicinski]

On Sun,  2 Feb 2020 02:41:34 -0500, Michael Chan wrote:
> 3 patches that fix some issues in the firmware reset logic, starting
> with a small patch to refactor the code that re-enables SRIOV.  The
> last patch fixes a TC queue mapping issue.
> 
> Michael Chan (3):
>   bnxt_en: Refactor logic to re-enable SRIOV after firmware reset
>     detected.
>   bnxt_en: Fix RDMA driver failure with SRIOV after firmware reset.
>   bnxt_en: Fix TC queue mapping.
> 
> Vasundhara Volam (1):
>   bnxt_en: Fix logic that disables Bus Master during firmware reset.

Applied and added to stable queued, thank you!

[PATCH net 0/4] bnxt_en: Bug fixes

[Michael Chan]

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

This bug fix series includes fixes for PCIE AER, a crash that may occur
when doing ethtool -C in the middle of error recovery, and aRFS.

Alex Barba (1):
  bnxt_en: fix potentially incorrect return value for ndo_rx_flow_steer

Michael Chan (1):
  bnxt_en: Fix possible crash in bnxt_hwrm_set_coal()

Vikas Gupta (2):
  bnxt_en: refactor bnxt_cancel_reservations()
  bnxt_en: fix the handling of PCIE-AER

 drivers/net/ethernet/broadcom/bnxt/bnxt.c     | 54 +++++++++++++++----
 drivers/net/ethernet/broadcom/bnxt/bnxt.h     |  1 +
 .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c |  2 +-
 .../net/ethernet/broadcom/bnxt/bnxt_hwrm.c    |  3 +-
 4 files changed, 49 insertions(+), 11 deletions(-)

-- 
2.18.1


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

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

[patchwork-bot+netdevbpf]

Hello:

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

On Thu,  3 Nov 2022 19:33:23 -0400 you wrote:
> This bug fix series includes fixes for PCIE AER, a crash that may occur
> when doing ethtool -C in the middle of error recovery, and aRFS.
> 
> Alex Barba (1):
>   bnxt_en: fix potentially incorrect return value for ndo_rx_flow_steer
> 
> Michael Chan (1):
>   bnxt_en: Fix possible crash in bnxt_hwrm_set_coal()
> 
> [...]

Here is the summary with links:
  - [net,1/4] bnxt_en: refactor bnxt_cancel_reservations()
    https://git.kernel.org/netdev/net/c/b4c66425771d
  - [net,2/4] bnxt_en: fix the handling of PCIE-AER
    https://git.kernel.org/netdev/net/c/0cf736a18a1e
  - [net,3/4] bnxt_en: Fix possible crash in bnxt_hwrm_set_coal()
    https://git.kernel.org/netdev/net/c/6d81ea3765df
  - [net,4/4] bnxt_en: fix potentially incorrect return value for ndo_rx_flow_steer
    https://git.kernel.org/netdev/net/c/02597d39145b

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

[PATCH net 0/4] bnxt_en: Bug fixes

[Michael Chan]

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

This series includes 2 fixes for regressions introduced by the XDP
multi-buffer feature, 1 devlink reload bug fix, and 1 SRIOV resource
accounting bug fix.

Pavan Chebbi (1):
  bnxt_en: Use PAGE_SIZE to init buffer when multi buffer XDP is not in
    use

Vikas Gupta (3):
  bnxt_en: set missing reload flag in devlink features
  bnxt_en: fix NQ resource accounting during vf creation on 57500 chips
  bnxt_en: fix LRO/GRO_HW features in ndo_fix_features callback

 drivers/net/ethernet/broadcom/bnxt/bnxt.c         |  5 +----
 drivers/net/ethernet/broadcom/bnxt/bnxt.h         |  1 +
 drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c |  1 +
 drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c   |  2 +-
 drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c     | 10 ++++++++--
 5 files changed, 12 insertions(+), 7 deletions(-)

-- 
2.18.1


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

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

[Jakub Kicinski]

On Mon, 22 Aug 2022 11:06:50 -0400 Michael Chan wrote:
> This series includes 2 fixes for regressions introduced by the XDP
> multi-buffer feature, 1 devlink reload bug fix, and 1 SRIOV resource
> accounting bug fix.

Acked-by: Jakub Kicinski <kuba@kernel.org>

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

[patchwork-bot+netdevbpf]

Hello:

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

On Mon, 22 Aug 2022 11:06:50 -0400 you wrote:
> This series includes 2 fixes for regressions introduced by the XDP
> multi-buffer feature, 1 devlink reload bug fix, and 1 SRIOV resource
> accounting bug fix.
> 
> Pavan Chebbi (1):
>   bnxt_en: Use PAGE_SIZE to init buffer when multi buffer XDP is not in
>     use
> 
> [...]

Here is the summary with links:
  - [net,1/4] bnxt_en: Use PAGE_SIZE to init buffer when multi buffer XDP is not in use
    https://git.kernel.org/netdev/net/c/7dd3de7cb1d6
  - [net,2/4] bnxt_en: set missing reload flag in devlink features
    https://git.kernel.org/netdev/net/c/574b2bb9692f
  - [net,3/4] bnxt_en: fix NQ resource accounting during vf creation on 57500 chips
    https://git.kernel.org/netdev/net/c/09a89cc59ad6
  - [net,4/4] bnxt_en: fix LRO/GRO_HW features in ndo_fix_features callback
    https://git.kernel.org/netdev/net/c/366c30474172

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

[PATCH net 0/4] bnxt_en: Bug fixes.

[Michael Chan]

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

This first patch fixes a module eeprom A2h addressing issue.  The next
2 patches fix counter related issues.  The last one skips an
unsupported firmware call on the VF to avoid the error log.

Please queue the 1st 3 patches for -stable.  Thanks.

Edwin Peer (1):
  bnxt_en: read EEPROM A2h address using page 0

Michael Chan (2):
  bnxt_en: Free port stats during firmware reset.
  bnxt_en: Fix counter overflow logic.

Vasundhara Volam (1):
  bnxt_en: Avoid unnecessary NVM_GET_DEV_INFO cmd error log on VFs.

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

-- 
2.18.1


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

Re: [PATCH net 0/4] bnxt_en: Bug fixes.

[Jakub Kicinski]

On Sun, 15 Nov 2020 19:27:48 -0500 Michael Chan wrote:
> This first patch fixes a module eeprom A2h addressing issue.  The next
> 2 patches fix counter related issues.  The last one skips an
> unsupported firmware call on the VF to avoid the error log.
> 
> Please queue the 1st 3 patches for -stable.  Thanks.

Applied, thanks!

[PATCH net 0/4] bnxt_en: Bug fixes.

[Michael Chan]

The first patch stores the firmware version code which is needed by the
next 2 patches to determine some worarounds based on the firmware version.
The workarounds are to disable legacy TX push mode and to clear the
hardware statistics during ifdown.  The last patch checks that it is
a PF before reading the VPD.

Please also queue these for -stable.  Thanks.

Michael Chan (3):
  bnxt_en: Store the running firmware version code.
  bnxt_en: Do not enable legacy TX push on older firmware.
  bnxt_en: Fix statistics counters issue during ifdown with older
    firmware.

Vasundhara Volam (1):
  bnxt_en: Read VPD info only for PFs

 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 36 +++++++++++++++++++++++++------
 drivers/net/ethernet/broadcom/bnxt/bnxt.h |  5 +++++
 2 files changed, 34 insertions(+), 7 deletions(-)

-- 
1.8.3.1

Re: [PATCH net 0/4] bnxt_en: Bug fixes.

[Jakub Kicinski]

On Tue, 23 Jun 2020 19:01:34 -0400 Michael Chan wrote:
> The first patch stores the firmware version code which is needed by the
> next 2 patches to determine some worarounds based on the firmware version.
> The workarounds are to disable legacy TX push mode and to clear the
> hardware statistics during ifdown.  The last patch checks that it is
> a PF before reading the VPD.
> 
> Please also queue these for -stable.  Thanks.

FWIW looks good to me:

Reviewed-by: Jakub Kicinski <kuba@kernel.org>

Re: [PATCH net 0/4] bnxt_en: Bug fixes.

[David Miller]

From: Michael Chan <michael.chan@broadcom.com>
Date: Tue, 23 Jun 2020 19:01:34 -0400

> The first patch stores the firmware version code which is needed by the
> next 2 patches to determine some worarounds based on the firmware version.
> The workarounds are to disable legacy TX push mode and to clear the
> hardware statistics during ifdown.  The last patch checks that it is
> a PF before reading the VPD.

Series applied.

> Please also queue these for -stable.  Thanks.

Queued up, thanks.

[PATCH net 0/4] bnxt_en: Bug fixes.

[Michael Chan]

Four fixes related to the bnxt_en driver's resume path, AER reset, and
the timer function.

Michael Chan (3):
  bnxt_en: Simplify bnxt_resume().
  bnxt_en: Re-enable SRIOV during resume.
  bnxt_en: Fix AER reset logic on 57500 chips.

Vasundhara Volam (1):
  bnxt_en: Return from timer if interface is not in open state.

 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 35 +++++++++++++++----------------
 1 file changed, 17 insertions(+), 18 deletions(-)

-- 
1.8.3.1

Re: [PATCH net 0/4] bnxt_en: Bug fixes.

[David Miller]

From: Michael Chan <michael.chan@broadcom.com>
Date: Sun, 14 Jun 2020 19:57:06 -0400

> Four fixes related to the bnxt_en driver's resume path, AER reset, and
> the timer function.

Series applied, thanks Michael.

[PATCH net 0/4] bnxt_en: Bug fixes.

[Michael Chan]

There are 4 driver fixes in this series:

1. Fix RX buffer leak during OOM condition.
2. Call pci_disable_msix() under correct conditions to prevent hitting BUG.
3. Reduce unneeded mmeory allocation in kdump kernel to prevent OOM.
4. Don't read device serial number on VFs because it is not supported.

Please queue #1, #2, #3 for -stable as well.  Thanks.

Michael Chan (3):
  bnxt_en: Fix aggregation buffer leak under OOM condition.
  bnxt_en: Fix possible BUG() condition when calling pci_disable_msix().
  bnxt_en: Reduce memory usage when running in kdump kernel.

Vasundhara Volam (1):
  bnxt_en: Device serial number is supported only for PFs.

 drivers/net/ethernet/broadcom/bnxt/bnxt.c         | 30 +++++++++++++----------
 drivers/net/ethernet/broadcom/bnxt/bnxt.h         |  6 +++--
 drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c |  2 +-
 drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c     |  2 +-
 4 files changed, 23 insertions(+), 17 deletions(-)

-- 
2.5.1

Re: [PATCH net 0/4] bnxt_en: Bug fixes.

[David Miller]

From: Michael Chan <michael.chan@broadcom.com>
Date: Wed, 22 May 2019 19:12:53 -0400

> There are 4 driver fixes in this series:
> 
> 1. Fix RX buffer leak during OOM condition.
> 2. Call pci_disable_msix() under correct conditions to prevent hitting BUG.
> 3. Reduce unneeded mmeory allocation in kdump kernel to prevent OOM.
> 4. Don't read device serial number on VFs because it is not supported.

Series applied.

> Please queue #1, #2, #3 for -stable as well.  Thanks.

Queued up, thank you.

[PATCH net 0/4] bnxt_en: Bug fixes.

[Michael Chan]

The first patch fixes a regression on CoS queue setup, introduced
recently by the 57500 new chip support patches.  The rest are
fixes related to ring and resource accounting on the new 57500 chips.

Michael Chan (4):
  bnxt_en: Fix CNP CoS queue regression.
  bnxt_en: Keep track of reserved IRQs.
  bnxt_en: Fix NQ/CP rings accounting on the new 57500 chips.
  bnxt_en: Fix _bnxt_get_max_rings() for 57500 chips.

 drivers/net/ethernet/broadcom/bnxt/bnxt.c     | 60 +++++++++++++++++++++------
 drivers/net/ethernet/broadcom/bnxt/bnxt.h     |  1 +
 drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c |  2 +-
 3 files changed, 50 insertions(+), 13 deletions(-)

-- 
2.5.1

Re: [PATCH net 0/4] bnxt_en: Bug fixes.

[David Miller]

From: Michael Chan <michael.chan@broadcom.com>
Date: Sun,  9 Dec 2018 07:00:58 -0500

> The first patch fixes a regression on CoS queue setup, introduced
> recently by the 57500 new chip support patches.  The rest are
> fixes related to ring and resource accounting on the new 57500 chips.

Series applied.