net: ethernet: mvneta: Fix napi structure mixup on armada 3700

BugLink: https://bugs.launchpad.net/bugs/1835845
[ Upstream commit 7a86f05faf112463cfbbdfd222012e247de461a1 ]

The mvneta Ethernet driver is used on a few different Marvell SoCs.
Some SoCs have per cpu interrupts for Ethernet events. Some SoCs have
a single interrupt, independent of the CPU. The driver handles this by
having a per CPU napi structure when there are per CPU interrupts, and
a global napi structure when there is a single interrupt.

When the napi core calls mvneta_poll(), it passes the napi
instance. This was not being propagated through the call chain, and
instead the per-cpu napi instance was passed to napi_gro_receive()
call. This breaks when there is a single global napi instance.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Fixes: 2636ac3cc2b4 ("net: mvneta: Add network support for Armada 3700 SoC")
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index 3deaa341331370bf7e88e8e3583d7b4f0fd2b104..a13f709d9f346f8147f79325c956dcdca4fa4b84 100644 (file)
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -1928,10 +1928,10 @@ static void mvneta_rxq_drop_pkts(struct mvneta_port *pp,
 }
 
 /* Main rx processing when using software buffer management */
-static int mvneta_rx_swbm(struct mvneta_port *pp, int rx_todo,
+static int mvneta_rx_swbm(struct napi_struct *napi,
+                         struct mvneta_port *pp, int rx_todo,
                          struct mvneta_rx_queue *rxq)
 {
-       struct mvneta_pcpu_port *port = this_cpu_ptr(pp->ports);
        struct net_device *dev = pp->dev;
        int rx_done;
        u32 rcvd_pkts = 0;
@@ -1986,7 +1986,7 @@ err_drop_frame:
 
                        skb->protocol = eth_type_trans(skb, dev);
                        mvneta_rx_csum(pp, rx_status, skb);
-                       napi_gro_receive(&port->napi, skb);
+                       napi_gro_receive(napi, skb);
 
                        rcvd_pkts++;
                        rcvd_bytes += rx_bytes;
@@ -2028,7 +2028,7 @@ err_drop_frame:
 
                mvneta_rx_csum(pp, rx_status, skb);
 
-               napi_gro_receive(&port->napi, skb);
+               napi_gro_receive(napi, skb);
        }
 
        if (rcvd_pkts) {
@@ -2047,10 +2047,10 @@ err_drop_frame:
 }
 
 /* Main rx processing when using hardware buffer management */
-static int mvneta_rx_hwbm(struct mvneta_port *pp, int rx_todo,
+static int mvneta_rx_hwbm(struct napi_struct *napi,
+                         struct mvneta_port *pp, int rx_todo,
                          struct mvneta_rx_queue *rxq)
 {
-       struct mvneta_pcpu_port *port = this_cpu_ptr(pp->ports);
        struct net_device *dev = pp->dev;
        int rx_done;
        u32 rcvd_pkts = 0;
@@ -2112,7 +2112,7 @@ err_drop_frame:
 
                        skb->protocol = eth_type_trans(skb, dev);
                        mvneta_rx_csum(pp, rx_status, skb);
-                       napi_gro_receive(&port->napi, skb);
+                       napi_gro_receive(napi, skb);
 
                        rcvd_pkts++;
                        rcvd_bytes += rx_bytes;
@@ -2156,7 +2156,7 @@ err_drop_frame:
 
                mvneta_rx_csum(pp, rx_status, skb);
 
-               napi_gro_receive(&port->napi, skb);
+               napi_gro_receive(napi, skb);
        }
 
        if (rcvd_pkts) {
@@ -2767,9 +2767,11 @@ static int mvneta_poll(struct napi_struct *napi, int budget)
        if (rx_queue) {
                rx_queue = rx_queue - 1;
                if (pp->bm_priv)
-                       rx_done = mvneta_rx_hwbm(pp, budget, &pp->rxqs[rx_queue]);
+                       rx_done = mvneta_rx_hwbm(napi, pp, budget,
+                                                &pp->rxqs[rx_queue]);
                else
-                       rx_done = mvneta_rx_swbm(pp, budget, &pp->rxqs[rx_queue]);
+                       rx_done = mvneta_rx_swbm(napi, pp, budget,
+                                                &pp->rxqs[rx_queue]);
        }
 
        if (rx_done < budget) {