ice: track hardware stat registers past rollover

[linux.git] / drivers / net / ethernet / intel / ice / ice_main.c

diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index 41c90f2ddb31d6e4471172b2174d5e3e5bd7f23d..f490e65c64bc08047fac589f30dee54937bbead2 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -2286,7 +2286,7 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent)
        struct ice_hw *hw;
        int err;
 
-       /* this driver uses devres, see Documentation/driver-model/devres.rst */
+       /* this driver uses devres, see Documentation/driver-api/driver-model/devres.rst */
        err = pcim_enable_device(pdev);
        if (err)
                return err;
@@ -3176,96 +3176,82 @@ static void ice_update_pf_stats(struct ice_pf *pf)
        cur_ps = &pf->stats;
        pf_id = hw->pf_id;
 
-       ice_stat_update40(hw, GLPRT_GORCH(pf_id), GLPRT_GORCL(pf_id),
-                         pf->stat_prev_loaded, &prev_ps->eth.rx_bytes,
+       ice_stat_update40(hw, GLPRT_GORCL(pf_id), pf->stat_prev_loaded,
+                         &prev_ps->eth.rx_bytes,
                          &cur_ps->eth.rx_bytes);
 
-       ice_stat_update40(hw, GLPRT_UPRCH(pf_id), GLPRT_UPRCL(pf_id),
-                         pf->stat_prev_loaded, &prev_ps->eth.rx_unicast,
+       ice_stat_update40(hw, GLPRT_UPRCL(pf_id), pf->stat_prev_loaded,
+                         &prev_ps->eth.rx_unicast,
                          &cur_ps->eth.rx_unicast);
 
-       ice_stat_update40(hw, GLPRT_MPRCH(pf_id), GLPRT_MPRCL(pf_id),
-                         pf->stat_prev_loaded, &prev_ps->eth.rx_multicast,
+       ice_stat_update40(hw, GLPRT_MPRCL(pf_id), pf->stat_prev_loaded,
+                         &prev_ps->eth.rx_multicast,
                          &cur_ps->eth.rx_multicast);
 
-       ice_stat_update40(hw, GLPRT_BPRCH(pf_id), GLPRT_BPRCL(pf_id),
-                         pf->stat_prev_loaded, &prev_ps->eth.rx_broadcast,
+       ice_stat_update40(hw, GLPRT_BPRCL(pf_id), pf->stat_prev_loaded,
+                         &prev_ps->eth.rx_broadcast,
                          &cur_ps->eth.rx_broadcast);
 
-       ice_stat_update40(hw, GLPRT_GOTCH(pf_id), GLPRT_GOTCL(pf_id),
-                         pf->stat_prev_loaded, &prev_ps->eth.tx_bytes,
+       ice_stat_update40(hw, GLPRT_GOTCL(pf_id), pf->stat_prev_loaded,
+                         &prev_ps->eth.tx_bytes,
                          &cur_ps->eth.tx_bytes);
 
-       ice_stat_update40(hw, GLPRT_UPTCH(pf_id), GLPRT_UPTCL(pf_id),
-                         pf->stat_prev_loaded, &prev_ps->eth.tx_unicast,
+       ice_stat_update40(hw, GLPRT_UPTCL(pf_id), pf->stat_prev_loaded,
+                         &prev_ps->eth.tx_unicast,
                          &cur_ps->eth.tx_unicast);
 
-       ice_stat_update40(hw, GLPRT_MPTCH(pf_id), GLPRT_MPTCL(pf_id),
-                         pf->stat_prev_loaded, &prev_ps->eth.tx_multicast,
+       ice_stat_update40(hw, GLPRT_MPTCL(pf_id), pf->stat_prev_loaded,
+                         &prev_ps->eth.tx_multicast,
                          &cur_ps->eth.tx_multicast);
 
-       ice_stat_update40(hw, GLPRT_BPTCH(pf_id), GLPRT_BPTCL(pf_id),
-                         pf->stat_prev_loaded, &prev_ps->eth.tx_broadcast,
+       ice_stat_update40(hw, GLPRT_BPTCL(pf_id), pf->stat_prev_loaded,
+                         &prev_ps->eth.tx_broadcast,
                          &cur_ps->eth.tx_broadcast);
 
        ice_stat_update32(hw, GLPRT_TDOLD(pf_id), pf->stat_prev_loaded,
                          &prev_ps->tx_dropped_link_down,
                          &cur_ps->tx_dropped_link_down);
 
-       ice_stat_update40(hw, GLPRT_PRC64H(pf_id), GLPRT_PRC64L(pf_id),
-                         pf->stat_prev_loaded, &prev_ps->rx_size_64,
-                         &cur_ps->rx_size_64);
+       ice_stat_update40(hw, GLPRT_PRC64L(pf_id), pf->stat_prev_loaded,
+                         &prev_ps->rx_size_64, &cur_ps->rx_size_64);
 
-       ice_stat_update40(hw, GLPRT_PRC127H(pf_id), GLPRT_PRC127L(pf_id),
-                         pf->stat_prev_loaded, &prev_ps->rx_size_127,
-                         &cur_ps->rx_size_127);
+       ice_stat_update40(hw, GLPRT_PRC127L(pf_id), pf->stat_prev_loaded,
+                         &prev_ps->rx_size_127, &cur_ps->rx_size_127);
 
-       ice_stat_update40(hw, GLPRT_PRC255H(pf_id), GLPRT_PRC255L(pf_id),
-                         pf->stat_prev_loaded, &prev_ps->rx_size_255,
-                         &cur_ps->rx_size_255);
+       ice_stat_update40(hw, GLPRT_PRC255L(pf_id), pf->stat_prev_loaded,
+                         &prev_ps->rx_size_255, &cur_ps->rx_size_255);
 
-       ice_stat_update40(hw, GLPRT_PRC511H(pf_id), GLPRT_PRC511L(pf_id),
-                         pf->stat_prev_loaded, &prev_ps->rx_size_511,
-                         &cur_ps->rx_size_511);
+       ice_stat_update40(hw, GLPRT_PRC511L(pf_id), pf->stat_prev_loaded,
+                         &prev_ps->rx_size_511, &cur_ps->rx_size_511);
 
-       ice_stat_update40(hw, GLPRT_PRC1023H(pf_id),
-                         GLPRT_PRC1023L(pf_id), pf->stat_prev_loaded,
+       ice_stat_update40(hw, GLPRT_PRC1023L(pf_id), pf->stat_prev_loaded,
                          &prev_ps->rx_size_1023, &cur_ps->rx_size_1023);
 
-       ice_stat_update40(hw, GLPRT_PRC1522H(pf_id),
-                         GLPRT_PRC1522L(pf_id), pf->stat_prev_loaded,
+       ice_stat_update40(hw, GLPRT_PRC1522L(pf_id), pf->stat_prev_loaded,
                          &prev_ps->rx_size_1522, &cur_ps->rx_size_1522);
 
-       ice_stat_update40(hw, GLPRT_PRC9522H(pf_id),
-                         GLPRT_PRC9522L(pf_id), pf->stat_prev_loaded,
+       ice_stat_update40(hw, GLPRT_PRC9522L(pf_id), pf->stat_prev_loaded,
                          &prev_ps->rx_size_big, &cur_ps->rx_size_big);
 
-       ice_stat_update40(hw, GLPRT_PTC64H(pf_id), GLPRT_PTC64L(pf_id),
-                         pf->stat_prev_loaded, &prev_ps->tx_size_64,
-                         &cur_ps->tx_size_64);
+       ice_stat_update40(hw, GLPRT_PTC64L(pf_id), pf->stat_prev_loaded,
+                         &prev_ps->tx_size_64, &cur_ps->tx_size_64);
 
-       ice_stat_update40(hw, GLPRT_PTC127H(pf_id), GLPRT_PTC127L(pf_id),
-                         pf->stat_prev_loaded, &prev_ps->tx_size_127,
-                         &cur_ps->tx_size_127);
+       ice_stat_update40(hw, GLPRT_PTC127L(pf_id), pf->stat_prev_loaded,
+                         &prev_ps->tx_size_127, &cur_ps->tx_size_127);
 
-       ice_stat_update40(hw, GLPRT_PTC255H(pf_id), GLPRT_PTC255L(pf_id),
-                         pf->stat_prev_loaded, &prev_ps->tx_size_255,
-                         &cur_ps->tx_size_255);
+       ice_stat_update40(hw, GLPRT_PTC255L(pf_id), pf->stat_prev_loaded,
+                         &prev_ps->tx_size_255, &cur_ps->tx_size_255);
 
-       ice_stat_update40(hw, GLPRT_PTC511H(pf_id), GLPRT_PTC511L(pf_id),
-                         pf->stat_prev_loaded, &prev_ps->tx_size_511,
-                         &cur_ps->tx_size_511);
+       ice_stat_update40(hw, GLPRT_PTC511L(pf_id), pf->stat_prev_loaded,
+                         &prev_ps->tx_size_511, &cur_ps->tx_size_511);
 
-       ice_stat_update40(hw, GLPRT_PTC1023H(pf_id),
-                         GLPRT_PTC1023L(pf_id), pf->stat_prev_loaded,
+       ice_stat_update40(hw, GLPRT_PTC1023L(pf_id), pf->stat_prev_loaded,
                          &prev_ps->tx_size_1023, &cur_ps->tx_size_1023);
 
-       ice_stat_update40(hw, GLPRT_PTC1522H(pf_id),
-                         GLPRT_PTC1522L(pf_id), pf->stat_prev_loaded,
+       ice_stat_update40(hw, GLPRT_PTC1522L(pf_id), pf->stat_prev_loaded,
                          &prev_ps->tx_size_1522, &cur_ps->tx_size_1522);
 
-       ice_stat_update40(hw, GLPRT_PTC9522H(pf_id),
-                         GLPRT_PTC9522L(pf_id), pf->stat_prev_loaded,
+       ice_stat_update40(hw, GLPRT_PTC9522L(pf_id), pf->stat_prev_loaded,
                          &prev_ps->tx_size_big, &cur_ps->tx_size_big);
 
        ice_stat_update32(hw, GLPRT_LXONRXC(pf_id), pf->stat_prev_loaded,