Skip to content

Commit

Permalink
Merge branch 'dsa2-pdata-prepatory-patches'
Browse files Browse the repository at this point in the history 
Florian Fainelli says:

====================
net: dsa: Preparatory patches

This patch series extracts the 4 patches of the larger: net: dsa: Support for
pdata in dsa2 while we wait for feedback from Greg KH on the device references.

Changes in v2:

- rebased properly after the multi-MDIO bus support added to mv88e6xxx
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Jan 26, 2017
2 parents 80c8eae + bc1727d commit b95db66
Show file tree
Hide file tree
Showing 7 changed files with 64 additions and 55 deletions.
2 changes: 1 addition & 1 deletion drivers/net/dsa/b53/b53_common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1894,7 +1894,7 @@ int b53_switch_register(struct b53_device *dev)

pr_info("found switch: %s, rev %i\n", dev->name, dev->core_rev);

return dsa_register_switch(dev->ds, dev->ds->dev->of_node);
return dsa_register_switch(dev->ds, dev->ds->dev);
}
EXPORT_SYMBOL(b53_switch_register);

Expand Down
7 changes: 3 additions & 4 deletions drivers/net/dsa/mv88e6xxx/chip.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4356,8 +4356,7 @@ static struct dsa_switch_driver mv88e6xxx_switch_drv = {
.ops = &mv88e6xxx_switch_ops,
};

static int mv88e6xxx_register_switch(struct mv88e6xxx_chip *chip,
struct device_node *np)
static int mv88e6xxx_register_switch(struct mv88e6xxx_chip *chip)
{
struct device *dev = chip->dev;
struct dsa_switch *ds;
Expand All @@ -4372,7 +4371,7 @@ static int mv88e6xxx_register_switch(struct mv88e6xxx_chip *chip,

dev_set_drvdata(dev, ds);

return dsa_register_switch(ds, np);
return dsa_register_switch(ds, dev);
}

static void mv88e6xxx_unregister_switch(struct mv88e6xxx_chip *chip)
Expand Down Expand Up @@ -4456,7 +4455,7 @@ static int mv88e6xxx_probe(struct mdio_device *mdiodev)
if (err)
goto out_g2_irq;

err = mv88e6xxx_register_switch(chip, np);
err = mv88e6xxx_register_switch(chip);
if (err)
goto out_mdio;

Expand Down
2 changes: 1 addition & 1 deletion drivers/net/dsa/qca8k.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -964,7 +964,7 @@ qca8k_sw_probe(struct mdio_device *mdiodev)
mutex_init(&priv->reg_mutex);
dev_set_drvdata(&mdiodev->dev, priv);

return dsa_register_switch(priv->ds, priv->ds->dev->of_node);
return dsa_register_switch(priv->ds, &mdiodev->dev);
}

static void
Expand Down
2 changes: 1 addition & 1 deletion include/net/dsa.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ static inline bool dsa_uses_tagged_protocol(struct dsa_switch_tree *dst)
}

void dsa_unregister_switch(struct dsa_switch *ds);
int dsa_register_switch(struct dsa_switch *ds, struct device_node *np);
int dsa_register_switch(struct dsa_switch *ds, struct device *dev);
#ifdef CONFIG_PM_SLEEP
int dsa_switch_suspend(struct dsa_switch *ds);
int dsa_switch_resume(struct dsa_switch *ds);
Expand Down
15 changes: 9 additions & 6 deletions net/dsa/dsa.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,9 @@ dsa_switch_probe(struct device *parent, struct device *host_dev, int sw_addr,

/* basic switch operations **************************************************/
int dsa_cpu_dsa_setup(struct dsa_switch *ds, struct device *dev,
struct device_node *port_dn, int port)
struct dsa_port *dport, int port)
{
struct device_node *port_dn = dport->dn;
struct phy_device *phydev;
int ret, mode;

Expand Down Expand Up @@ -141,15 +142,15 @@ int dsa_cpu_dsa_setup(struct dsa_switch *ds, struct device *dev,

static int dsa_cpu_dsa_setups(struct dsa_switch *ds, struct device *dev)
{
struct device_node *port_dn;
struct dsa_port *dport;
int ret, port;

for (port = 0; port < DSA_MAX_PORTS; port++) {
if (!(dsa_is_cpu_port(ds, port) || dsa_is_dsa_port(ds, port)))
continue;

port_dn = ds->ports[port].dn;
ret = dsa_cpu_dsa_setup(ds, dev, port_dn, port);
dport = &ds->ports[port];
ret = dsa_cpu_dsa_setup(ds, dev, dport, port);
if (ret)
return ret;
}
Expand Down Expand Up @@ -364,8 +365,10 @@ dsa_switch_setup(struct dsa_switch_tree *dst, int index,
return ds;
}

void dsa_cpu_dsa_destroy(struct device_node *port_dn)
void dsa_cpu_dsa_destroy(struct dsa_port *port)
{
struct device_node *port_dn = port->dn;

if (of_phy_is_fixed_link(port_dn))
of_phy_deregister_fixed_link(port_dn);
}
Expand All @@ -389,7 +392,7 @@ static void dsa_switch_destroy(struct dsa_switch *ds)
for (port = 0; port < DSA_MAX_PORTS; port++) {
if (!(dsa_is_cpu_port(ds, port) || dsa_is_dsa_port(ds, port)))
continue;
dsa_cpu_dsa_destroy(ds->ports[port].dn);
dsa_cpu_dsa_destroy(&ds->ports[port]);

/* Clearing a bit which is not set does no harm */
ds->cpu_port_mask |= ~(1 << port);
Expand Down
87 changes: 47 additions & 40 deletions net/dsa/dsa2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,18 +78,23 @@ static void dsa_dst_del_ds(struct dsa_switch_tree *dst,
kref_put(&dst->refcount, dsa_free_dst);
}

static bool dsa_port_is_dsa(struct device_node *port)
static bool dsa_port_is_valid(struct dsa_port *port)
{
return !!of_parse_phandle(port, "link", 0);
return !!port->dn;
}

static bool dsa_port_is_cpu(struct device_node *port)
static bool dsa_port_is_dsa(struct dsa_port *port)
{
return !!of_parse_phandle(port, "ethernet", 0);
return !!of_parse_phandle(port->dn, "link", 0);
}

static bool dsa_ds_find_port(struct dsa_switch *ds,
struct device_node *port)
static bool dsa_port_is_cpu(struct dsa_port *port)
{
return !!of_parse_phandle(port->dn, "ethernet", 0);
}

static bool dsa_ds_find_port_dn(struct dsa_switch *ds,
struct device_node *port)
{
u32 index;

Expand All @@ -99,8 +104,8 @@ static bool dsa_ds_find_port(struct dsa_switch *ds,
return false;
}

static struct dsa_switch *dsa_dst_find_port(struct dsa_switch_tree *dst,
struct device_node *port)
static struct dsa_switch *dsa_dst_find_port_dn(struct dsa_switch_tree *dst,
struct device_node *port)
{
struct dsa_switch *ds;
u32 index;
Expand All @@ -110,7 +115,7 @@ static struct dsa_switch *dsa_dst_find_port(struct dsa_switch_tree *dst,
if (!ds)
continue;

if (dsa_ds_find_port(ds, port))
if (dsa_ds_find_port_dn(ds, port))
return ds;
}

Expand All @@ -119,19 +124,19 @@ static struct dsa_switch *dsa_dst_find_port(struct dsa_switch_tree *dst,

static int dsa_port_complete(struct dsa_switch_tree *dst,
struct dsa_switch *src_ds,
struct device_node *port,
struct dsa_port *port,
u32 src_port)
{
struct device_node *link;
int index;
struct dsa_switch *dst_ds;

for (index = 0;; index++) {
link = of_parse_phandle(port, "link", index);
link = of_parse_phandle(port->dn, "link", index);
if (!link)
break;

dst_ds = dsa_dst_find_port(dst, link);
dst_ds = dsa_dst_find_port_dn(dst, link);
of_node_put(link);

if (!dst_ds)
Expand All @@ -150,13 +155,13 @@ static int dsa_port_complete(struct dsa_switch_tree *dst,
*/
static int dsa_ds_complete(struct dsa_switch_tree *dst, struct dsa_switch *ds)
{
struct device_node *port;
struct dsa_port *port;
u32 index;
int err;

for (index = 0; index < DSA_MAX_PORTS; index++) {
port = ds->ports[index].dn;
if (!port)
port = &ds->ports[index];
if (!dsa_port_is_valid(port))
continue;

if (!dsa_port_is_dsa(port))
Expand Down Expand Up @@ -196,7 +201,7 @@ static int dsa_dst_complete(struct dsa_switch_tree *dst)
return 0;
}

static int dsa_dsa_port_apply(struct device_node *port, u32 index,
static int dsa_dsa_port_apply(struct dsa_port *port, u32 index,
struct dsa_switch *ds)
{
int err;
Expand All @@ -211,13 +216,13 @@ static int dsa_dsa_port_apply(struct device_node *port, u32 index,
return 0;
}

static void dsa_dsa_port_unapply(struct device_node *port, u32 index,
static void dsa_dsa_port_unapply(struct dsa_port *port, u32 index,
struct dsa_switch *ds)
{
dsa_cpu_dsa_destroy(port);
}

static int dsa_cpu_port_apply(struct device_node *port, u32 index,
static int dsa_cpu_port_apply(struct dsa_port *port, u32 index,
struct dsa_switch *ds)
{
int err;
Expand All @@ -234,21 +239,21 @@ static int dsa_cpu_port_apply(struct device_node *port, u32 index,
return 0;
}

static void dsa_cpu_port_unapply(struct device_node *port, u32 index,
static void dsa_cpu_port_unapply(struct dsa_port *port, u32 index,
struct dsa_switch *ds)
{
dsa_cpu_dsa_destroy(port);
ds->cpu_port_mask &= ~BIT(index);

}

static int dsa_user_port_apply(struct device_node *port, u32 index,
static int dsa_user_port_apply(struct dsa_port *port, u32 index,
struct dsa_switch *ds)
{
const char *name;
int err;

name = of_get_property(port, "label", NULL);
name = of_get_property(port->dn, "label", NULL);
if (!name)
name = "eth%d";

Expand All @@ -262,7 +267,7 @@ static int dsa_user_port_apply(struct device_node *port, u32 index,
return 0;
}

static void dsa_user_port_unapply(struct device_node *port, u32 index,
static void dsa_user_port_unapply(struct dsa_port *port, u32 index,
struct dsa_switch *ds)
{
if (ds->ports[index].netdev) {
Expand All @@ -274,7 +279,7 @@ static void dsa_user_port_unapply(struct device_node *port, u32 index,

static int dsa_ds_apply(struct dsa_switch_tree *dst, struct dsa_switch *ds)
{
struct device_node *port;
struct dsa_port *port;
u32 index;
int err;

Expand Down Expand Up @@ -308,8 +313,8 @@ static int dsa_ds_apply(struct dsa_switch_tree *dst, struct dsa_switch *ds)
}

for (index = 0; index < DSA_MAX_PORTS; index++) {
port = ds->ports[index].dn;
if (!port)
port = &ds->ports[index];
if (!dsa_port_is_valid(port))
continue;

if (dsa_port_is_dsa(port)) {
Expand All @@ -336,12 +341,12 @@ static int dsa_ds_apply(struct dsa_switch_tree *dst, struct dsa_switch *ds)

static void dsa_ds_unapply(struct dsa_switch_tree *dst, struct dsa_switch *ds)
{
struct device_node *port;
struct dsa_port *port;
u32 index;

for (index = 0; index < DSA_MAX_PORTS; index++) {
port = ds->ports[index].dn;
if (!port)
port = &ds->ports[index];
if (!dsa_port_is_valid(port))
continue;

if (dsa_port_is_dsa(port)) {
Expand Down Expand Up @@ -425,15 +430,15 @@ static void dsa_dst_unapply(struct dsa_switch_tree *dst)
dst->applied = false;
}

static int dsa_cpu_parse(struct device_node *port, u32 index,
static int dsa_cpu_parse(struct dsa_port *port, u32 index,
struct dsa_switch_tree *dst,
struct dsa_switch *ds)
{
enum dsa_tag_protocol tag_protocol;
struct net_device *ethernet_dev;
struct device_node *ethernet;

ethernet = of_parse_phandle(port, "ethernet", 0);
ethernet = of_parse_phandle(port->dn, "ethernet", 0);
if (!ethernet)
return -EINVAL;

Expand Down Expand Up @@ -466,13 +471,13 @@ static int dsa_cpu_parse(struct device_node *port, u32 index,

static int dsa_ds_parse(struct dsa_switch_tree *dst, struct dsa_switch *ds)
{
struct device_node *port;
struct dsa_port *port;
u32 index;
int err;

for (index = 0; index < DSA_MAX_PORTS; index++) {
port = ds->ports[index].dn;
if (!port)
port = &ds->ports[index];
if (!dsa_port_is_valid(port))
continue;

if (dsa_port_is_cpu(port)) {
Expand Down Expand Up @@ -533,14 +538,14 @@ static int dsa_parse_ports_dn(struct device_node *ports, struct dsa_switch *ds)
* to have access to a correct value, just like what
* net/dsa/dsa.c::dsa_switch_setup_one does.
*/
if (!dsa_port_is_cpu(port))
if (!dsa_port_is_cpu(&ds->ports[reg]))
ds->enabled_port_mask |= 1 << reg;
}

return 0;
}

static int dsa_parse_member(struct device_node *np, u32 *tree, u32 *index)
static int dsa_parse_member_dn(struct device_node *np, u32 *tree, u32 *index)
{
int err;

Expand Down Expand Up @@ -578,17 +583,19 @@ static struct device_node *dsa_get_ports(struct dsa_switch *ds,
return ports;
}

static int _dsa_register_switch(struct dsa_switch *ds, struct device_node *np)
static int _dsa_register_switch(struct dsa_switch *ds, struct device *dev)
{
struct device_node *ports = dsa_get_ports(ds, np);
struct device_node *np = dev->of_node;
struct dsa_switch_tree *dst;
struct device_node *ports;
u32 tree, index;
int i, err;

err = dsa_parse_member(np, &tree, &index);
err = dsa_parse_member_dn(np, &tree, &index);
if (err)
return err;

ports = dsa_get_ports(ds, np);
if (IS_ERR(ports))
return PTR_ERR(ports);

Expand Down Expand Up @@ -659,12 +666,12 @@ static int _dsa_register_switch(struct dsa_switch *ds, struct device_node *np)
return err;
}

int dsa_register_switch(struct dsa_switch *ds, struct device_node *np)
int dsa_register_switch(struct dsa_switch *ds, struct device *dev)
{
int err;

mutex_lock(&dsa2_mutex);
err = _dsa_register_switch(ds, np);
err = _dsa_register_switch(ds, dev);
mutex_unlock(&dsa2_mutex);

return err;
Expand Down
4 changes: 2 additions & 2 deletions net/dsa/dsa_priv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ struct dsa_slave_priv {

/* dsa.c */
int dsa_cpu_dsa_setup(struct dsa_switch *ds, struct device *dev,
struct device_node *port_dn, int port);
void dsa_cpu_dsa_destroy(struct device_node *port_dn);
struct dsa_port *dport, int port);
void dsa_cpu_dsa_destroy(struct dsa_port *dport);
const struct dsa_device_ops *dsa_resolve_tag_protocol(int tag_protocol);
int dsa_cpu_port_ethtool_setup(struct dsa_switch *ds);
void dsa_cpu_port_ethtool_restore(struct dsa_switch *ds);
Expand Down

0 comments on commit b95db66

Please sign in to comment.