bnxt_en: Check new firmware capability to display extended stats.

Newer firmware now advertises the capability for extended stats
support.  Check the new capability in addition to the existing
version check.

Signed-off-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index b7a6005..4e0fec2 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -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 @@ alloc_tx_ext_stats:
        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)

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index 178ece3..647f7c0 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -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;