[PATCH 01/34] net: Remove the obsolte u64_stats_fetch_*_irq() users (drivers).

Now that the 32bit UP oddity is gone and 32bit uses always a sequence
count, there is no need for the fetch_irq() variants anymore.

Convert to the regular interface.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
(cherry picked from commit 068c38ad88ccb09e5e966d4db5cedab0e02b3b95)
Signed-off-by: Bastian Blank <waldi@debian.org>
Gbp-Pq: Topic features/all/ethernet-microsoft
Gbp-Pq: Name 0001-net-Remove-the-obsolte-u64_stats_fetch_-_irq-users-d.patch

diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c
index b52612eef0a60910b2ab01776d7c9e2c1bf905e9..8bf4919dc960f27ad07119fe68b3554ad27d8008 100644 (file)
--- a/drivers/net/ethernet/microsoft/mana/mana_en.c
+++ b/drivers/net/ethernet/microsoft/mana/mana_en.c
@@ -316,10 +316,10 @@ static void mana_get_stats64(struct net_device *ndev,
                rx_stats = &apc->rxqs[q]->stats;
 
                do {
-                       start = u64_stats_fetch_begin_irq(&rx_stats->syncp);
+                       start = u64_stats_fetch_begin(&rx_stats->syncp);
                        packets = rx_stats->packets;
                        bytes = rx_stats->bytes;
-               } while (u64_stats_fetch_retry_irq(&rx_stats->syncp, start));
+               } while (u64_stats_fetch_retry(&rx_stats->syncp, start));
 
                st->rx_packets += packets;
                st->rx_bytes += bytes;
@@ -329,10 +329,10 @@ static void mana_get_stats64(struct net_device *ndev,
                tx_stats = &apc->tx_qp[q].txq.stats;
 
                do {
-                       start = u64_stats_fetch_begin_irq(&tx_stats->syncp);
+                       start = u64_stats_fetch_begin(&tx_stats->syncp);
                        packets = tx_stats->packets;
                        bytes = tx_stats->bytes;
-               } while (u64_stats_fetch_retry_irq(&tx_stats->syncp, start));
+               } while (u64_stats_fetch_retry(&tx_stats->syncp, start));
 
                st->tx_packets += packets;
                st->tx_bytes += bytes;

diff --git a/drivers/net/ethernet/microsoft/mana/mana_ethtool.c b/drivers/net/ethernet/microsoft/mana/mana_ethtool.c
index c530db76880f0fdeee53076c33a7dba46e70e51f..96d55c91c969882a2558992a9f8ef9d526b51732 100644 (file)
--- a/drivers/net/ethernet/microsoft/mana/mana_ethtool.c
+++ b/drivers/net/ethernet/microsoft/mana/mana_ethtool.c
@@ -90,13 +90,13 @@ static void mana_get_ethtool_stats(struct net_device *ndev,
                rx_stats = &apc->rxqs[q]->stats;
 
                do {
-                       start = u64_stats_fetch_begin_irq(&rx_stats->syncp);
+                       start = u64_stats_fetch_begin(&rx_stats->syncp);
                        packets = rx_stats->packets;
                        bytes = rx_stats->bytes;
                        xdp_drop = rx_stats->xdp_drop;
                        xdp_tx = rx_stats->xdp_tx;
                        xdp_redirect = rx_stats->xdp_redirect;
-               } while (u64_stats_fetch_retry_irq(&rx_stats->syncp, start));
+               } while (u64_stats_fetch_retry(&rx_stats->syncp, start));
 
                data[i++] = packets;
                data[i++] = bytes;
@@ -109,11 +109,11 @@ static void mana_get_ethtool_stats(struct net_device *ndev,
                tx_stats = &apc->tx_qp[q].txq.stats;
 
                do {
-                       start = u64_stats_fetch_begin_irq(&tx_stats->syncp);
+                       start = u64_stats_fetch_begin(&tx_stats->syncp);
                        packets = tx_stats->packets;
                        bytes = tx_stats->bytes;
                        xdp_xmit = tx_stats->xdp_xmit;
-               } while (u64_stats_fetch_retry_irq(&tx_stats->syncp, start));
+               } while (u64_stats_fetch_retry(&tx_stats->syncp, start));
 
                data[i++] = packets;
                data[i++] = bytes;