AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-26 20:20:53 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

net: dsa: assign default CPU port to all ports

Browse Source 
The current code only assigns the default cpu_dp to all user ports of
the switch to which the CPU port belongs. The user ports of the other
switches of the fabric thus don't have a default CPU port.

This patch fixes this by assigning the cpu_dp of all user ports of all
switches of the fabric when the tree is fully parsed.

Fixes: a29342e739 ("net: dsa: Associate slave network device with CPU port")
Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vivien Didelot 2017-06-15 15:06:54 -04:00 committed by David S. Miller
parent 3715c47bcd
commit e4b7778769
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
net/dsa/dsa2.c
View File

@ -490,8 +490,6 @@ static int dsa_cpu_parse(struct dsa_port *port, u32 index,
enum dsa_tag_protocol tag_protocol;
struct net_device *ethernet_dev;
struct device_node *ethernet;
struct dsa_port *p;
unsigned int i;
if (port->dn) {
ethernet = of_parse_phandle(port->dn, "ethernet", 0);
@ -509,15 +507,6 @@ static int dsa_cpu_parse(struct dsa_port *port, u32 index,
if (!dst->cpu_dp) {
dst->cpu_dp = port;
dst->cpu_dp->netdev = ethernet_dev;
for (i = 0; i < ds->num_ports; i++) {
p = &ds->ports[i];
if (!dsa_port_is_valid(p) ||
i == index)
continue;
p->cpu_dp = port;
}
}
tag_protocol = ds->ops->get_tag_protocol(ds);
@ -572,7 +561,9 @@ static int dsa_ds_parse(struct dsa_switch_tree *dst, struct dsa_switch *ds)
static int dsa_dst_parse(struct dsa_switch_tree *dst)
{
struct dsa_switch *ds;
struct dsa_port *dp;
u32 index;
int port;
int err;
for (index = 0; index < DSA_MAX_SWITCHES; index++) {
@ -590,6 +581,23 @@ static int dsa_dst_parse(struct dsa_switch_tree *dst)
return -EINVAL;
}
/* Assign the default CPU port to all ports of the fabric */
for (index = 0; index < DSA_MAX_SWITCHES; index++) {
ds = dst->ds[index];
if (!ds)
continue;
for (port = 0; port < ds->num_ports; port++) {
dp = &ds->ports[port];
if (!dsa_port_is_valid(dp) ||
dsa_port_is_dsa(dp) ||
dsa_port_is_cpu(dp))
continue;
dp->cpu_dp = dst->cpu_dp;
}
}
pr_info("DSA: tree %d parsed\n", dst->tree);
return 0;