qede: Add support for per-queue stats.

[uclinux-h8/linux.git] / drivers / net / ethernet / qlogic / qede / qede_ethtool.c

diff --git a/drivers/net/ethernet/qlogic/qede/qede_ethtool.c b/drivers/net/ethernet/qlogic/qede/qede_ethtool.c
index 0e0acfb..6e17ee1 100644 (file)
--- a/drivers/net/ethernet/qlogic/qede/qede_ethtool.c
+++ b/drivers/net/ethernet/qlogic/qede/qede_ethtool.c
@@ -35,6 +35,7 @@ static const struct {
        u64 offset;
        char string[ETH_GSTRING_LEN];
 } qede_rqstats_arr[] = {
+       QEDE_RQSTAT(rcv_pkts),
        QEDE_RQSTAT(rx_hw_errors),
        QEDE_RQSTAT(rx_alloc_errors),
        QEDE_RQSTAT(rx_ip_frags),
@@ -44,6 +45,24 @@ static const struct {
 #define QEDE_RQSTATS_DATA(dev, sindex, rqindex) \
        (*((u64 *)(((char *)(dev->fp_array[(rqindex)].rxq)) +\
                    qede_rqstats_arr[(sindex)].offset)))
+#define QEDE_TQSTAT_OFFSET(stat_name) \
+       (offsetof(struct qede_tx_queue, stat_name))
+#define QEDE_TQSTAT_STRING(stat_name) (#stat_name)
+#define QEDE_TQSTAT(stat_name) \
+       {QEDE_TQSTAT_OFFSET(stat_name), QEDE_TQSTAT_STRING(stat_name)}
+#define QEDE_NUM_TQSTATS ARRAY_SIZE(qede_tqstats_arr)
+static const struct {
+       u64 offset;
+       char string[ETH_GSTRING_LEN];
+} qede_tqstats_arr[] = {
+       QEDE_TQSTAT(xmit_pkts),
+       QEDE_TQSTAT(stopped_cnt),
+};
+
+#define QEDE_TQSTATS_DATA(dev, sindex, tssid, tcid) \
+       (*((u64 *)(((u64)(&dev->fp_array[tssid].txqs[tcid])) +\
+                  qede_tqstats_arr[(sindex)].offset)))
+
 static const struct {
        u64 offset;
        char string[ETH_GSTRING_LEN];
@@ -107,6 +126,8 @@ static const struct {
        QEDE_PF_STAT(mftag_filter_discards),
        QEDE_PF_STAT(mac_filter_discards),
        QEDE_STAT(tx_err_drop_pkts),
+       QEDE_STAT(ttl0_discard),
+       QEDE_STAT(packet_too_big_discard),
 
        QEDE_STAT(coalesced_pkts),
        QEDE_STAT(coalesced_events),
@@ -151,17 +172,29 @@ static void qede_get_strings_stats(struct qede_dev *edev, u8 *buf)
 {
        int i, j, k;
 
+       for (i = 0, k = 0; i < edev->num_rss; i++) {
+               int tc;
+
+               for (j = 0; j < QEDE_NUM_RQSTATS; j++)
+                       sprintf(buf + (k + j) * ETH_GSTRING_LEN,
+                               "%d:   %s", i, qede_rqstats_arr[j].string);
+               k += QEDE_NUM_RQSTATS;
+               for (tc = 0; tc < edev->num_tc; tc++) {
+                       for (j = 0; j < QEDE_NUM_TQSTATS; j++)
+                               sprintf(buf + (k + j) * ETH_GSTRING_LEN,
+                                       "%d.%d: %s", i, tc,
+                                       qede_tqstats_arr[j].string);
+                       k += QEDE_NUM_TQSTATS;
+               }
+       }
+
        for (i = 0, j = 0; i < QEDE_NUM_STATS; i++) {
                if (IS_VF(edev) && qede_stats_arr[i].pf_only)
                        continue;
-               strcpy(buf + j * ETH_GSTRING_LEN,
+               strcpy(buf + (k + j) * ETH_GSTRING_LEN,
                       qede_stats_arr[i].string);
                j++;
        }
-
-       for (k = 0; k < QEDE_NUM_RQSTATS; k++, j++)
-               strcpy(buf + j * ETH_GSTRING_LEN,
-                      qede_rqstats_arr[k].string);
 }
 
 static void qede_get_strings(struct net_device *dev, u32 stringset, u8 *buf)
@@ -197,19 +230,24 @@ static void qede_get_ethtool_stats(struct net_device *dev,
 
        mutex_lock(&edev->qede_lock);
 
+       for (qid = 0; qid < edev->num_rss; qid++) {
+               int tc;
+
+               for (sidx = 0; sidx < QEDE_NUM_RQSTATS; sidx++)
+                       buf[cnt++] = QEDE_RQSTATS_DATA(edev, sidx, qid);
+               for (tc = 0; tc < edev->num_tc; tc++) {
+                       for (sidx = 0; sidx < QEDE_NUM_TQSTATS; sidx++)
+                               buf[cnt++] = QEDE_TQSTATS_DATA(edev, sidx, qid,
+                                                              tc);
+               }
+       }
+
        for (sidx = 0; sidx < QEDE_NUM_STATS; sidx++) {
                if (IS_VF(edev) && qede_stats_arr[sidx].pf_only)
                        continue;
                buf[cnt++] = QEDE_STATS_DATA(edev, sidx);
        }
 
-       for (sidx = 0; sidx < QEDE_NUM_RQSTATS; sidx++) {
-               buf[cnt] = 0;
-               for (qid = 0; qid < edev->num_rss; qid++)
-                       buf[cnt] += QEDE_RQSTATS_DATA(edev, sidx, qid);
-               cnt++;
-       }
-
        mutex_unlock(&edev->qede_lock);
 }
 
@@ -227,7 +265,8 @@ static int qede_get_sset_count(struct net_device *dev, int stringset)
                                if (qede_stats_arr[i].pf_only)
                                        num_stats--;
                }
-               return num_stats + QEDE_NUM_RQSTATS;
+               return num_stats +  edev->num_rss *
+                       (QEDE_NUM_RQSTATS + QEDE_NUM_TQSTATS * edev->num_tc);
        case ETH_SS_PRIV_FLAGS:
                return QEDE_PRI_FLAG_LEN;
        case ETH_SS_TEST:
@@ -440,8 +479,7 @@ static u32 qede_get_msglevel(struct net_device *ndev)
 {
        struct qede_dev *edev = netdev_priv(ndev);
 
-       return ((u32)edev->dp_level << QED_LOG_LEVEL_SHIFT) |
-              edev->dp_module;
+       return ((u32)edev->dp_level << QED_LOG_LEVEL_SHIFT) | edev->dp_module;
 }
 
 static void qede_set_msglevel(struct net_device *ndev, u32 level)
@@ -465,8 +503,7 @@ static int qede_nway_reset(struct net_device *dev)
        struct qed_link_params link_params;
 
        if (!edev->ops || !edev->ops->common->can_link_change(edev->cdev)) {
-               DP_INFO(edev,
-                       "Link settings are not allowed to be changed\n");
+               DP_INFO(edev, "Link settings are not allowed to be changed\n");
                return -EOPNOTSUPP;
        }