Commit d79d2107 authored by Guenter Roeck's avatar Guenter Roeck Committed by David S. Miller

net: dsa: Introduce dsa_is_port_initialized

To avoid race conditions when using the ds->ports[] array,
we need to check if the accessed port has been initialized.
Introduce and use helper function dsa_is_port_initialized
for that purpose and use it where needed.
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bb66be1c
...@@ -165,6 +165,11 @@ static inline bool dsa_is_cpu_port(struct dsa_switch *ds, int p) ...@@ -165,6 +165,11 @@ static inline bool dsa_is_cpu_port(struct dsa_switch *ds, int p)
return !!(ds->index == ds->dst->cpu_switch && p == ds->dst->cpu_port); return !!(ds->index == ds->dst->cpu_switch && p == ds->dst->cpu_port);
} }
static inline bool dsa_is_port_initialized(struct dsa_switch *ds, int p)
{
return ds->phys_port_mask & (1 << p) && ds->ports[p];
}
static inline u8 dsa_upstream_port(struct dsa_switch *ds) static inline u8 dsa_upstream_port(struct dsa_switch *ds)
{ {
struct dsa_switch_tree *dst = ds->dst; struct dsa_switch_tree *dst = ds->dst;
......
...@@ -374,7 +374,7 @@ static int dsa_switch_suspend(struct dsa_switch *ds) ...@@ -374,7 +374,7 @@ static int dsa_switch_suspend(struct dsa_switch *ds)
/* Suspend slave network devices */ /* Suspend slave network devices */
for (i = 0; i < DSA_MAX_PORTS; i++) { for (i = 0; i < DSA_MAX_PORTS; i++) {
if (!(ds->phys_port_mask & (1 << i))) if (!dsa_is_port_initialized(ds, i))
continue; continue;
ret = dsa_slave_suspend(ds->ports[i]); ret = dsa_slave_suspend(ds->ports[i]);
...@@ -400,7 +400,7 @@ static int dsa_switch_resume(struct dsa_switch *ds) ...@@ -400,7 +400,7 @@ static int dsa_switch_resume(struct dsa_switch *ds)
/* Resume slave network devices */ /* Resume slave network devices */
for (i = 0; i < DSA_MAX_PORTS; i++) { for (i = 0; i < DSA_MAX_PORTS; i++) {
if (!(ds->phys_port_mask & (1 << i))) if (!dsa_is_port_initialized(ds, i))
continue; continue;
ret = dsa_slave_resume(ds->ports[i]); ret = dsa_slave_resume(ds->ports[i]);
......
...@@ -222,10 +222,7 @@ static u32 dsa_slave_br_port_mask(struct dsa_switch *ds, ...@@ -222,10 +222,7 @@ static u32 dsa_slave_br_port_mask(struct dsa_switch *ds,
u32 mask = 0; u32 mask = 0;
for (port = 0; port < DSA_MAX_PORTS; port++) { for (port = 0; port < DSA_MAX_PORTS; port++) {
if (!((1 << port) & ds->phys_port_mask)) if (!dsa_is_port_initialized(ds, port))
continue;
if (!ds->ports[port])
continue; continue;
p = netdev_priv(ds->ports[port]); p = netdev_priv(ds->ports[port]);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment