Skip to contentSkip to conversation

bnxt_en: Gate TPH enablement behind BNXT_SUPPORTS_QUEUE_API check

PATCH Applied Thomas Walsh 3 participants 3 messages Aug 20 – Aug 22

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 bnxt_en: Gate TPH enablement behind BNXT_SUPPORTS_QUEUE_API check

In bnxt_request_irq(), pcie_enable_tph() is called unconditionally to enable PCIe TPH when setting up interrupts.

If the NIC hardware or firmware capabilities do not support queue ops, attempting to enable TPH during bnxt_request_irq() is unnecessary.

As a result a flood of "RX queue restart failed: err=-95" messages is seen upon boot.

Older NICs (pre-Thor / BCM57414) do not support TPH or queue management. TPH requires queue management to restart the queue. NICs that support queue management (with updated FW) all support TPH.

Gate the call to pcie_enable_tph() and setting of bp->tph_mode behind BNXT_SUPPORTS_QUEUE_API(bp) to ensure TPH is only initialized on devices capable of supporting queue ops. This prevents a guaranteed -EOPNOTSUPP error from occurring due to NULL operations.

Fixes 1410c7416dc3 ("eth: bnxt: always set the queue mgmt ops")

---
v2:
- Updated commit message to include context on hardware support and added Michael Chan's Reviewed-by tag.
- Rebased onto net/main.

 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +5 -3
index 9377bf675981..abe24d749cc2 100644
@@ -11946,9 +11946,11 @@ static int bnxt_request_irq(struct bnxt *bp)
 #endif
 
 	/* Enable TPH support as part of IRQ request */
-	rc = pcie_enable_tph(bp->pdev, PCI_TPH_ST_IV_MODE);
-	if (!rc)
-		bp->tph_mode = PCI_TPH_ST_IV_MODE;
+	if (BNXT_SUPPORTS_QUEUE_API(bp)) {
+		rc = pcie_enable_tph(bp->pdev, PCI_TPH_ST_IV_MODE);
+		if (!rc)
+			bp->tph_mode = PCI_TPH_ST_IV_MODE;
+	}
 
 	for (i = 0, j = 0; i < bp->cp_nr_rings; i++) {
 		struct cpumask *cpu_mask = bp->ring_cpu_mask[i];
Signature · 1 line
2.55.0
maintainer Reviewed-by on v2 1/1
#1 lore raw
Quoted 23 lines · Thomas Walsh

In bnxt_request_irq(), pcie_enable_tph() is called unconditionally to enable PCIe TPH when setting up interrupts.

If the NIC hardware or firmware capabilities do not support queue ops, attempting to enable TPH during bnxt_request_irq() is unnecessary.

As a result a flood of "RX queue restart failed: err=-95" messages is seen upon boot.

Older NICs (pre-Thor / BCM57414) do not support TPH or queue management. TPH requires queue management to restart the queue. NICs that support queue management (with updated FW) all support TPH.

Gate the call to pcie_enable_tph() and setting of bp->tph_mode behind BNXT_SUPPORTS_QUEUE_API(bp) to ensure TPH is only initialized on devices capable of supporting queue ops. This prevents a guaranteed -EOPNOTSUPP error from occurring due to NULL operations.

Fixes 1410c7416dc3 ("eth: bnxt: always set the queue mgmt ops")
Quoted 6 lines

---
v2:
- Updated commit message to include context on hardware support and added Michael Chan's Reviewed-by tag.
- Rebased onto net/main.

OK with the consensus.

#2 lore raw
In reply to Thomas Walsh
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:

Quoted 10 lines · On Thu, 20 Aug 2026 18:05:44 -0400 you wrote:

In bnxt_request_irq(), pcie_enable_tph() is called unconditionally to enable PCIe TPH when setting up interrupts.

If the NIC hardware or firmware capabilities do not support queue ops, attempting to enable TPH during bnxt_request_irq() is unnecessary.

As a result a flood of "RX queue restart failed: err=-95" messages is seen upon boot.

[...]

Here is the summary with links:
- [net,v2] bnxt_en: Gate TPH enablement behind BNXT_SUPPORTS_QUEUE_API check

    https://git.kernel.org/netdev/net/c/a70859cf3121

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html