bnxt_en: Bug fixes
Michael Chan
maintainercover bnxt_en: Bug fixes
This patchset has the following fixes for bnxt_en:
1. Add missing VNIC ID parameter in the FW message when getting an updated RSS configuration from the FW.
2. Fix a warning when doing ethtool reset on newer chips.
3. Fix VLAN issue on a VF when a default VLAN is assigned.
4. Fix a problem during DPC (Downstream Port containment) scenario.
5. Fix a NULL pointer dereference when receiving a PTP event from FW.
6. Fix VXLAN/Geneve UDP port delete/add with newer FW.
Pavan Chebbi (2):
bnxt_en: Fix bnxt_hwrm_update_rss_hash_cfg()
bnxt_en: Prevent kernel panic when receiving unexpected PHC_UPDATE
event
Somnath Kotur (2):
bnxt_en: Query default VLAN before VNIC setup on a VF
bnxt_en: Implement .set_port / .unset_port UDP tunnel callbacks
Sreekanth Reddy (1):
bnxt_en: Don't issue AP reset during ethtool's reset operation
Vikas Gupta (1):
bnxt_en: Skip firmware fatal error recovery if chip is not accessible
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 40 ++++++++++++++----- .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c | 1 + 3 files changed, 33 insertions(+), 10 deletions(-)
Signature · 1 line
2.30.1
Michael Chan
maintainerPATCH 1/6 bnxt_en: Fix bnxt_hwrm_update_rss_hash_cfg()
From: Pavan Chebbi <[email protected]>
We must specify the vnic id of the vnic in the input structure of this firmware message. Otherwise we will get an error from the firmware.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +1 -0
@@ -5350,6 +5350,7 @@ static void bnxt_hwrm_update_rss_hash_cfg(struct bnxt *bp)if (hwrm_req_init (bp, req,HWRM_VNIC_RSS_QCFG ))return ; + req->vnic_id =cpu_to_le16 (vnic->fw_vnic_id);/* all contexts configured to same hash_type, zero always exists */ req->rss_ctx_idx =cpu_to_le16 (vnic->fw_rss_cos_lb_ctx[0 ]); resp =hwrm_req_hold (bp, req);
Signature · 1 line
2.30.1
Michael Chan
maintainerPATCH 2/6 bnxt_en: Don't issue AP reset during ethtool's reset operation
In reply to Michael ChanFrom: Sreekanth Reddy <[email protected]>
Only older NIC controller's firmware uses the PROC AP reset type. Firmware on 5731X/5741X and newer chips does not support this reset type. When bnxt_reset() issues a series of resets, this PROC AP reset may actually fail on these newer chips because the firmware is not ready to accept this unsupported command yet. Avoid this unnecessary error by skipping this reset type on chips that don't support it.
--- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +1 -1
@@ -3831,7 +3831,7 @@ static int bnxt_reset(struct net_device *dev, u32 *flags) } } -if (req &BNXT_FW_RESET_AP ) { +if (!BNXT_CHIP_P4_PLUS (bp) && (req &BNXT_FW_RESET_AP )) {/* This feature is not supported in older firmware versions */ if (bp->hwrm_spec_code >=0x10803 ) {if (!bnxt_firmware_reset_ap (dev)) {
Signature · 1 line
2.30.1
Michael Chan
maintainerPATCH 3/6 bnxt_en: Query default VLAN before VNIC setup on a VF
In reply to Michael ChanFrom: Somnath Kotur <[email protected]>
We need to call bnxt_hwrm_func_qcfg() on a VF to query the default VLAN that may be setup by the PF. If a default VLAN is enabled, the VF cannot support VLAN acceleration on the receive side and the VNIC must be setup to strip out the default VLAN tag. If a default VLAN is not enabled, the VF can support VLAN acceleration on the receive side. The VNIC should be set up to strip or not strip the VLAN based on the RX VLAN acceleration setting.
Without this call to determine the default VLAN before calling bnxt_setup_vnic(), the VNIC may not be set up correctly. For example, bnxt_setup_vnic() may set up to strip the VLAN tag based on stale default VLAN information. If RX VLAN acceleration is not enabled, the VLAN tag will be incorrectly stripped and the RX data path will not work correctly.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +3 -0
@@ -8813,6 +8813,9 @@ static int bnxt_init_chip(struct bnxt *bp, bool irq_re_init) goto err_out; } +if (BNXT_VF (bp)) +bnxt_hwrm_func_qcfg (bp); + rc =bnxt_setup_vnic (bp,0 );if (rc) goto err_out;
Signature · 1 line
2.30.1
Michael Chan
maintainerPATCH 4/6 bnxt_en: Skip firmware fatal error recovery if chip is not accessible
In reply to Michael ChanFrom: Vikas Gupta <[email protected]>
Driver starts firmware fatal error recovery by detecting heartbeat failure or fw reset count register changing. But these checks are not reliable if the device is not accessible. This can happen while DPC (Downstream Port containment) is in progress. Skip firmware fatal recovery if pci_device_is_present() returns false.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +3 -2
@@ -11602,6 +11602,7 @@ static void bnxt_tx_timeout(struct net_device *dev, unsigned int txqueue)static void bnxt_fw_health_check (struct bnxt *bp) {struct bnxt_fw_health *fw_health = bp->fw_health; +struct pci_dev *pdev = bp->pdev;u32 val;if (!fw_health->enabled ||test_bit (BNXT_STATE_IN_FW_RESET , &bp->state))
@@ -11615,7 +11616,7 @@ static void bnxt_fw_health_check(struct bnxt *bp) } val =bnxt_fw_health_readl (bp,BNXT_FW_HEARTBEAT_REG ); -if (val == fw_health->last_fw_heartbeat) { +if (val == fw_health->last_fw_heartbeat &&pci_device_is_present (pdev)) { fw_health->arrests++; goto fw_reset; }
@@ -11623,7 +11624,7 @@ static void bnxt_fw_health_check(struct bnxt *bp) fw_health->last_fw_heartbeat = val; val =bnxt_fw_health_readl (bp,BNXT_FW_RESET_CNT_REG ); -if (val != fw_health->last_fw_reset_cnt) { +if (val != fw_health->last_fw_reset_cnt &&pci_device_is_present (pdev)) { fw_health->discoveries++; goto fw_reset; }
Signature · 1 line
2.30.1
Michael Chan
maintainerPATCH 5/6 bnxt_en: Prevent kernel panic when receiving unexpected PHC_UPDATE event
In reply to Michael ChanFrom: Pavan Chebbi <[email protected]>
The firmware can send PHC_RTC_UPDATE async event on a PF that may not have PTP registered. In such a case, there will be a null pointer deference for bp->ptp_cfg when we try to handle the event.
Fix it by not registering for this event with the firmware if !bp->ptp_cfg. Also, check that bp->ptp_cfg is valid before proceeding when we receive the event.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 6 ++++++ drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c | 1 + 2 files changed, 7 insertions(+)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +6 -0
@@ -2365,6 +2365,9 @@ static int bnxt_async_event_process(struct bnxt *bp,struct bnxt_ptp_cfg *ptp = bp->ptp_cfg;u64 ns; +if (!ptp) + goto async_event_process_exit; +spin_lock_bh (&ptp->ptp_lock);bnxt_ptp_update_current_time (bp); ns = (((u64)BNXT_EVENT_PHC_RTC_UPDATE(data1) <<
@@ -4763,6 +4766,9 @@ int bnxt_hwrm_func_drv_rgtr(struct bnxt *bp, unsigned long *bmap, int bmap_size,if (event_id ==ASYNC_EVENT_CMPL_EVENT_ID_ERROR_RECOVERY && !(bp->fw_cap &BNXT_FW_CAP_ERROR_RECOVERY ))continue ; +if (event_id ==ASYNC_EVENT_CMPL_EVENT_ID_PHC_UPDATE && + !bp->ptp_cfg) +continue ;__set_bit (bnxt_async_events_arr[i], async_events_bmap); }if (bmap && bmap_size) {
drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c +1 -0
@@ -952,6 +952,7 @@ int bnxt_ptp_init(struct bnxt *bp, bool phc_cfg)bnxt_ptp_timecounter_init (bp, true);bnxt_ptp_adjfine_rtc (bp,0 ); } +bnxt_hwrm_func_drv_rgtr (bp,NULL ,0 , true); ptp->ptp_info = bnxt_ptp_caps;if ((bp->fw_cap &BNXT_FW_CAP_PTP_PPS )) {
Signature · 1 line
2.30.1
Michael Chan
maintainerPATCH 6/6 bnxt_en: Implement .set_port / .unset_port UDP tunnel callbacks
In reply to Michael ChanFrom: Somnath Kotur <[email protected]>
As per the new udp tunnel framework, drivers which need to know the details of a port entry (i.e. port type) when it gets deleted should use the .set_port / .unset_port callbacks.
Implementing the current .udp_tunnel_sync callback would mean that the deleted tunnel port entry would be all zeros. This used to work on older firmware because it would not check the input when deleting a tunnel port. With newer firmware, the delete will now fail and subsequent tunnel port allocation will fail as a result.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 25 ++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +18 -7
@@ -13036,26 +13036,37 @@ static void bnxt_cfg_ntp_filters(struct bnxt *bp)#endif /* CONFIG_RFS_ACCEL */ -static int bnxt_udp_tunnel_sync (struct net_device *netdev,unsigned int table) +static int bnxt_udp_tunnel_set_port (struct net_device *netdev,unsigned int table, +unsigned int entry,struct udp_tunnel_info *ti) {struct bnxt *bp =netdev_priv (netdev); -struct udp_tunnel_info ti;unsigned int cmd; -udp_tunnel_nic_get_port (netdev, table,0 , &ti); -if (ti.type ==UDP_TUNNEL_TYPE_VXLAN ) +if (ti->type ==UDP_TUNNEL_TYPE_VXLAN ) cmd =TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_VXLAN ;else cmd =TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_GENEVE ; -if (ti.port) -return bnxt_hwrm_tunnel_dst_port_alloc (bp, ti.port, cmd); +return bnxt_hwrm_tunnel_dst_port_alloc (bp, ti->port, cmd); +} + +static int bnxt_udp_tunnel_unset_port (struct net_device *netdev,unsigned int table, +unsigned int entry,struct udp_tunnel_info *ti) +{ +struct bnxt *bp =netdev_priv (netdev); +unsigned int cmd; + +if (ti->type ==UDP_TUNNEL_TYPE_VXLAN ) + cmd =TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_VXLAN ; +else + cmd =TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_GENEVE ;return bnxt_hwrm_tunnel_dst_port_free (bp, cmd); }static const struct udp_tunnel_nic_info bnxt_udp_tunnels = { - .sync_table = bnxt_udp_tunnel_sync, + .set_port = bnxt_udp_tunnel_set_port, + .unset_port = bnxt_udp_tunnel_unset_port, .flags =UDP_TUNNEL_NIC_INFO_MAY_SLEEP |UDP_TUNNEL_NIC_INFO_OPEN_ONLY , .tables = {
Signature · 1 line
2.30.1
This series was applied to netdev/net.git (main) by Paolo Abeni <[email protected]>:
Hello:
This series was applied to netdev/net.git (main)
by Paolo Abeni <[email protected]>:
Quoted 8 lines · On Wed, 7 Jun 2023 00:54:03 -0700 you wrote:
This patchset has the following fixes for
bnxt_en:1. Add missing VNIC ID parameter in the FW message when getting an updated RSS configuration from the FW.
2. Fix a warning when doing ethtool reset on newer chips.
[...]
Here is the summary with links:
- [net,1/6] bnxt_en: Fix bnxt_hwrm_update_rss_hash_cfg()
https://git.kernel.org/netdev/net/c/095d5dc0c1d9 - [net,2/6] bnxt_en: Don't issue AP reset during ethtool's reset operation https://git.kernel.org/netdev/net/c/1d997801c7cc - [net,3/6] bnxt_en: Query default VLAN before VNIC setup on a VF https://git.kernel.org/netdev/net/c/1a9e4f501bc6 - [net,4/6] bnxt_en: Skip firmware fatal error recovery if chip is not accessible https://git.kernel.org/netdev/net/c/83474a9b252a - [net,5/6] bnxt_en: Prevent kernel panic when receiving unexpected PHC_UPDATE event https://git.kernel.org/netdev/net/c/319a7827df97 - [net,6/6] bnxt_en: Implement .set_port / .unset_port UDP tunnel callbacks https://git.kernel.org/netdev/net/c/1eb4ef125913
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html