[PATCH net-next 05/14] nfp: abm: add up bands for sto/non-sto stats

[Jakub Kicinski]

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

Signed-off-by: Jakub Kicinski <jakub.kicin...@netronome.com>
Reviewed-by: John Hurley <john.hur...@netronome.com>
---
 drivers/net/ethernet/netronome/nfp/abm/ctrl.c | 36 ++++++++++++-------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/drivers/net/ethernet/netronome/nfp/abm/ctrl.c 
b/drivers/net/ethernet/netronome/nfp/abm/ctrl.c
index 013ba6c85d2b..10a571b5b565 100644
--- 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
-- 
2.17.1