nfp: abm: add up bands for sto/non-sto stats

Add up stats for all bands for the extra ethtool statistics.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: John Hurley <john.hurley@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/netronome/nfp/abm/ctrl.c b/drivers/net/ethernet/netronome/nfp/abm/ctrl.c
index 013ba6c85d2b3e23148a71b2800067f2eae73d75..10a571b5b565953259f2c8e16b94e3c583e52ab0 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/abm/ctrl.c
+++ b/drivers/net/ethernet/netronome/nfp/abm/ctrl.c
@@ -94,24 +94,36 @@ int nfp_abm_ctrl_set_q_lvl(struct nfp_abm_link *alink, unsigned int band,
        return __nfp_abm_ctrl_set_q_lvl(alink->abm, threshold, val);
 }
 
-u64 nfp_abm_ctrl_stat_non_sto(struct nfp_abm_link *alink, unsigned int i)
+u64 nfp_abm_ctrl_stat_non_sto(struct nfp_abm_link *alink, unsigned int queue)
 {
-       u64 val;
+       unsigned int band;
+       u64 val, sum = 0;
+
+       for (band = 0; band < alink->abm->num_bands; band++) {
+               if (nfp_abm_ctrl_stat(alink, alink->abm->qm_stats,
+                                     NFP_QMSTAT_STRIDE, NFP_QMSTAT_NON_STO,
+                                     band, queue, true, &val))
+                       return 0;
+               sum += val;
+       }
 
-       if (nfp_abm_ctrl_stat(alink, alink->abm->qm_stats, NFP_QMSTAT_STRIDE,
-                             NFP_QMSTAT_NON_STO, 0, i, true, &val))
-               return 0;
-       return val;
+       return sum;
 }
 
-u64 nfp_abm_ctrl_stat_sto(struct nfp_abm_link *alink, unsigned int i)
+u64 nfp_abm_ctrl_stat_sto(struct nfp_abm_link *alink, unsigned int queue)
 {
-       u64 val;
+       unsigned int band;
+       u64 val, sum = 0;
+
+       for (band = 0; band < alink->abm->num_bands; band++) {
+               if (nfp_abm_ctrl_stat(alink, alink->abm->qm_stats,
+                                     NFP_QMSTAT_STRIDE, NFP_QMSTAT_STO,
+                                     band, queue, true, &val))
+                       return 0;
+               sum += val;
+       }
 
-       if (nfp_abm_ctrl_stat(alink, alink->abm->qm_stats, NFP_QMSTAT_STRIDE,
-                             NFP_QMSTAT_STO, 0, i, true, &val))
-               return 0;
-       return val;
+       return sum;
 }
 
 static int