renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 12:43:55 +08:00
Code

net: dsa: use ports list to setup default CPU port

Browse Source 
Use the new ports list instead of iterating over switches and their
ports when setting up the default CPU port. Unassign it on teardown.

Now that we can iterate over multiple CPU ports, remove dst->cpu_dp.

At the same time, provide a better error message for CPU-less tree.

Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
This commit is contained in:
Vivien Didelot 2019-10-21 16:51:24 -04:00 committed by Jakub Kicinski
parent c0b736282c
commit da4561cda2
2 changed files with 12 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/net/dsa.h
View File

@ -120,11 +120,6 @@ struct dsa_switch_tree {
*/ */
struct dsa_platform_data *pd; struct dsa_platform_data *pd;
/*
* The switch port to which the CPU is attached.
*/
struct dsa_port *cpu_dp;
/* List of switch ports */ /* List of switch ports */
struct list_head ports; struct list_head ports;

31
net/dsa/dsa2.c
View File

@ -197,38 +197,29 @@ static struct dsa_port *dsa_tree_find_first_cpu(struct dsa_switch_tree *dst)
static int dsa_tree_setup_default_cpu(struct dsa_switch_tree *dst) static int dsa_tree_setup_default_cpu(struct dsa_switch_tree *dst)
{ {
struct dsa_switch *ds; struct dsa_port *cpu_dp, *dp;
struct dsa_port *dp;
int device, port;
/* DSA currently only supports a single CPU port */ cpu_dp = dsa_tree_find_first_cpu(dst);
dst->cpu_dp = dsa_tree_find_first_cpu(dst); if (!cpu_dp) {
if (!dst->cpu_dp) { pr_err("DSA: tree %d has no CPU port\n", dst->index);
pr_warn("Tree has no master device\n");
return -EINVAL; return -EINVAL;
} }
/* Assign the default CPU port to all ports of the fabric */ /* Assign the default CPU port to all ports of the fabric */
for (device = 0; device < DSA_MAX_SWITCHES; device++) { list_for_each_entry(dp, &dst->ports, list)
ds = dst->ds[device];
if (!ds)
continue;
for (port = 0; port < ds->num_ports; port++) {
dp = &ds->ports[port];
if (dsa_port_is_user(dp) || dsa_port_is_dsa(dp)) if (dsa_port_is_user(dp) || dsa_port_is_dsa(dp))
dp->cpu_dp = dst->cpu_dp; dp->cpu_dp = cpu_dp;
}
}
return 0; return 0;
} }
static void dsa_tree_teardown_default_cpu(struct dsa_switch_tree *dst) static void dsa_tree_teardown_default_cpu(struct dsa_switch_tree *dst)
{ {
/* DSA currently only supports a single CPU port */ struct dsa_port *dp;
dst->cpu_dp = NULL;
list_for_each_entry(dp, &dst->ports, list)
if (dsa_port_is_user(dp) || dsa_port_is_dsa(dp))
dp->cpu_dp = NULL;
} }
static int dsa_port_setup(struct dsa_port *dp) static int dsa_port_setup(struct dsa_port *dp)