bnxt_en: Driver updates.
Michael Chan
maintainercover bnxt_en: Driver updates.
This patch series adds some extended statistics available with the new firmware interface, package version from firmware, aRFS support on 57500 chips, new PCI IDs, and some miscellaneous fixes and improvements.
Devesh Sharma (1):
bnxt_en: Separate RDMA MR/AH context allocation.
Michael Chan (5):
bnxt_en: Update firmware interface to 1.10.0.69.
bnxt_en: Improve NQ reservations.
bnxt_en: Query firmware capability to support aRFS on 57500 chips.
bnxt_en: Add support for aRFS on 57500 chips.
bnxt_en: Add device IDs 0x1806 and 0x1752 for 57500 devices.
Vasundhara Volam (5):
bnxt_en: Refactor bnxt_alloc_stats().
bnxt_en: Add support for PCIe statistics
bnxt_en: Check new firmware capability to display extended stats.
bnxt_en: Read package version from firmware.
bnxt_en: read the clause type from the PHY ID
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 213 ++++++++++++++---- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 12 + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 46 +++- drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 263 +++++++++++++++++----- 4 files changed, 432 insertions(+), 102 deletions(-)
Signature · 1 line
2.5.1
Michael Chan
maintainerPATCH 1/11 bnxt_en: Update firmware interface to 1.10.0.69.
PTP API updates for 57500 chips, new RX port stats counters and other miscellaneous updates.
--- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 4 + drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 263 +++++++++++++++++----- 2 files changed, 214 insertions(+), 53 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +4 -0
@@ -345,6 +345,10 @@ static const struct {BNXT_RX_STATS_EXT_ENTRY (resume_roce_pause_events),BNXT_RX_STATS_EXT_COS_ENTRIES ,BNXT_RX_STATS_EXT_PFC_ENTRIES , +BNXT_RX_STATS_EXT_ENTRY (rx_bits), +BNXT_RX_STATS_EXT_ENTRY (rx_buffer_passed_threshold), +BNXT_RX_STATS_EXT_ENTRY (rx_pcs_symbol_err), + BNXT_RX_STATS_EXT_ENTRY(rx_corrected_bits), }; static const struct {
drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h +210 -53
525 lines not on this page · raw message
Signature · 1 line
2.5.1
Michael Chan
maintainerPATCH 2/11 bnxt_en: Refactor bnxt_alloc_stats().
In reply to Michael ChanFrom: Vasundhara Volam <[email protected]>
Reverse the condition of the large "if" block and return early. This will simplify the follow up patch to add PCIe statistics.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 75 +++++++++++++++---------------- 1 file changed, 36 insertions(+), 39 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +36 -39
@@ -3440,56 +3440,53 @@ static int bnxt_alloc_stats(struct bnxt *bp) cpr->hw_stats_ctx_id =INVALID_STATS_CTX_ID ; } -if (BNXT_PF (bp) && bp->chip_num !=CHIP_NUM_58700 ) { -if (bp->hw_rx_port_stats) - goto alloc_ext_stats; +if (BNXT_VF (bp) || bp->chip_num ==CHIP_NUM_58700 ) +return 0 ; - bp->hw_port_stats_size =sizeof (struct rx_port_stats ) + -sizeof (struct tx_port_stats ) +1024 ; +if (bp->hw_rx_port_stats) + goto alloc_ext_stats; - bp->hw_rx_port_stats = -dma_alloc_coherent (&pdev->dev, bp->hw_port_stats_size, - &bp->hw_rx_port_stats_map, -GFP_KERNEL ); -if (!bp->hw_rx_port_stats) -return -ENOMEM ; + bp->hw_port_stats_size =sizeof (struct rx_port_stats ) + +sizeof (struct tx_port_stats ) +1024 ; + + bp->hw_rx_port_stats = +dma_alloc_coherent (&pdev->dev, bp->hw_port_stats_size, + &bp->hw_rx_port_stats_map, +GFP_KERNEL ); +if (!bp->hw_rx_port_stats) +return -ENOMEM ; - bp->hw_tx_port_stats = (void *)(bp->hw_rx_port_stats +1 ) + -512 ; - bp->hw_tx_port_stats_map = bp->hw_rx_port_stats_map + -sizeof (struct rx_port_stats ) +512 ; - bp->flags |=BNXT_FLAG_PORT_STATS ; + bp->hw_tx_port_stats = (void *)(bp->hw_rx_port_stats +1 ) +512 ; + bp->hw_tx_port_stats_map = bp->hw_rx_port_stats_map + +sizeof (struct rx_port_stats ) +512 ; + bp->flags |=BNXT_FLAG_PORT_STATS ; alloc_ext_stats: -/* Display extended statistics only if FW supports it */ -if (bp->hwrm_spec_code <0x10804 || - bp->hwrm_spec_code ==0x10900 ) -return 0 ; +/* Display extended statistics only if FW supports it */ +if (bp->hwrm_spec_code <0x10804 || bp->hwrm_spec_code ==0x10900 ) +return 0 ; -if (bp->hw_rx_port_stats_ext) - goto alloc_tx_ext_stats; +if (bp->hw_rx_port_stats_ext) + goto alloc_tx_ext_stats; - bp->hw_rx_port_stats_ext = -dma_alloc_coherent (&pdev->dev, -sizeof (struct rx_port_stats_ext ), - &bp->hw_rx_port_stats_ext_map, -GFP_KERNEL ); -if (!bp->hw_rx_port_stats_ext) -return 0 ; + bp->hw_rx_port_stats_ext = +dma_alloc_coherent (&pdev->dev,sizeof (struct rx_port_stats_ext ), + &bp->hw_rx_port_stats_ext_map,GFP_KERNEL ); +if (!bp->hw_rx_port_stats_ext) +return 0 ; alloc_tx_ext_stats: -if (bp->hw_tx_port_stats_ext) -return 0 ; +if (bp->hw_tx_port_stats_ext) +return 0 ; -if (bp->hwrm_spec_code >=0x10902 ) { - bp->hw_tx_port_stats_ext = -dma_alloc_coherent (&pdev->dev, -sizeof (struct tx_port_stats_ext ), - &bp->hw_tx_port_stats_ext_map, -GFP_KERNEL ); - } - bp->flags |=BNXT_FLAG_PORT_STATS_EXT ; +if (bp->hwrm_spec_code >=0x10902 ) { + bp->hw_tx_port_stats_ext = +dma_alloc_coherent (&pdev->dev, +sizeof (struct tx_port_stats_ext ), + &bp->hw_tx_port_stats_ext_map, +GFP_KERNEL ); } + bp->flags |=BNXT_FLAG_PORT_STATS_EXT ;return 0 ; }
Signature · 1 line
2.5.1
Michael Chan
maintainerPATCH 3/11 bnxt_en: Add support for PCIe statistics
In reply to Michael ChanFrom: Vasundhara Volam <[email protected]>
Gather periodic PCIe statistics for ethtool -S.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 37 ++++++++++++++++++++- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 7 ++++ drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 39 +++++++++++++++++++++++ 3 files changed, 82 insertions(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +36 -1
@@ -3396,6 +3396,12 @@ static void bnxt_free_port_stats(struct bnxt *bp) bp->hw_rx_port_stats_ext_map); bp->hw_rx_port_stats_ext =NULL ; } + +if (bp->hw_pcie_stats) { +dma_free_coherent (&pdev->dev,sizeof (struct pcie_ctx_hw_stats ), + bp->hw_pcie_stats, bp->hw_pcie_stats_map); + bp->hw_pcie_stats =NULL ; + } }static void bnxt_free_ring_stats (struct bnxt *bp)
@@ -3477,7 +3483,7 @@ static int bnxt_alloc_stats(struct bnxt *bp) alloc_tx_ext_stats:if (bp->hw_tx_port_stats_ext) -return 0 ; + goto alloc_pcie_stats;if (bp->hwrm_spec_code >=0x10902 ) { bp->hw_tx_port_stats_ext =
@@ -3487,6 +3493,19 @@ static int bnxt_alloc_stats(struct bnxt *bp) GFP_KERNEL); } bp->flags |=BNXT_FLAG_PORT_STATS_EXT ; + +alloc_pcie_stats: +if (bp->hw_pcie_stats || + !(bp->fw_cap &BNXT_FW_CAP_PCIE_STATS_SUPPORTED )) +return 0 ; + + bp->hw_pcie_stats = +dma_alloc_coherent (&pdev->dev,sizeof (struct pcie_ctx_hw_stats ), + &bp->hw_pcie_stats_map,GFP_KERNEL ); +if (!bp->hw_pcie_stats) +return 0 ; + + bp->flags |=BNXT_FLAG_PCIE_STATS ;return 0 ; }
@@ -6505,6 +6524,8 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp) bp->flags |=BNXT_FLAG_ROCEV1_CAP ;if (flags &FUNC_QCAPS_RESP_FLAGS_ROCE_V2_SUPPORTED ) bp->flags |=BNXT_FLAG_ROCEV2_CAP ; +if (flags &FUNC_QCAPS_RESP_FLAGS_PCIE_STATS_SUPPORTED ) + bp->fw_cap |=BNXT_FW_CAP_PCIE_STATS_SUPPORTED ; bp->tx_push_thresh =0 ;if (flags &FUNC_QCAPS_RESP_FLAGS_PUSH_MODE_SUPPORTED )
@@ -6805,6 +6826,19 @@ static int bnxt_hwrm_port_qstats_ext(struct bnxt *bp)return rc; } +static int bnxt_hwrm_pcie_qstats (struct bnxt *bp) +{ +struct hwrm_pcie_qstats_input req = {0 }; + +if (!(bp->flags &BNXT_FLAG_PCIE_STATS )) +return 0 ; + +bnxt_hwrm_cmd_hdr_init (bp, &req,HWRM_PCIE_QSTATS ,-1 ,-1 ); + req.pcie_stat_size =cpu_to_le16 (sizeof (struct pcie_ctx_hw_stats )); + req.pcie_stat_host_addr =cpu_to_le64 (bp->hw_pcie_stats_map); +return hwrm_send_message (bp, &req,sizeof (req),HWRM_CMD_TIMEOUT ); +} +static void bnxt_hwrm_free_tunnel_ports (struct bnxt *bp) {if (bp->vxlan_port_cnt) {
@@ -9395,6 +9429,7 @@ static void bnxt_sp_task(struct work_struct *work)if (test_and_clear_bit (BNXT_PERIODIC_STATS_SP_EVENT , &bp->sp_event)) {bnxt_hwrm_port_qstats (bp);bnxt_hwrm_port_qstats_ext (bp); +bnxt_hwrm_pcie_qstats (bp); }if (test_and_clear_bit (BNXT_LINK_CHNG_SP_EVENT , &bp->sp_event)) {
drivers/net/ethernet/broadcom/bnxt/bnxt.h +7 -0
@@ -1354,6 +1354,7 @@ struct bnxt {#define BNXT_FLAG_DIM 0x2000000#define BNXT_FLAG_ROCE_MIRROR_CAP 0x4000000#define BNXT_FLAG_PORT_STATS_EXT 0x10000000 +#define BNXT_FLAG_PCIE_STATS 0x40000000#define BNXT_FLAG_ALL_CONFIG_FEATS (BNXT_FLAG_TPA | \ BNXT_FLAG_RFS | \
@@ -1480,6 +1481,7 @@ struct bnxt {#define BNXT_FW_CAP_KONG_MB_CHNL 0x00000080#define BNXT_FW_CAP_OVS_64BIT_HANDLE 0x00000400#define BNXT_FW_CAP_TRUSTED_VF 0x00000800 +#define BNXT_FW_CAP_PCIE_STATS_SUPPORTED 0x00020000#define BNXT_NEW_RM (bp) ((bp)->fw_cap & BNXT_FW_CAP_NEW_RM)u32 hwrm_spec_code;
@@ -1498,10 +1500,12 @@ struct bnxt {struct tx_port_stats *hw_tx_port_stats;struct rx_port_stats_ext *hw_rx_port_stats_ext;struct tx_port_stats_ext *hw_tx_port_stats_ext; +struct pcie_ctx_hw_stats *hw_pcie_stats;dma_addr_t hw_rx_port_stats_map;dma_addr_t hw_tx_port_stats_map;dma_addr_t hw_rx_port_stats_ext_map;dma_addr_t hw_tx_port_stats_ext_map; +dma_addr_t hw_pcie_stats_map;int hw_port_stats_size;u16 fw_rx_stats_ext_size;u16 fw_tx_stats_ext_size;
@@ -1634,6 +1638,9 @@ struct bnxt {#define BNXT_TX_STATS_EXT_OFFSET (counter) \ (offsetof(struct tx_port_stats_ext, counter) / 8) +#define BNXT_PCIE_STATS_OFFSET (counter) \ + (offsetof(struct pcie_ctx_hw_stats, counter) / 8) +#define I2C_DEV_ADDR_A0 0xa0#define I2C_DEV_ADDR_A2 0xa2#define SFF_DIAG_SUPPORT_OFFSET 0x5c
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +39 -0
@@ -235,6 +235,9 @@ static int bnxt_set_coalesce(struct net_device *dev,BNXT_TX_STATS_PRI_ENTRY (counter,6 ), \ BNXT_TX_STATS_PRI_ENTRY(counter, 7) +#define BNXT_PCIE_STATS_ENTRY (counter) \ + { BNXT_PCIE_STATS_OFFSET(counter), __stringify(counter) } +enum {RX_TOTAL_DISCARDS ,TX_TOTAL_DISCARDS ,
@@ -387,6 +390,24 @@ static const struct { BNXT_TX_STATS_PRI_ENTRIES(tx_packets), }; +static const struct { +long offset; +char string[ETH_GSTRING_LEN ]; +} bnxt_pcie_stats_arr[] = { +BNXT_PCIE_STATS_ENTRY (pcie_pl_signal_integrity), +BNXT_PCIE_STATS_ENTRY (pcie_dl_signal_integrity), +BNXT_PCIE_STATS_ENTRY (pcie_tl_signal_integrity), +BNXT_PCIE_STATS_ENTRY (pcie_link_integrity), +BNXT_PCIE_STATS_ENTRY (pcie_tx_traffic_rate), +BNXT_PCIE_STATS_ENTRY (pcie_rx_traffic_rate), +BNXT_PCIE_STATS_ENTRY (pcie_tx_dllp_statistics), +BNXT_PCIE_STATS_ENTRY (pcie_rx_dllp_statistics), +BNXT_PCIE_STATS_ENTRY (pcie_equalization_time), +BNXT_PCIE_STATS_ENTRY (pcie_ltssm_histogram[0 ]), +BNXT_PCIE_STATS_ENTRY (pcie_ltssm_histogram[2 ]), +BNXT_PCIE_STATS_ENTRY (pcie_recovery_histogram), +}; +#define BNXT_NUM_SW_FUNC_STATS ARRAY_SIZE(bnxt_sw_func_stats)#define BNXT_NUM_PORT_STATS ARRAY_SIZE(bnxt_port_stats_arr)#define BNXT_NUM_STATS_PRI \
@@ -394,6 +415,7 @@ static const struct { ARRAY_SIZE(bnxt_rx_pkts_pri_arr) + \ ARRAY_SIZE(bnxt_tx_bytes_pri_arr) + \ ARRAY_SIZE(bnxt_tx_pkts_pri_arr)) +#define BNXT_NUM_PCIE_STATS ARRAY_SIZE(bnxt_pcie_stats_arr)static int bnxt_get_num_stats (struct bnxt *bp) {
@@ -411,6 +433,9 @@ static int bnxt_get_num_stats(struct bnxt *bp) num_stats +=BNXT_NUM_STATS_PRI ; } +if (bp->flags &BNXT_FLAG_PCIE_STATS ) + num_stats +=BNXT_NUM_PCIE_STATS ; +return num_stats; }
@@ -513,6 +538,14 @@ static void bnxt_get_ethtool_stats(struct net_device *dev, } } } +if (bp->flags &BNXT_FLAG_PCIE_STATS ) { +__le64 *pcie_stats = (__le64 *)bp->hw_pcie_stats; + +for (i =0 ; i <BNXT_NUM_PCIE_STATS ; i++, j++) { + buf[j] =le64_to_cpu (*(pcie_stats + + bnxt_pcie_stats_arr[i].offset)); + } + } }static void bnxt_get_strings (struct net_device *dev,u32 stringset,u8 *buf)
@@ -613,6 +646,12 @@ static void bnxt_get_strings(struct net_device *dev, u32 stringset, u8 *buf) } } } +if (bp->flags &BNXT_FLAG_PCIE_STATS ) { +for (i =0 ; i <BNXT_NUM_PCIE_STATS ; i++) { +strcpy (buf, bnxt_pcie_stats_arr[i].string); + buf +=ETH_GSTRING_LEN ; + } + }break ;case ETH_SS_TEST :if (bp->num_tests)
Signature · 1 line
2.5.1
Michael Chan
maintainerPATCH 4/11 bnxt_en: Check new firmware capability to display extended stats.
In reply to Michael ChanFrom: Vasundhara Volam <[email protected]>
Newer firmware now advertises the capability for extended stats support. Check the new capability in addition to the existing version check.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 8 ++++++-- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 + 2 files changed, 7 insertions(+), 2 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +6 -2
@@ -3470,7 +3470,8 @@ static int bnxt_alloc_stats(struct bnxt *bp) alloc_ext_stats:/* Display extended statistics only if FW supports it */ if (bp->hwrm_spec_code <0x10804 || bp->hwrm_spec_code ==0x10900 ) -return 0 ; +if (!(bp->fw_cap &BNXT_FW_CAP_EXT_STATS_SUPPORTED )) +return 0 ;if (bp->hw_rx_port_stats_ext) goto alloc_tx_ext_stats;
@@ -3485,7 +3486,8 @@ static int bnxt_alloc_stats(struct bnxt *bp)if (bp->hw_tx_port_stats_ext) goto alloc_pcie_stats; -if (bp->hwrm_spec_code >=0x10902 ) { +if (bp->hwrm_spec_code >=0x10902 || + (bp->fw_cap &BNXT_FW_CAP_EXT_STATS_SUPPORTED )) { bp->hw_tx_port_stats_ext = dma_alloc_coherent(&pdev->dev, sizeof(struct tx_port_stats_ext),
@@ -6526,6 +6528,8 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp) bp->flags |=BNXT_FLAG_ROCEV2_CAP ;if (flags &FUNC_QCAPS_RESP_FLAGS_PCIE_STATS_SUPPORTED ) bp->fw_cap |=BNXT_FW_CAP_PCIE_STATS_SUPPORTED ; +if (flags &FUNC_QCAPS_RESP_FLAGS_EXT_STATS_SUPPORTED ) + bp->fw_cap |=BNXT_FW_CAP_EXT_STATS_SUPPORTED ; bp->tx_push_thresh =0 ;if (flags &FUNC_QCAPS_RESP_FLAGS_PUSH_MODE_SUPPORTED )
drivers/net/ethernet/broadcom/bnxt/bnxt.h +1 -0
@@ -1482,6 +1482,7 @@ struct bnxt {#define BNXT_FW_CAP_OVS_64BIT_HANDLE 0x00000400#define BNXT_FW_CAP_TRUSTED_VF 0x00000800#define BNXT_FW_CAP_PCIE_STATS_SUPPORTED 0x00020000 +#define BNXT_FW_CAP_EXT_STATS_SUPPORTED 0x00040000#define BNXT_NEW_RM (bp) ((bp)->fw_cap & BNXT_FW_CAP_NEW_RM)u32 hwrm_spec_code;
Signature · 1 line
2.5.1
Michael Chan
maintainerPATCH 5/11 bnxt_en: Read package version from firmware.
In reply to Michael ChanFrom: Vasundhara Volam <[email protected]>
HWRM_VER_GET firmware command returns package name that is running actively on the adapter. Use this version instead of parsing from the package log in NVRAM.
main/Cumulus/drivers/linux/v3/bnxt.c +0 -0
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 9 +++++++++ drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +9 -0
@@ -6693,6 +6693,15 @@ static int bnxt_hwrm_ver_get(struct bnxt *bp) resp->hwrm_fw_maj_8b, resp->hwrm_fw_min_8b, resp->hwrm_fw_bld_8b, resp->hwrm_fw_rsvd_8b); +if (strlen (resp->active_pkg_name)) { +int fw_ver_len =strlen (bp->fw_ver_str); + +snprintf (bp->fw_ver_str + fw_ver_len, +FW_VER_STR_LEN - fw_ver_len -1 ,"/pkg %s" , + resp->active_pkg_name); + bp->fw_cap |=BNXT_FW_CAP_PKG_VER ; + } + bp->hwrm_cmd_timeout =le16_to_cpu (resp->def_req_timeout);if (!bp->hwrm_cmd_timeout) bp->hwrm_cmd_timeout =DFLT_HWRM_CMD_TIMEOUT ;
drivers/net/ethernet/broadcom/bnxt/bnxt.h +1 -0
@@ -1481,6 +1481,7 @@ struct bnxt {#define BNXT_FW_CAP_KONG_MB_CHNL 0x00000080#define BNXT_FW_CAP_OVS_64BIT_HANDLE 0x00000400#define BNXT_FW_CAP_TRUSTED_VF 0x00000800 +#define BNXT_FW_CAP_PKG_VER 0x00004000#define BNXT_FW_CAP_PCIE_STATS_SUPPORTED 0x00020000#define BNXT_FW_CAP_EXT_STATS_SUPPORTED 0x00040000
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +2 -1
@@ -3305,7 +3305,8 @@ void bnxt_ethtool_init(struct bnxt *bp)struct net_device *dev = bp->dev;int i, rc; -bnxt_get_pkgver (dev); +if (!(bp->fw_cap &BNXT_FW_CAP_PKG_VER )) +bnxt_get_pkgver (dev);if (bp->hwrm_spec_code <0x10704 || !BNXT_SINGLE_PF (bp))return ;
Signature · 1 line
2.5.1
Michael Chan
maintainerPATCH 6/11 bnxt_en: read the clause type from the PHY ID
In reply to Michael ChanFrom: Vasundhara Volam <[email protected]>
Currently driver hard code Clause 45 based on speed supported by the PHY. Instead read the clause type from the PHY ID provided as input to the mdio ioctl.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +2 -2
@@ -8699,7 +8699,7 @@ static int bnxt_hwrm_port_phy_read(struct bnxt *bp, u16 phy_addr, u16 reg, req.port_id =cpu_to_le16 (bp->pf.port_id); req.phy_addr = phy_addr; req.reg_addr =cpu_to_le16 (reg &0x1f ); -if (bp->link_info.support_speeds &BNXT_LINK_SPEED_MSK_10GB ) { +if (mdio_phy_id_is_c45 (phy_addr)) { req.cl45_mdio =1 ; req.phy_addr =mdio_phy_id_prtad (phy_addr); req.dev_addr =mdio_phy_id_devad (phy_addr);
@@ -8726,7 +8726,7 @@ static int bnxt_hwrm_port_phy_write(struct bnxt *bp, u16 phy_addr, u16 reg, req.port_id =cpu_to_le16 (bp->pf.port_id); req.phy_addr = phy_addr; req.reg_addr =cpu_to_le16 (reg &0x1f ); -if (bp->link_info.support_speeds &BNXT_LINK_SPEED_MSK_10GB ) { +if (mdio_phy_id_is_c45 (phy_addr)) { req.cl45_mdio =1 ; req.phy_addr =mdio_phy_id_prtad (phy_addr); req.dev_addr =mdio_phy_id_devad (phy_addr);
Signature · 1 line
2.5.1
Michael Chan
maintainerPATCH 7/11 bnxt_en: Separate RDMA MR/AH context allocation.
In reply to Michael ChanFrom: Devesh Sharma <[email protected]>
In newer firmware, the context memory for MR (Memory Region) and AH (Address Handle) to support RDMA are specified separately. Modify driver to specify and allocate the 2 context memory types separately when supported by the firmware.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 19 ++++++++++++++++++- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 + 2 files changed, 19 insertions(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +18 -1
@@ -6074,6 +6074,8 @@ static int bnxt_hwrm_func_backing_store_qcaps(struct bnxt *bp) ctx->tqm_entries_multiple =1 ; ctx->mrav_max_entries =le32_to_cpu (resp->mrav_max_entries); ctx->mrav_entry_size =le16_to_cpu (resp->mrav_entry_size); + ctx->mrav_num_entries_units = +le16_to_cpu (resp->mrav_num_entries_units); ctx->tim_entry_size =le16_to_cpu (resp->tim_entry_size); ctx->tim_max_entries =le32_to_cpu (resp->tim_max_entries); }else {
@@ -6120,6 +6122,7 @@ static int bnxt_hwrm_func_backing_store_cfg(struct bnxt *bp, u32 enables)struct bnxt_ctx_pg_info *ctx_pg;__le32 *num_entries;__le64 *pg_dir; +u32 flags =0 ;u8 *pg_attr;int i, rc;u32 ena;
@@ -6179,6 +6182,9 @@ static int bnxt_hwrm_func_backing_store_cfg(struct bnxt *bp, u32 enables)if (enables &FUNC_BACKING_STORE_CFG_REQ_ENABLES_MRAV ) { ctx_pg = &ctx->mrav_mem; req.mrav_num_entries =cpu_to_le32 (ctx_pg->entries); +if (ctx->mrav_num_entries_units) + flags |= +FUNC_BACKING_STORE_CFG_REQ_FLAGS_MRAV_RESERVATION_SPLIT ; req.mrav_entry_size =cpu_to_le16 (ctx->mrav_entry_size); bnxt_hwrm_set_pg_attr(&ctx_pg->ring_mem, &req.mrav_pg_size_mrav_lvl,
@@ -6205,6 +6211,7 @@ static int bnxt_hwrm_func_backing_store_cfg(struct bnxt *bp, u32 enables) *num_entries =cpu_to_le32 (ctx_pg->entries);bnxt_hwrm_set_pg_attr (&ctx_pg->ring_mem, pg_attr, pg_dir); } + req.flags =cpu_to_le32 (flags); rc =hwrm_send_message (bp, &req,sizeof (req),HWRM_CMD_TIMEOUT );if (rc) rc = -EIO ;
@@ -6343,6 +6350,7 @@ static int bnxt_alloc_ctx_mem(struct bnxt *bp)struct bnxt_ctx_pg_info *ctx_pg;struct bnxt_ctx_mem_info *ctx;u32 mem_size, ena, entries; +u32 num_mr, num_ah;u32 extra_srqs =0 ;u32 extra_qps =0 ;u8 pg_lvl =1 ;
@@ -6406,12 +6414,21 @@ static int bnxt_alloc_ctx_mem(struct bnxt *bp) goto skip_rdma; ctx_pg = &ctx->mrav_mem; - ctx_pg->entries = extra_qps *4 ; +/* 128K extra is needed to accommodate static AH context +* allocation by f/w. +*/ + num_mr =1024 *256 ; + num_ah =1024 *128 ; + ctx_pg->entries = num_mr + num_ah; mem_size = ctx->mrav_entry_size * ctx_pg->entries; rc =bnxt_alloc_ctx_pg_tbls (bp, ctx_pg, mem_size,2 );if (rc)return rc; ena =FUNC_BACKING_STORE_CFG_REQ_ENABLES_MRAV ; +if (ctx->mrav_num_entries_units) + ctx_pg->entries = + ((num_mr / ctx->mrav_num_entries_units) <<16 ) | + (num_ah / ctx->mrav_num_entries_units); ctx_pg = &ctx->tim_mem; ctx_pg->entries = ctx->qp_mem.entries;
drivers/net/ethernet/broadcom/bnxt/bnxt.h +1 -0
@@ -1227,6 +1227,7 @@ struct bnxt_ctx_mem_info {u16 mrav_entry_size;u16 tim_entry_size;u32 tim_max_entries; +u16 mrav_num_entries_units;u8 tqm_entries_multiple;u32 flags;
Signature · 1 line
2.5.1
Michael Chan
maintainerPATCH 8/11 bnxt_en: Improve NQ reservations.
In reply to Michael Chanbnxt_need_reserve_rings() determines if any resources have changed and requires new reservation with firmware. The NQ checking is currently just an approximation. Improve the NQ checking logic to make it accurate. NQ reservation is only needed on 57500 PFs. This fix will eliminate unnecessary reservations and will reduce NQ reservations when some NQs have been released on 57500 PFs.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +4 -2
@@ -5521,11 +5521,13 @@ static bool bnxt_need_reserve_rings(struct bnxt *bp) stat =bnxt_get_func_stat_ctxs (bp);if (BNXT_NEW_RM (bp) && (hw_resc->resv_rx_rings != rx || hw_resc->resv_cp_rings != cp || - hw_resc->resv_irqs < nq || hw_resc->resv_vnics != vnic || - hw_resc->resv_stat_ctxs != stat || + hw_resc->resv_vnics != vnic || hw_resc->resv_stat_ctxs != stat || (hw_resc->resv_hw_ring_grps != grp && !(bp->flags &BNXT_FLAG_CHIP_P5 ))))return true; +if ((bp->flags &BNXT_FLAG_CHIP_P5 ) &&BNXT_PF (bp) && + hw_resc->resv_irqs != nq) +return true;return false; }
Signature · 1 line
2.5.1
Michael Chan
maintainerPATCH 9/11 bnxt_en: Query firmware capability to support aRFS on 57500 chips.
In reply to Michael ChanQuery support for the aRFS ring table index in the firmware.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 43 ++++++++++++++++++++++++++++++- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 2 ++ 2 files changed, 44 insertions(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +42 -1
@@ -6621,6 +6621,34 @@ static int bnxt_hwrm_func_qcaps(struct bnxt *bp)return 0 ; } +static int bnxt_hwrm_cfa_adv_flow_mgnt_qcaps (struct bnxt *bp) +{ +struct hwrm_cfa_adv_flow_mgnt_qcaps_input req = {0 }; +struct hwrm_cfa_adv_flow_mgnt_qcaps_output *resp; +int rc =0 ; +u32 flags; + +if (!(bp->fw_cap &BNXT_FW_CAP_CFA_ADV_FLOW )) +return 0 ; + + resp = bp->hwrm_cmd_resp_addr; +bnxt_hwrm_cmd_hdr_init (bp, &req,HWRM_CFA_ADV_FLOW_MGNT_QCAPS ,-1 ,-1 ); + +mutex_lock (&bp->hwrm_cmd_lock); + rc =_hwrm_send_message (bp, &req,sizeof (req),HWRM_CMD_TIMEOUT ); +if (rc) + goto hwrm_cfa_adv_qcaps_exit; + + flags =le32_to_cpu (resp->flags); +if (flags & +CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_RFS_RING_TBL_IDX_SUPPORTED ) + bp->fw_cap |=BNXT_FW_CAP_CFA_RFS_RING_TBL_IDX ; + +hwrm_cfa_adv_qcaps_exit: +mutex_unlock (&bp->hwrm_cmd_lock); +return rc; +} +static int bnxt_hwrm_func_reset (struct bnxt *bp) {struct hwrm_func_reset_input req = {0 };
@@ -6753,6 +6781,10 @@ static int bnxt_hwrm_ver_get(struct bnxt *bp) VER_GET_RESP_DEV_CAPS_CFG_TRUSTED_VF_SUPPORTED) bp->fw_cap |= BNXT_FW_CAP_TRUSTED_VF; +if (dev_caps_cfg & +VER_GET_RESP_DEV_CAPS_CFG_CFA_ADV_FLOW_MGNT_SUPPORTED ) + bp->fw_cap |=BNXT_FW_CAP_CFA_ADV_FLOW ; + hwrm_ver_get_exit:mutex_unlock (&bp->hwrm_cmd_lock);return rc;
@@ -9063,8 +9095,11 @@ static bool bnxt_can_reserve_rings(struct bnxt *bp)/* If the chip and firmware supports RFS */ static bool bnxt_rfs_supported (struct bnxt *bp) { -if (bp->flags &BNXT_FLAG_CHIP_P5 ) +if (bp->flags &BNXT_FLAG_CHIP_P5 ) { +if (bp->fw_cap &BNXT_FW_CAP_CFA_RFS_RING_TBL_IDX ) +return true;return false; + }if (BNXT_PF (bp) && !BNXT_CHIP_TYPE_NITRO_A0 (bp))return true;if (bp->flags &BNXT_FLAG_NEW_RSS_CAP )
@@ -10665,6 +10700,12 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) rc =-1 ; goto init_err_pci_clean; } + + rc =bnxt_hwrm_cfa_adv_flow_mgnt_qcaps (bp); +if (rc) +netdev_warn (bp->dev,"hwrm query adv flow mgnt failure rc: %d\n" , + rc); + rc =bnxt_init_mac_addr (bp);if (rc) {dev_err (&pdev->dev,"Unable to initialize mac address.\n" );
drivers/net/ethernet/broadcom/bnxt/bnxt.h +2 -0
@@ -1483,6 +1483,8 @@ struct bnxt {#define BNXT_FW_CAP_OVS_64BIT_HANDLE 0x00000400#define BNXT_FW_CAP_TRUSTED_VF 0x00000800#define BNXT_FW_CAP_PKG_VER 0x00004000 +#define BNXT_FW_CAP_CFA_ADV_FLOW 0x00008000 +#define BNXT_FW_CAP_CFA_RFS_RING_TBL_IDX 0x00010000#define BNXT_FW_CAP_PCIE_STATS_SUPPORTED 0x00020000#define BNXT_FW_CAP_EXT_STATS_SUPPORTED 0x00040000
Signature · 1 line
2.5.1
Michael Chan
maintainerPATCH 10/11 bnxt_en: Add support for aRFS on 57500 chips.
In reply to Michael ChanSet RSS ring table index of the RFS destination ring for the NTUPLE filters on 57500 chips.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +12 -4
@@ -4226,16 +4226,25 @@ static int bnxt_hwrm_cfa_ntuple_filter_free(struct bnxt *bp,static int bnxt_hwrm_cfa_ntuple_filter_alloc (struct bnxt *bp,struct bnxt_ntuple_filter *fltr) { -struct bnxt_vnic_info *vnic = &bp->vnic_info[fltr->rxq +1 ];struct hwrm_cfa_ntuple_filter_alloc_input req = {0 };struct hwrm_cfa_ntuple_filter_alloc_output *resp;struct flow_keys *keys = &fltr->fkeys; +struct bnxt_vnic_info *vnic; +u32 dst_ena =0 ;int rc =0 ;bnxt_hwrm_cmd_hdr_init (bp, &req,HWRM_CFA_NTUPLE_FILTER_ALLOC ,-1 ,-1 ); req.l2_filter_id = bp->vnic_info[0 ].fw_l2_filter_id[fltr->l2_fltr_idx]; - req.enables =cpu_to_le32 (BNXT_NTP_FLTR_FLAGS ); +if (bp->fw_cap &BNXT_FW_CAP_CFA_RFS_RING_TBL_IDX ) { + dst_ena =CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_RFS_RING_TBL_IDX ; + req.rfs_ring_tbl_idx =cpu_to_le16 (fltr->rxq); + vnic = &bp->vnic_info[0 ]; + }else { + vnic = &bp->vnic_info[fltr->rxq +1 ]; + } + req.dst_id =cpu_to_le16 (vnic->fw_vnic_id); + req.enables =cpu_to_le32 (BNXT_NTP_FLTR_FLAGS | dst_ena); req.ethertype =htons (ETH_P_IP );memcpy (req.src_macaddr, fltr->src_mac_addr,ETH_ALEN );
@@ -4273,7 +4282,6 @@ static int bnxt_hwrm_cfa_ntuple_filter_alloc(struct bnxt *bp, req.dst_port = keys->ports.dst; req.dst_port_mask =cpu_to_be16 (0xffff ); - req.dst_id =cpu_to_le16 (vnic->fw_vnic_id);mutex_lock (&bp->hwrm_cmd_lock); rc =_hwrm_send_message (bp, &req,sizeof (req),HWRM_CMD_TIMEOUT );if (!rc) {
@@ -9114,7 +9122,7 @@ static bool bnxt_rfs_capable(struct bnxt *bp)int vnics, max_vnics, max_rss_ctxs;if (bp->flags &BNXT_FLAG_CHIP_P5 ) -return false; +return bnxt_rfs_supported (bp);if (!(bp->flags &BNXT_FLAG_MSIX_CAP ) || !bnxt_can_reserve_rings (bp))return false;
Signature · 1 line
2.5.1
Michael Chan
maintainerPATCH 11/11 bnxt_en: Add device IDs 0x1806 and 0x1752 for 57500 devices.
In reply to Michael Chan0x1806 and 0x1752 are VF variant and PF variant of the 57500 chip family.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +4 -0
@@ -114,6 +114,7 @@ enum board_idx { BCM5745x_NPAR,BCM57508 ,BCM57504 , +BCM57502 ,BCM58802 ,BCM58804 , BCM58808,
@@ -158,6 +159,7 @@ static const struct { [BCM5745x_NPAR] = { "Broadcom BCM5745x NetXtreme-E Ethernet Partition" }, [BCM57508] = { "Broadcom BCM57508 NetXtreme-E 10Gb/25Gb/50Gb/100Gb/200Gb Ethernet" }, [BCM57504] = { "Broadcom BCM57504 NetXtreme-E 10Gb/25Gb/50Gb/100Gb/200Gb Ethernet" }, + [BCM57502] = { "Broadcom BCM57502 NetXtreme-E 10Gb/25Gb/50Gb Ethernet" }, [BCM58802] = { "Broadcom BCM58802 NetXtreme-S 10Gb/25Gb/40Gb/50Gb Ethernet" }, [BCM58804] = { "Broadcom BCM58804 NetXtreme-S 10Gb/25Gb/40Gb/50Gb/100Gb Ethernet" }, [BCM58808] = { "Broadcom BCM58808 NetXtreme-S 10Gb/25Gb/40Gb/50Gb/100Gb Ethernet" },
@@ -205,6 +207,7 @@ static const struct pci_device_id bnxt_pci_tbl[] = { { PCI_VDEVICE(BROADCOM, 0x16f1), .driver_data = BCM57452 }, { PCI_VDEVICE(BROADCOM, 0x1750), .driver_data = BCM57508 }, { PCI_VDEVICE(BROADCOM, 0x1751), .driver_data = BCM57504 }, + { PCI_VDEVICE(BROADCOM, 0x1752), .driver_data = BCM57502 }, { PCI_VDEVICE(BROADCOM, 0xd802), .driver_data = BCM58802 }, { PCI_VDEVICE(BROADCOM, 0xd804), .driver_data = BCM58804 }, #ifdef CONFIG_BNXT_SRIOV
@@ -216,6 +219,7 @@ static const struct pci_device_id bnxt_pci_tbl[] = { { PCI_VDEVICE(BROADCOM, 0x16dc), .driver_data = NETXTREME_E_VF }, { PCI_VDEVICE(BROADCOM, 0x16e1), .driver_data = NETXTREME_C_VF }, { PCI_VDEVICE(BROADCOM, 0x16e5), .driver_data = NETXTREME_C_VF }, + { PCI_VDEVICE(BROADCOM, 0x1806), .driver_data = NETXTREME_E_P5_VF }, { PCI_VDEVICE(BROADCOM, 0x1807), .driver_data = NETXTREME_E_P5_VF }, { PCI_VDEVICE(BROADCOM, 0xd800), .driver_data = NETXTREME_S_VF }, #endif
Signature · 1 line
2.5.1
David Miller
maintainerFrom: Michael Chan <[email protected]>
Date: Sun, 5 May 2019 07:16:57 -0400
Quoted 3 lines
This patch series adds some extended statistics available with the new firmware interface, package version from firmware, aRFS support on 57500 chips, new PCI IDs, and some miscellaneous fixes and improvements.
Series applied.