net/atlantic: exclude MACsec counters from xstats

Currently, driver always return full set of xstats counters, including
MACSEC counters. But this driver also supports AQC100 chips, which
does not have MACSEC feature.
This fix adds checking for MACSEC availability (based on FW capability
bits) and returns xstats without MACSEC counters if MACSEC feature
is not available.

Fixes: 09d4dfa85359 ("net/atlantic: implement MACsec statistics")
Cc: stable@dpdk.org
Signed-off-by: Pavel Belous <pavel.belous@aquantia.com>
Signed-off-by: Igor Russkikh <igor.russkikh@aquantia.com>

diff --git a/drivers/net/atlantic/atl_ethdev.c b/drivers/net/atlantic/atl_ethdev.c
index 41524e3..8dafaba 100644 (file)
--- a/drivers/net/atlantic/atl_ethdev.c
+++ b/drivers/net/atlantic/atl_ethdev.c
@@ -991,21 +991,43 @@ atl_dev_stats_reset(struct rte_eth_dev *dev)
        return 0;
 }
 
+static int
+atl_dev_xstats_get_count(struct rte_eth_dev *dev)
+{
+       struct atl_adapter *adapter =
+               (struct atl_adapter *)dev->data->dev_private;
+
+       struct aq_hw_s *hw = &adapter->hw;
+       unsigned int i, count = 0;
+
+       for (i = 0; i < RTE_DIM(atl_xstats_tbl); i++) {
+               if (atl_xstats_tbl[i].type == XSTATS_TYPE_MACSEC &&
+                       ((hw->caps_lo & BIT(CAPS_LO_MACSEC)) == 0))
+                       continue;
+
+               count++;
+       }
+
+       return count;
+}
+
 static int
 atl_dev_xstats_get_names(struct rte_eth_dev *dev __rte_unused,
                         struct rte_eth_xstat_name *xstats_names,
                         unsigned int size)
 {
        unsigned int i;
+       unsigned int count = atl_dev_xstats_get_count(dev);
 
-       if (!xstats_names)
-               return RTE_DIM(atl_xstats_tbl);
-
-       for (i = 0; i < size && i < RTE_DIM(atl_xstats_tbl); i++)
-               strlcpy(xstats_names[i].name, atl_xstats_tbl[i].name,
-                       RTE_ETH_XSTATS_NAME_SIZE);
+       if (xstats_names) {
+               for (i = 0; i < size && i < count; i++) {
+                       snprintf(xstats_names[i].name,
+                               RTE_ETH_XSTATS_NAME_SIZE, "%s",
+                               atl_xstats_tbl[i].name);
+               }
+       }
 
-       return i;
+       return count;
 }
 
 static int
@@ -1019,9 +1041,10 @@ atl_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *stats,
        struct macsec_msg_fw_response resp = { 0 };
        int err = -1;
        unsigned int i;
+       unsigned int count = atl_dev_xstats_get_count(dev);
 
        if (!stats)
-               return 0;
+               return count;
 
        if (hw->aq_fw_ops->send_macsec_req != NULL) {
                req.ingress_sa_index = 0xff;
@@ -1034,7 +1057,7 @@ atl_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *stats,
                err = hw->aq_fw_ops->send_macsec_req(hw, &msg, &resp);
        }
 
-       for (i = 0; i < n && i < RTE_DIM(atl_xstats_tbl); i++) {
+       for (i = 0; i < n && i < count; i++) {
                stats[i].id = i;
 
                switch (atl_xstats_tbl[i].type) {
@@ -1043,14 +1066,15 @@ atl_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *stats,
                                         atl_xstats_tbl[i].offset);
                        break;
                case XSTATS_TYPE_MACSEC:
-                       if (err)
-                               goto done;
-                       stats[i].value = *(u64 *)((uint8_t *)&resp.stats +
-                                        atl_xstats_tbl[i].offset);
+                       if (!err) {
+                               stats[i].value =
+                                       *(u64 *)((uint8_t *)&resp.stats +
+                                       atl_xstats_tbl[i].offset);
+                       }
                        break;
                }
        }
-done:
+
        return i;
 }