octeontx2-pf: CN10K: Hide RPM stats over ethtool

CN10K MAC block (RPM) differs in number of stats compared to Octeontx2
MAC block (CGX). RPM supports stats for each class of PFC and error
packets etc. It would be difficult for user to read stats from ethtool
and map to their definition.

New debugfs file is already added to read RPM stats along with their
definition. This patch adds proper checks such that RPM stats will not
be part of ethtool.

Signed-off-by: Hariprasad Kelam <hkelam@marvell.com>
Signed-off-by: Sunil Goutham <sgoutham@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h
index a51ecd771d07551f4ba85d4811e96d965ec04f24..8e51a1db7e295a8ca63b077a9fc0768705de7303 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h
@@ -223,6 +223,7 @@ struct otx2_hw {
 #define HW_TSO                 0
 #define CN10K_MBOX             1
 #define CN10K_LMTST            2
+#define CN10K_RPM              3
        unsigned long           cap_flag;
 
 #define LMT_LINE_SIZE          128
@@ -452,6 +453,7 @@ static inline void otx2_setup_dev_hw_settings(struct otx2_nic *pfvf)
        if (!is_dev_otx2(pfvf->pdev)) {
                __set_bit(CN10K_MBOX, &hw->cap_flag);
                __set_bit(CN10K_LMTST, &hw->cap_flag);
+               __set_bit(CN10K_RPM, &hw->cap_flag);
        }
 }
 

diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c
index dbfa3bc39e34e640e5a6b0ddcfbd567ca23b8037..38e5924ca8e96c95a0cf6730bc85e8a63ea59dd9 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c
@@ -121,14 +121,16 @@ static void otx2_get_strings(struct net_device *netdev, u32 sset, u8 *data)
 
        otx2_get_qset_strings(pfvf, &data, 0);
 
-       for (stats = 0; stats < CGX_RX_STATS_COUNT; stats++) {
-               sprintf(data, "cgx_rxstat%d: ", stats);
-               data += ETH_GSTRING_LEN;
-       }
+       if (!test_bit(CN10K_RPM, &pfvf->hw.cap_flag)) {
+               for (stats = 0; stats < CGX_RX_STATS_COUNT; stats++) {
+                       sprintf(data, "cgx_rxstat%d: ", stats);
+                       data += ETH_GSTRING_LEN;
+               }
 
-       for (stats = 0; stats < CGX_TX_STATS_COUNT; stats++) {
-               sprintf(data, "cgx_txstat%d: ", stats);
-               data += ETH_GSTRING_LEN;
+               for (stats = 0; stats < CGX_TX_STATS_COUNT; stats++) {
+                       sprintf(data, "cgx_txstat%d: ", stats);
+                       data += ETH_GSTRING_LEN;
+               }
        }
 
        strcpy(data, "reset_count");
@@ -205,11 +207,15 @@ static void otx2_get_ethtool_stats(struct net_device *netdev,
                                                [otx2_drv_stats[stat].index]);
 
        otx2_get_qset_stats(pfvf, stats, &data);
-       otx2_update_lmac_stats(pfvf);
-       for (stat = 0; stat < CGX_RX_STATS_COUNT; stat++)
-               *(data++) = pfvf->hw.cgx_rx_stats[stat];
-       for (stat = 0; stat < CGX_TX_STATS_COUNT; stat++)
-               *(data++) = pfvf->hw.cgx_tx_stats[stat];
+
+       if (!test_bit(CN10K_RPM, &pfvf->hw.cap_flag)) {
+               otx2_update_lmac_stats(pfvf);
+               for (stat = 0; stat < CGX_RX_STATS_COUNT; stat++)
+                       *(data++) = pfvf->hw.cgx_rx_stats[stat];
+               for (stat = 0; stat < CGX_TX_STATS_COUNT; stat++)
+                       *(data++) = pfvf->hw.cgx_tx_stats[stat];
+       }
+
        *(data++) = pfvf->reset_count;
 
        fec_corr_blks = pfvf->hw.cgx_fec_corr_blks;
@@ -242,18 +248,19 @@ static void otx2_get_ethtool_stats(struct net_device *netdev,
 static int otx2_get_sset_count(struct net_device *netdev, int sset)
 {
        struct otx2_nic *pfvf = netdev_priv(netdev);
-       int qstats_count;
+       int qstats_count, mac_stats = 0;
 
        if (sset != ETH_SS_STATS)
                return -EINVAL;
 
        qstats_count = otx2_n_queue_stats *
                       (pfvf->hw.rx_queues + pfvf->hw.tx_queues);
+       if (!test_bit(CN10K_RPM, &pfvf->hw.cap_flag))
+               mac_stats = CGX_RX_STATS_COUNT + CGX_TX_STATS_COUNT;
        otx2_update_lmac_fec_stats(pfvf);
 
        return otx2_n_dev_stats + otx2_n_drv_stats + qstats_count +
-              CGX_RX_STATS_COUNT + CGX_TX_STATS_COUNT + OTX2_FEC_STATS_CNT
-              + 1;
+              mac_stats + OTX2_FEC_STATS_CNT + 1;
 }
 
 /* Get no of queues device supports and current queue count */