Skip to content

Commit cf9bf87

Browse files
minimaxwelldavem330
authored andcommitted
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: 2636ac3 ("net: mvneta: Add network support for Armada 3700 SoC") Signed-off-by: Maxime Chevallier <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 44c3203 commit cf9bf87

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

drivers/net/ethernet/marvell/mvneta.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3428,7 +3428,9 @@ static int mvneta_txq_sw_init(struct mvneta_port *pp,
34283428
return -ENOMEM;
34293429

34303430
/* Setup XPS mapping */
3431-
if (txq_number > 1)
3431+
if (pp->neta_armada3700)
3432+
cpu = 0;
3433+
else if (txq_number > 1)
34323434
cpu = txq->id % num_present_cpus();
34333435
else
34343436
cpu = pp->rxq_def % num_present_cpus();
@@ -4206,6 +4208,11 @@ static int mvneta_cpu_online(unsigned int cpu, struct hlist_node *node)
42064208
node_online);
42074209
struct mvneta_pcpu_port *port = per_cpu_ptr(pp->ports, cpu);
42084210

4211+
/* Armada 3700's per-cpu interrupt for mvneta is broken, all interrupts
4212+
* are routed to CPU 0, so we don't need all the cpu-hotplug support
4213+
*/
4214+
if (pp->neta_armada3700)
4215+
return 0;
42094216

42104217
spin_lock(&pp->lock);
42114218
/*

0 commit comments

Comments
 (0)