bnxt_en: Add additional extended port statistics.

Latest firmware spec. has some additional rx extended port stats and new
tx extended port stats added.  We now need to check the size of the
returned rx and tx extended stats and determine how many counters are
valid.  New counters added include CoS byte and packet counts for rx
and tx.

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 e2d9254..84c1e6c 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -3078,6 +3078,13 @@ static void bnxt_free_stats(struct bnxt *bp)
                bp->hw_rx_port_stats = NULL;
        }
 
+       if (bp->hw_tx_port_stats_ext) {
+               dma_free_coherent(&pdev->dev, sizeof(struct tx_port_stats_ext),
+                                 bp->hw_tx_port_stats_ext,
+                                 bp->hw_tx_port_stats_ext_map);
+               bp->hw_tx_port_stats_ext = NULL;
+       }
+
        if (bp->hw_rx_port_stats_ext) {
                dma_free_coherent(&pdev->dev, sizeof(struct rx_port_stats_ext),
                                  bp->hw_rx_port_stats_ext,
@@ -3152,6 +3159,13 @@ static int bnxt_alloc_stats(struct bnxt *bp)
                if (!bp->hw_rx_port_stats_ext)
                        return 0;
 
+               if (bp->hwrm_spec_code >= 0x10902) {
+                       bp->hw_tx_port_stats_ext =
+                               dma_zalloc_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;
@@ -5425,8 +5439,10 @@ static int bnxt_hwrm_port_qstats(struct bnxt *bp)
 
 static int bnxt_hwrm_port_qstats_ext(struct bnxt *bp)
 {
+       struct hwrm_port_qstats_ext_output *resp = bp->hwrm_cmd_resp_addr;
        struct hwrm_port_qstats_ext_input req = {0};
        struct bnxt_pf_info *pf = &bp->pf;
+       int rc;
 
        if (!(bp->flags & BNXT_FLAG_PORT_STATS_EXT))
                return 0;
@@ -5435,7 +5451,19 @@ static int bnxt_hwrm_port_qstats_ext(struct bnxt *bp)
        req.port_id = cpu_to_le16(pf->port_id);
        req.rx_stat_size = cpu_to_le16(sizeof(struct rx_port_stats_ext));
        req.rx_stat_host_addr = cpu_to_le64(bp->hw_rx_port_stats_ext_map);
-       return hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT);
+       req.tx_stat_size = cpu_to_le16(sizeof(struct tx_port_stats_ext));
+       req.tx_stat_host_addr = cpu_to_le64(bp->hw_tx_port_stats_ext_map);
+       mutex_lock(&bp->hwrm_cmd_lock);
+       rc = _hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT);
+       if (!rc) {
+               bp->fw_rx_stats_ext_size = le16_to_cpu(resp->rx_stat_size) / 8;
+               bp->fw_tx_stats_ext_size = le16_to_cpu(resp->tx_stat_size) / 8;
+       } else {
+               bp->fw_rx_stats_ext_size = 0;
+               bp->fw_tx_stats_ext_size = 0;
+       }
+       mutex_unlock(&bp->hwrm_cmd_lock);
+       return rc;
 }
 
 static void bnxt_hwrm_free_tunnel_ports(struct bnxt *bp)

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index 766c50b..2cd7ee5 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -1305,10 +1305,14 @@ struct bnxt {
        struct rx_port_stats    *hw_rx_port_stats;
        struct tx_port_stats    *hw_tx_port_stats;
        struct rx_port_stats_ext        *hw_rx_port_stats_ext;
+       struct rx_port_stats_ext        *hw_tx_port_stats_ext;
        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;
        int                     hw_port_stats_size;
+       u16                     fw_rx_stats_ext_size;
+       u16                     fw_tx_stats_ext_size;
 
        u16                     hwrm_max_req_len;
        int                     hwrm_cmd_timeout;
@@ -1425,6 +1429,9 @@ struct bnxt {
 #define BNXT_RX_STATS_EXT_OFFSET(counter)              \
        (offsetof(struct rx_port_stats_ext, counter) / 8)
 
+#define BNXT_TX_STATS_EXT_OFFSET(counter)              \
+       (offsetof(struct tx_port_stats_ext, counter) / 8)
+
 #define I2C_DEV_ADDR_A0                                0xa0
 #define I2C_DEV_ADDR_A2                                0xa2
 #define SFF_DIAG_SUPPORT_OFFSET                        0x5c

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
index e52d7af..0ab34a9 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
@@ -148,6 +148,65 @@ reset_coalesce:
 #define BNXT_RX_STATS_EXT_ENTRY(counter)       \
        { BNXT_RX_STATS_EXT_OFFSET(counter), __stringify(counter) }
 
+#define BNXT_TX_STATS_EXT_ENTRY(counter)       \
+       { BNXT_TX_STATS_EXT_OFFSET(counter), __stringify(counter) }
+
+#define BNXT_RX_STATS_EXT_PFC_ENTRY(n)                         \
+       BNXT_RX_STATS_EXT_ENTRY(pfc_pri##n##_rx_duration_us),   \
+       BNXT_RX_STATS_EXT_ENTRY(pfc_pri##n##_rx_transitions)
+
+#define BNXT_TX_STATS_EXT_PFC_ENTRY(n)                         \
+       BNXT_TX_STATS_EXT_ENTRY(pfc_pri##n##_tx_duration_us),   \
+       BNXT_TX_STATS_EXT_ENTRY(pfc_pri##n##_tx_transitions)
+
+#define BNXT_RX_STATS_EXT_PFC_ENTRIES                          \
+       BNXT_RX_STATS_EXT_PFC_ENTRY(0),                         \
+       BNXT_RX_STATS_EXT_PFC_ENTRY(1),                         \
+       BNXT_RX_STATS_EXT_PFC_ENTRY(2),                         \
+       BNXT_RX_STATS_EXT_PFC_ENTRY(3),                         \
+       BNXT_RX_STATS_EXT_PFC_ENTRY(4),                         \
+       BNXT_RX_STATS_EXT_PFC_ENTRY(5),                         \
+       BNXT_RX_STATS_EXT_PFC_ENTRY(6),                         \
+       BNXT_RX_STATS_EXT_PFC_ENTRY(7)
+
+#define BNXT_TX_STATS_EXT_PFC_ENTRIES                          \
+       BNXT_TX_STATS_EXT_PFC_ENTRY(0),                         \
+       BNXT_TX_STATS_EXT_PFC_ENTRY(1),                         \
+       BNXT_TX_STATS_EXT_PFC_ENTRY(2),                         \
+       BNXT_TX_STATS_EXT_PFC_ENTRY(3),                         \
+       BNXT_TX_STATS_EXT_PFC_ENTRY(4),                         \
+       BNXT_TX_STATS_EXT_PFC_ENTRY(5),                         \
+       BNXT_TX_STATS_EXT_PFC_ENTRY(6),                         \
+       BNXT_TX_STATS_EXT_PFC_ENTRY(7)
+
+#define BNXT_RX_STATS_EXT_COS_ENTRY(n)                         \
+       BNXT_RX_STATS_EXT_ENTRY(rx_bytes_cos##n),               \
+       BNXT_RX_STATS_EXT_ENTRY(rx_packets_cos##n)
+
+#define BNXT_TX_STATS_EXT_COS_ENTRY(n)                         \
+       BNXT_TX_STATS_EXT_ENTRY(tx_bytes_cos##n),               \
+       BNXT_TX_STATS_EXT_ENTRY(tx_packets_cos##n)
+
+#define BNXT_RX_STATS_EXT_COS_ENTRIES                          \
+       BNXT_RX_STATS_EXT_COS_ENTRY(0),                         \
+       BNXT_RX_STATS_EXT_COS_ENTRY(1),                         \
+       BNXT_RX_STATS_EXT_COS_ENTRY(2),                         \
+       BNXT_RX_STATS_EXT_COS_ENTRY(3),                         \
+       BNXT_RX_STATS_EXT_COS_ENTRY(4),                         \
+       BNXT_RX_STATS_EXT_COS_ENTRY(5),                         \
+       BNXT_RX_STATS_EXT_COS_ENTRY(6),                         \
+       BNXT_RX_STATS_EXT_COS_ENTRY(7)                          \
+
+#define BNXT_TX_STATS_EXT_COS_ENTRIES                          \
+       BNXT_TX_STATS_EXT_COS_ENTRY(0),                         \
+       BNXT_TX_STATS_EXT_COS_ENTRY(1),                         \
+       BNXT_TX_STATS_EXT_COS_ENTRY(2),                         \
+       BNXT_TX_STATS_EXT_COS_ENTRY(3),                         \
+       BNXT_TX_STATS_EXT_COS_ENTRY(4),                         \
+       BNXT_TX_STATS_EXT_COS_ENTRY(5),                         \
+       BNXT_TX_STATS_EXT_COS_ENTRY(6),                         \
+       BNXT_TX_STATS_EXT_COS_ENTRY(7)                          \
+
 enum {
        RX_TOTAL_DISCARDS,
        TX_TOTAL_DISCARDS,
@@ -256,11 +315,20 @@ static const struct {
        BNXT_RX_STATS_EXT_ENTRY(resume_pause_events),
        BNXT_RX_STATS_EXT_ENTRY(continuous_roce_pause_events),
        BNXT_RX_STATS_EXT_ENTRY(resume_roce_pause_events),
+       BNXT_RX_STATS_EXT_COS_ENTRIES,
+       BNXT_RX_STATS_EXT_PFC_ENTRIES,
+};
+
+static const struct {
+       long offset;
+       char string[ETH_GSTRING_LEN];
+} bnxt_tx_port_stats_ext_arr[] = {
+       BNXT_TX_STATS_EXT_COS_ENTRIES,
+       BNXT_TX_STATS_EXT_PFC_ENTRIES,
 };
 
 #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_PORT_STATS_EXT ARRAY_SIZE(bnxt_port_stats_ext_arr)
 
 static int bnxt_get_num_stats(struct bnxt *bp)
 {
@@ -272,7 +340,8 @@ static int bnxt_get_num_stats(struct bnxt *bp)
                num_stats += BNXT_NUM_PORT_STATS;
 
        if (bp->flags & BNXT_FLAG_PORT_STATS_EXT)
-               num_stats += BNXT_NUM_PORT_STATS_EXT;
+               num_stats += bp->fw_rx_stats_ext_size +
+                            bp->fw_tx_stats_ext_size;
 
        return num_stats;
 }
@@ -334,12 +403,17 @@ static void bnxt_get_ethtool_stats(struct net_device *dev,
                }
        }
        if (bp->flags & BNXT_FLAG_PORT_STATS_EXT) {
-               __le64 *port_stats_ext = (__le64 *)bp->hw_rx_port_stats_ext;
+               __le64 *rx_port_stats_ext = (__le64 *)bp->hw_rx_port_stats_ext;
+               __le64 *tx_port_stats_ext = (__le64 *)bp->hw_tx_port_stats_ext;
 
-               for (i = 0; i < BNXT_NUM_PORT_STATS_EXT; i++, j++) {
-                       buf[j] = le64_to_cpu(*(port_stats_ext +
+               for (i = 0; i < bp->fw_rx_stats_ext_size; i++, j++) {
+                       buf[j] = le64_to_cpu(*(rx_port_stats_ext +
                                            bnxt_port_stats_ext_arr[i].offset));
                }
+               for (i = 0; i < bp->fw_tx_stats_ext_size; i++, j++) {
+                       buf[j] = le64_to_cpu(*(tx_port_stats_ext +
+                                       bnxt_tx_port_stats_ext_arr[i].offset));
+               }
        }
 }
 
@@ -407,10 +481,15 @@ static void bnxt_get_strings(struct net_device *dev, u32 stringset, u8 *buf)
                        }
                }
                if (bp->flags & BNXT_FLAG_PORT_STATS_EXT) {
-                       for (i = 0; i < BNXT_NUM_PORT_STATS_EXT; i++) {
+                       for (i = 0; i < bp->fw_rx_stats_ext_size; i++) {
                                strcpy(buf, bnxt_port_stats_ext_arr[i].string);
                                buf += ETH_GSTRING_LEN;
                        }
+                       for (i = 0; i < bp->fw_tx_stats_ext_size; i++) {
+                               strcpy(buf,
+                                      bnxt_tx_port_stats_ext_arr[i].string);
+                               buf += ETH_GSTRING_LEN;
+                       }
                }
                break;
        case ETH_SS_TEST: