renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-12 15:44:01 +08:00
Code

net: dsa: get port type at parse time

Browse Source 
Assign a port's type at parsed time instead of waiting for the tree to
be completed.

Because this is now done earlier, we can use the port's type in
dsa_port_is_* helpers instead of digging again in topology description.

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-10-27 15:55:15 -04:00 committed by David S. Miller
parent fd223e2e66
commit 6d4e5c570c
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
net/dsa/dsa2.c
View File

@ -87,23 +87,17 @@ static void dsa_dst_del_ds(struct dsa_switch_tree *dst,
*/ */
static bool dsa_port_is_valid(struct dsa_port *port) static bool dsa_port_is_valid(struct dsa_port *port)
{ {
return !!(port->dn || port->name); return port->type != DSA_PORT_TYPE_UNUSED;
} }
static bool dsa_port_is_dsa(struct dsa_port *port) static bool dsa_port_is_dsa(struct dsa_port *port)
{ {
if (port->name && !strcmp(port->name, "dsa")) return port->type == DSA_PORT_TYPE_DSA;
return true;
else
return !!of_parse_phandle(port->dn, "link", 0);
} }
static bool dsa_port_is_cpu(struct dsa_port *port) static bool dsa_port_is_cpu(struct dsa_port *port)
{ {
if (port->name && !strcmp(port->name, "cpu")) return port->type == DSA_PORT_TYPE_CPU;
return true;
else
return !!of_parse_phandle(port->dn, "ethernet", 0);
} }
static bool dsa_ds_find_port_dn(struct dsa_switch *ds, static bool dsa_ds_find_port_dn(struct dsa_switch *ds,
@ -183,8 +177,6 @@ static int dsa_ds_complete(struct dsa_switch_tree *dst, struct dsa_switch *ds)
err = dsa_port_complete(dst, ds, port, index); err = dsa_port_complete(dst, ds, port, index);
if (err != 0) if (err != 0)
return err; return err;
port->type = DSA_PORT_TYPE_DSA;
} }
return 0; return 0;
@ -500,8 +492,6 @@ static int dsa_cpu_parse(struct dsa_port *port, u32 index,
dst->cpu_dp->master = ethernet_dev; dst->cpu_dp->master = ethernet_dev;
} }
port->type = DSA_PORT_TYPE_CPU;
tag_protocol = ds->ops->get_tag_protocol(ds); tag_protocol = ds->ops->get_tag_protocol(ds);
tag_ops = dsa_resolve_tag_protocol(tag_protocol); tag_ops = dsa_resolve_tag_protocol(tag_protocol);
if (IS_ERR(tag_ops)) { if (IS_ERR(tag_ops)) {
@ -534,8 +524,6 @@ static int dsa_ds_parse(struct dsa_switch_tree *dst, struct dsa_switch *ds)
err = dsa_cpu_parse(port, index, dst, ds); err = dsa_cpu_parse(port, index, dst, ds);
if (err) if (err)
return err; return err;
} else {
port->type = DSA_PORT_TYPE_USER;
} }
} }
@ -592,6 +580,17 @@ static int dsa_dst_parse(struct dsa_switch_tree *dst)
static int dsa_port_parse_of(struct dsa_port *dp, struct device_node *dn) static int dsa_port_parse_of(struct dsa_port *dp, struct device_node *dn)
{ {
struct device_node *ethernet = of_parse_phandle(dn, "ethernet", 0);
struct device_node *link = of_parse_phandle(dn, "link", 0);
if (ethernet) {
dp->type = DSA_PORT_TYPE_CPU;
} else if (link) {
dp->type = DSA_PORT_TYPE_DSA;
} else {
dp->type = DSA_PORT_TYPE_USER;
}
dp->dn = dn; dp->dn = dn;
return 0; return 0;
@ -631,6 +630,14 @@ static int dsa_parse_ports_of(struct device_node *dn, struct dsa_switch *ds)
static int dsa_port_parse(struct dsa_port *dp, const char *name, static int dsa_port_parse(struct dsa_port *dp, const char *name,
struct device *dev) struct device *dev)
{ {
if (!strcmp(name, "cpu")) {
dp->type = DSA_PORT_TYPE_CPU;
} else if (!strcmp(name, "dsa")) {
dp->type = DSA_PORT_TYPE_DSA;
} else {
dp->type = DSA_PORT_TYPE_USER;
}
dp->name = name; dp->name = name;
return 0; return 0;