bnxt_en: Bug fixes
Michael Chan
maintainercover bnxt_en: Bug fixes
This patchset includes 3 small bug fixes to reinitialize PHY capabilities after firmware reset, setup the chip's internal TQM fastpath ring backing memory properly for RoCE traffic, and to free ethtool related memory if driver probe fails.
Michael Chan (1):
bnxt_en: Rediscover PHY capabilities after firmware reset
Rukhsana Ansari (1):
bnxt_en: Fix TQM fastpath ring backing store computation
Somnath Kotur (1):
bnxt_en: Call bnxt_ethtool_free() in bnxt_init_one() error path
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
Signature · 1 line
2.18.1
Michael Chan
maintainerPATCH 1/3 bnxt_en: Rediscover PHY capabilities after firmware reset
There is a missing bnxt_probe_phy() call in bnxt_fw_init_one() to rediscover the PHY capabilities after a firmware reset. This can cause some PHY related functionalities to fail after a firmware reset. For example, in multi-host, the ability for any host to configure the PHY settings may be lost after a firmware reset.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +5 -0
@@ -11750,6 +11750,8 @@ static void bnxt_fw_init_one_p3(struct bnxt *bp)bnxt_hwrm_coal_params_qcaps (bp); } +static int bnxt_probe_phy (struct bnxt *bp,bool fw_dflt); +static int bnxt_fw_init_one (struct bnxt *bp) {int rc;
@@ -11764,6 +11766,9 @@ static int bnxt_fw_init_one(struct bnxt *bp)netdev_err (bp->dev,"Firmware init phase 2 failed\n" );return rc; } + rc =bnxt_probe_phy (bp, false); +if (rc) +return rc; rc =bnxt_approve_mac (bp, bp->dev->dev_addr, false);if (rc)return rc;
Signature · 1 line
2.18.1
Michael Chan
maintainerPATCH 2/3 bnxt_en: Fix TQM fastpath ring backing store computation
In reply to Michael ChanFrom: Rukhsana Ansari <[email protected]>
TQM fastpath ring needs to be sized to store both the requester and responder side of RoCE QPs in TQM for supporting bi-directional tests. Fix bnxt_alloc_ctx_mem() to multiply the RoCE QPs by a factor of 2 when computing the number of entries for TQM fastpath ring. This fixes an RX pipeline stall issue when running bi-directional max RoCE QP tests.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +1 -1
@@ -7308,7 +7308,7 @@ static int bnxt_alloc_ctx_mem(struct bnxt *bp) entries_sp = ctx->vnic_max_vnic_entries + ctx->qp_max_l2_entries +2 * (extra_qps + ctx->qp_min_qp1_entries) + min; entries_sp =roundup (entries_sp, ctx->tqm_entries_multiple); - entries = ctx->qp_max_l2_entries + extra_qps + ctx->qp_min_qp1_entries; + entries = ctx->qp_max_l2_entries +2 * (extra_qps + ctx->qp_min_qp1_entries); entries =roundup (entries, ctx->tqm_entries_multiple); entries =clamp_t (u32, entries, min, ctx->tqm_max_entries_per_ring);for (i =0 ; i < ctx->tqm_fp_rings_count +1 ; i++) {
Signature · 1 line
2.18.1
Michael Chan
maintainerPATCH 3/3 bnxt_en: Call bnxt_ethtool_free() in bnxt_init_one() error path
In reply to Michael ChanFrom: Somnath Kotur <[email protected]>
bnxt_ethtool_init() may have allocated some memory and we need to call bnxt_ethtool_free() to properly unwind if bnxt_init_one() fails.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +1 -0
@@ -13160,6 +13160,7 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)bnxt_hwrm_func_drv_unrgtr (bp);bnxt_free_hwrm_short_cmd_req (bp);bnxt_free_hwrm_resources (bp); +bnxt_ethtool_free (bp);kfree (bp->fw_health); bp->fw_health =NULL ;bnxt_cleanup_pci (bp);
Signature · 1 line
2.18.1
This series was applied to netdev/net.git (refs/heads/master):
Hello:
This series was applied to netdev/net.git (refs/heads/master):
Quoted 9 lines · On Fri, 18 Jun 2021 02:07:24 -0400 you wrote:
This patchset includes 3 small bug fixes to reinitialize PHY capabilities after firmware reset, setup the chip's internal TQM fastpath ring backing memory properly for RoCE traffic, and to free ethtool related memory if driver probe fails.
Michael Chan (1):
bnxt_en: Rediscover PHY capabilities after firmware reset[...]
Here is the summary with links:
- [net,1/3] bnxt_en: Rediscover PHY capabilities after firmware reset
https://git.kernel.org/netdev/net/c/0afd6a4e8028 - [net,2/3] bnxt_en: Fix TQM fastpath ring backing store computation https://git.kernel.org/netdev/net/c/c12e1643d273 - [net,3/3] bnxt_en: Call bnxt_ethtool_free() in bnxt_init_one() error path https://git.kernel.org/netdev/net/c/03400aaa69f9
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html