net: mvneta: Fix for_each_present_cpu usage
commit 129219e4950a3fcf9323b3bbd8b224c7aa873985 upstream.
This patch convert the for_each_present in on_each_cpu, instead of
applying on the present cpus it will be applied only on the online cpus.
This fix a bug reported on
http://thread.gmane.org/gmane.linux.ports.arm.kernel/468173.
Using the macro on_each_cpu (instead of a for_each_* loop) also ensures
that all the calls will be done all at once.
Fixes: f864288544
("net: mvneta: Statically assign queues to CPUs")
Reported-by: Stefan Roese <stefan.roese@gmail.com>
Suggested-by: Jisheng Zhang <jszhang@marvell.com>
Suggested-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
0012ba2537
commit
753be27f77
1 changed files with 3 additions and 5 deletions
|
@ -2446,7 +2446,7 @@ static void mvneta_start_dev(struct mvneta_port *pp)
|
||||||
mvneta_port_enable(pp);
|
mvneta_port_enable(pp);
|
||||||
|
|
||||||
/* Enable polling on the port */
|
/* Enable polling on the port */
|
||||||
for_each_present_cpu(cpu) {
|
for_each_online_cpu(cpu) {
|
||||||
struct mvneta_pcpu_port *port = per_cpu_ptr(pp->ports, cpu);
|
struct mvneta_pcpu_port *port = per_cpu_ptr(pp->ports, cpu);
|
||||||
|
|
||||||
napi_enable(&port->napi);
|
napi_enable(&port->napi);
|
||||||
|
@ -2472,7 +2472,7 @@ static void mvneta_stop_dev(struct mvneta_port *pp)
|
||||||
|
|
||||||
phy_stop(pp->phy_dev);
|
phy_stop(pp->phy_dev);
|
||||||
|
|
||||||
for_each_present_cpu(cpu) {
|
for_each_online_cpu(cpu) {
|
||||||
struct mvneta_pcpu_port *port = per_cpu_ptr(pp->ports, cpu);
|
struct mvneta_pcpu_port *port = per_cpu_ptr(pp->ports, cpu);
|
||||||
|
|
||||||
napi_disable(&port->napi);
|
napi_disable(&port->napi);
|
||||||
|
@ -2902,13 +2902,11 @@ err_cleanup_rxqs:
|
||||||
static int mvneta_stop(struct net_device *dev)
|
static int mvneta_stop(struct net_device *dev)
|
||||||
{
|
{
|
||||||
struct mvneta_port *pp = netdev_priv(dev);
|
struct mvneta_port *pp = netdev_priv(dev);
|
||||||
int cpu;
|
|
||||||
|
|
||||||
mvneta_stop_dev(pp);
|
mvneta_stop_dev(pp);
|
||||||
mvneta_mdio_remove(pp);
|
mvneta_mdio_remove(pp);
|
||||||
unregister_cpu_notifier(&pp->cpu_notifier);
|
unregister_cpu_notifier(&pp->cpu_notifier);
|
||||||
for_each_present_cpu(cpu)
|
on_each_cpu(mvneta_percpu_disable, pp, true);
|
||||||
smp_call_function_single(cpu, mvneta_percpu_disable, pp, true);
|
|
||||||
free_percpu_irq(dev->irq, pp->ports);
|
free_percpu_irq(dev->irq, pp->ports);
|
||||||
mvneta_cleanup_rxqs(pp);
|
mvneta_cleanup_rxqs(pp);
|
||||||
mvneta_cleanup_txqs(pp);
|
mvneta_cleanup_txqs(pp);
|
||||||
|
|
Loading…
Add table
Reference in a new issue