net: mvneta: Remove per-cpu queue mapping for Armada 3700

According to Errata #23 "The per-CPU GbE interrupt is limited to Core
0", we can't use the per-cpu interrupt mechanism on the Armada 3700
familly.

This is correctly checked for RSS configuration, but the initial queue
mapping is still done by having the queues spread across all the CPUs in
the system, both in the init path and in the cpu_hotplug path.

Fixes: 2636ac3cc2b4 ("net: mvneta: Add network support for Armada 3700 SoC")
Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index 6290bfb6494eaf8aa998469ee6791a95d942125d..8e410fafff8dd567b957b8eb68b5ef1a23c2bb5f 100644 (file)
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -3428,7 +3428,9 @@ static int mvneta_txq_sw_init(struct mvneta_port *pp,
                return -ENOMEM;
 
        /* Setup XPS mapping */
-       if (txq_number > 1)
+       if (pp->neta_armada3700)
+               cpu = 0;
+       else if (txq_number > 1)
                cpu = txq->id % num_present_cpus();
        else
                cpu = pp->rxq_def % num_present_cpus();
@@ -4206,6 +4208,11 @@ static int mvneta_cpu_online(unsigned int cpu, struct hlist_node *node)
                                                  node_online);
        struct mvneta_pcpu_port *port = per_cpu_ptr(pp->ports, cpu);
 
+       /* Armada 3700's per-cpu interrupt for mvneta is broken, all interrupts
+        * are routed to CPU 0, so we don't need all the cpu-hotplug support
+        */
+       if (pp->neta_armada3700)
+               return 0;
 
        spin_lock(&pp->lock);
        /*