net: dsa: Support for pdata in dsa2
Subsystems (10)
v4 cover net: dsa: Support for pdata in dsa2
Hi all,
This is not exactly new, and was sent before, although back then, I did not have an user of the pre-declared MDIO board information, but now we do. Note that I have additional changes queued up to have b53 register platform data for MIPS bcm47xx and bcm63xx.
Yes I know that we should have the Orion platforms eventually be converted to Device Tree, but until that happens, I don't want any remaining users of the old "dsa" platform device (hence the previous DTS submissions for ARM/mvebu) and, there will be platforms out there that most likely won't never see DT coming their way (BCM47xx is almost 100% sure, BCM63xx maybe not in a distant future).
We would probably want the whole series to be merged via David Miller's tree to simplify things.
Greg, can you Ack/Nack patch 5 since it touched the core LDD?
Vivien, since some patches did change, I did not carry your Tested-by tag to all patches.
Thanks!
Changes in v4:
- Changed device_find_class() to device_find_in_class_name()
- Added kerneldoc above device_find_in_class_name() to explain what it does and the calling convention regarding device reference counts
- Changed dev_to_net_device to device_to_net_device() added comments about what it does and the caller conventions regarding reference counts
Changes in v3:
- Tested EPROBE_DEFER from a mockup MDIO/DSA switch driver and everything is fine, once the driver finally probes we have access to platform data as expected
- added comment above dsa_port_is_valid() that port->name is mandatory for platform data cases
- added an extra check in dsa_parse_member() for a NULL pdata pointer
- fixed a bunch of checkpatch errors and warnings
Changes in v2:
- Rebased against latest net-next/master
- Moved dev_find_class() to device_find_class() into drivers/base/core.c
- Moved dev_to_net_device into net/core/dev.c
- Utilize dsa_chip_data directly instead of dsa_platform_data
- Augmented dsa_chip_data to be multi-CPU port ready
Changes from last submission (few months back):
- rebased against latest net-next
- do not introduce dsa2_platform_data which was overkill and was meant to allow us to do exaclty the same things with platform data and Device Tree we use the existing dsa_platform_data instead
- properly register MDIO devices when the MDIO bus is registered and associate platform_data with them
- add a change to the Orion platform code to demonstrate how this can be used
Thank you
Florian Fainelli (10):
net: dsa: Pass device pointer to dsa_register_switch
net: dsa: Make most functions take a dsa_port argument
net: dsa: Suffix function manipulating device_node with _dn
net: dsa: Move ports assignment closer to error checking
drivers: base: Add device_find_in_class_name()
net: dsa: Migrate to device_find_in_class_name()
net: Relocate dev_to_net_device() into net/core/dev.c
net: dsa: Add support for platform data
net: phy: Allow pre-declaration of MDIO devices
ARM: orion: Register DSA switch as a MDIO device
arch/arm/mach-orion5x/common.c | 2 +- arch/arm/mach-orion5x/common.h | 4 +- arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 7 +- arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 7 +- arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 7 +- arch/arm/mach-orion5x/wnr854t-setup.c | 2 +- arch/arm/mach-orion5x/wrt350n-v2-setup.c | 7 +- arch/arm/plat-orion/common.c | 25 +++- arch/arm/plat-orion/include/plat/common.h | 4 +- drivers/base/core.c | 31 +++++ drivers/net/dsa/b53/b53_common.c | 2 +- drivers/net/dsa/mv88e6xxx/chip.c | 11 +- drivers/net/dsa/qca8k.c | 2 +- drivers/net/phy/Makefile | 3 +- drivers/net/phy/mdio-boardinfo.c | 86 +++++++++++++ drivers/net/phy/mdio-boardinfo.h | 19 +++ drivers/net/phy/mdio_bus.c | 4 + drivers/net/phy/mdio_device.c | 11 ++ include/linux/device.h | 2 + include/linux/mdio.h | 3 + include/linux/mod_devicetable.h | 1 + include/linux/netdevice.h | 2 + include/linux/phy.h | 19 +++ include/net/dsa.h | 8 +- net/core/dev.c | 30 +++++ net/dsa/dsa.c | 55 ++------- net/dsa/dsa2.c | 175 +++++++++++++++++++-------- net/dsa/dsa_priv.h | 4 +- 28 files changed, 391 insertions(+), 142 deletions(-) create mode 100644 drivers/net/phy/mdio-boardinfo.c create mode 100644 drivers/net/phy/mdio-boardinfo.h
Signature · 1 line
2.9.3
PATCH v4 1/10 net: dsa: Pass device pointer to dsa_register_switch
In preparation for allowing dsa_register_switch() to be supplied with device/platform data, pass down a struct device pointer instead of a struct device_node.
--- drivers/net/dsa/b53/b53_common.c | 2 +- drivers/net/dsa/mv88e6xxx/chip.c | 11 ++++++----- drivers/net/dsa/qca8k.c | 2 +- include/net/dsa.h | 2 +- net/dsa/dsa2.c | 7 ++++--- 5 files changed, 13 insertions(+), 11 deletions(-)
drivers/net/dsa/b53/b53_common.c +1 -1
@@ -1882,7 +1882,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);
drivers/net/dsa/mv88e6xxx/chip.c +6 -5
@@ -4421,8 +4421,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;
@@ -4437,7 +4436,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)
@@ -4521,9 +4520,11 @@ static int mv88e6xxx_probe(struct mdio_device *mdiodev)if (err) goto out_g2_irq; - err =mv88e6xxx_register_switch (chip, np); -if (err) + err =mv88e6xxx_register_switch (chip); +if (err) { +mv88e6xxx_mdio_unregister (chip); goto out_mdio; + }return 0 ;
drivers/net/dsa/qca8k.c +1 -1
@@ -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
include/net/dsa.h +1 -1
@@ -403,7 +403,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);
net/dsa/dsa2.c +4 -3
@@ -579,8 +579,9 @@ 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 *np = dev->of_node;struct device_node *ports =dsa_get_ports (ds, np);struct dsa_switch_tree *dst;u32 tree, index;
@@ -660,12 +661,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;
Signature · 1 line
2.9.3
PATCH v4 2/10 net: dsa: Make most functions take a dsa_port argument
In reply to Florian FainelliIn preparation for allowing platform data, and therefore no valid device_node pointer, make most DSA functions takes a pointer to a dsa_port structure whenever possible. While at it, introduce a dsa_port_is_valid() helper function which checks whether port->dn is NULL or not at the moment.
--- net/dsa/dsa.c | 15 ++++++++------ net/dsa/dsa2.c | 61 +++++++++++++++++++++++++++++------------------------- net/dsa/dsa_priv.h | 4 ++-- 3 files changed, 44 insertions(+), 36 deletions(-)
net/dsa/dsa.c +9 -6
@@ -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;
@@ -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; }
@@ -366,8 +367,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); }
@@ -393,7 +396,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);
net/dsa/dsa2.c +33 -28
182 lines not on this page · raw message
net/dsa/dsa_priv.h +2 -2
@@ -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);
Signature · 1 line
2.9.3
PATCH v4 3/10 net: dsa: Suffix function manipulating device_node with _dn
In reply to Florian FainelliMake it clear that these functions take a device_node structure pointer
--- net/dsa/dsa2.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
net/dsa/dsa2.c +8 -8
@@ -94,8 +94,8 @@ static bool dsa_port_is_cpu(struct dsa_port *port)return !!of_parse_phandle (port->dn,"ethernet" ,0 ); } -static bool dsa_ds_find_port (struct dsa_switch *ds, -struct device_node *port) +static bool dsa_ds_find_port_dn (struct dsa_switch *ds, +struct device_node *port) {u32 index;
@@ -105,8 +105,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;
@@ -116,7 +116,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; }
@@ -137,7 +137,7 @@ static int dsa_port_complete(struct dsa_switch_tree *dst,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)
@@ -546,7 +546,7 @@ static int dsa_parse_ports_dn(struct device_node *ports, struct dsa_switch *ds)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;
@@ -592,7 +592,7 @@ static int _dsa_register_switch(struct dsa_switch *ds, struct device *dev)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;
Signature · 1 line
2.9.3
PATCH v4 4/10 net: dsa: Move ports assignment closer to error checking
In reply to Florian FainelliMove the assignment of ports in _dsa_register_switch() closer to where it is checked, no functional change. Re-order declarations to be preserve the inverted christmas tree style.
--- net/dsa/dsa2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/dsa/dsa2.c +2 -1
@@ -587,8 +587,8 @@ static struct device_node *dsa_get_ports(struct dsa_switch *ds,static int _dsa_register_switch (struct dsa_switch *ds,struct device *dev) {struct device_node *np = dev->of_node; -struct device_node *ports =dsa_get_ports (ds, np);struct dsa_switch_tree *dst; +struct device_node *ports;u32 tree, index;int i, err;
@@ -596,6 +596,7 @@ static int _dsa_register_switch(struct dsa_switch *ds, struct device *dev)if (err)return err; + ports =dsa_get_ports (ds, np);if (IS_ERR (ports))return PTR_ERR (ports);
Signature · 1 line
2.9.3
PATCH v4 5/10 drivers: base: Add device_find_in_class_name()
In reply to Florian FainelliAdd a helper function to lookup a device reference given a class name. This is a preliminary patch to remove adhoc code from net/dsa/dsa.c and make it more generic.
--- drivers/base/core.c | 31 +++++++++++++++++++++++++++++++ include/linux/device.h | 2 ++ 2 files changed, 33 insertions(+)
drivers/base/core.c +31 -0
@@ -2058,6 +2058,37 @@ struct device *device_find_child(struct device *parent, void *data, }EXPORT_SYMBOL_GPL (device_find_child); +static int device_class_name_match (struct device *dev,void *class) +{ +if (dev->class !=NULL && !strcmp (dev->class->name, class)) +return 1 ; + +return 0 ; +} + +/** +* device_find_in_class_name - device iterator for locating a particular device +* within the specified class name +* @parent: parent struct device +* @class_name: Class name to match against +* +* This function returns 1 if the device (specified by @parent), or one of its child +* is in the class whose name is specified by @class_name. Returns 0 otherwise. +* +* NOTE: you will need to drop the reference with put_device() after use. +*/ +struct device *device_find_in_class_name (struct device *parent, +char *class_name) +{ +if (device_class_name_match (parent, class_name)) { +get_device (parent); +return parent; + } + +return device_find_child (parent, class_name, device_class_name_match); +} +EXPORT_SYMBOL_GPL (device_find_in_class_name); +int __init devices_init (void ) { devices_kset =kset_create_and_add ("devices" , &device_uevent_ops,NULL );
include/linux/device.h +2 -0
@@ -1120,6 +1120,8 @@ extern int device_for_each_child_reverse(struct device *dev, void *data, int (*fn)(struct device *dev, void *data));extern struct device *device_find_child (struct device *dev,void *data,int (*match)(struct device *dev,void *data)); +extern struct device *device_find_in_class_name (struct device *parent, +char *class_name);extern int device_rename (struct device *dev,const char *new_name);extern int device_move (struct device *dev,struct device *new_parent,enum dpm_order dpm_order);
Signature · 1 line
2.9.3
Re: [PATCH net-next v4 05/10] drivers: base: Add device_find_in_class_name()
Quoted 6 lines · Florian Fainelli
Add a helper function to lookup a device reference given a class name. This is a preliminary patch to remove adhoc code from
net/dsa/dsa.cand make it more generic.+static int
device_class_name_match(struct device *dev, void *class)
And why not const char *class?
drivers/base/core.c struct device *device_find_child(struct device *parent, void *data, · line 2063
Quoted 2 lines
drivers/base/core.c +2
-0+{ +if (dev->class !=NULL && !strcmp (dev->class->name, class))
if (dev->class && ...)
drivers/base/core.c struct device *device_find_child(struct device *parent, void *data, · line 2066
Quoted 3 lines
drivers/base/core.c +3
-0+return 1 ; + +return 0 ;
Perhaps even one line:
return dev->class && ...;
Quoted 5 lines
drivers/base/core.c +5
-0+} + +/** +* device_find_in_class_name - device iterator for locating a particular device +* within the specified class name
drivers/base/core.c struct device *device_find_child(struct device *parent, void *data, · line 2081
Quoted 10 lines
drivers/base/core.c +10
-0+* @parent: parent struct device +* @class_name: Class name to match against +* +* This function returns 1 if the device (specified by @parent), or one of its child +* is in the class whose name is specified by @class_name. Returns 0 otherwise. +* +* NOTE: you will need to drop the reference with put_device() after use. +*/ +struct device *device_find_in_class_name (struct device *parent, +char *class_name)
const char *class_name
drivers/base/core.c struct device *device_find_child(struct device *parent, void *data,
Quoted 12 lines
drivers/base/core.c +11
-0+{ +if (device_class_name_match (parent, class_name)) { +get_device (parent); +return parent; + } + +return device_find_child (parent, class_name, device_class_name_match); +} +EXPORT_SYMBOL_GPL (device_find_in_class_name); +extern struct device *device_find_in_class_name (struct device *parent, +char *class_name);
Ditto.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH net-next v4 05/10] drivers: base: Add device_find_in_class_name()
Quoted 9 lines · Andy Shevchenko
Quoted 6 lines · Florian Fainelli
Add a helper function to lookup a device reference given a class name. This is a preliminary patch to remove adhoc code from
net/dsa/dsa.cand make it more generic.+static int
device_class_name_match(struct device *dev, void *class)And why not const char *class?
This was raised back in v2, and the same response applies:
https://www.mail-archive.com/netdev at vger.kernel.org/msg147559.html
Changing the signature of a callback is out of the scope of this patch series.
Signature · 1 line
Florian
Re: [PATCH net-next v4 05/10] drivers: base: Add device_find_in_class_name()
Quoted 5 lines · Florian Fainelli
Quoted 4 lines · Andy Shevchenko
Quoted 1 line · Florian Fainelli
+static int
device_class_name_match(struct device *dev, void *class)
Quoted 8 lines
Quoted 1 line
And why not const char *class?
This was raised back in v2, and the same response applies:
https://www.mail-archive.com/netdev at vger.kernel.org/msg147559.html
Changing the signature of a callback is out of the scope of this patch series.
Ah, right.
But why not to use void *class_name to be consistent with callback and device_find_child()?
Btw,
return get_device(parent);
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH net-next v4 05/10] drivers: base: Add device_find_in_class_name()
Quoted 12 lines · Andy Shevchenko
Quoted 11 lines · Florian Fainelli
Quoted 5 lines · Andy Shevchenko
Quoted 1 line · Florian Fainelli
+static int
device_class_name_match(struct device *dev, void *class)And why not const char *class?
This was raised back in v2, and the same response applies:
https://www.mail-archive.com/netdev at vger.kernel.org/msg147559.html
Quoted 7 lines
Quoted 2 lines
Changing the signature of a callback is out of the scope of this patch series.
Ah, right.
But why not to use void
*class_nameto be consistent with callback anddevice_find_child()?
The top-level function: device_find_in_class_name() should have a stronger typing of its argument even if it internally uses device_find_child() and a callback that takes a void * argument, that's how I see it.
Quoted 4 lines
Btw,
return
get_device(parent);
Not sure I follow what that means here?
Signature · 1 line
Florian
Re: [PATCH net-next v4 05/10] drivers: base: Add device_find_in_class_name()
Quoted 5 lines · Florian Fainelli
Quoted 3 lines · Andy Shevchenko
Quoted 2 lines · Florian Fainelli
Quoted 1 line · Andy Shevchenko
On Wed, Jan 18, 2017 at 1:21 AM, Florian Fainelli <[email protected]> wrote:
Quoted 7 lines
Quoted 2 lines
But why not to use void
*class_nameto be consistent with callback anddevice_find_child()?The top-level function:
device_find_in_class_name()should have a stronger typing of its argument even if it internally usesdevice_find_child()and a callback that takes a void * argument, that's how I see it.
Fair enough.
Quoted 4 lines
Quoted 2 lines
Btw,
returnget_device(parent);Not sure I follow what that means here?
Missed remark. Instead of
get_device(parent);
return parent;
you can use
return get_device(parent);
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH net-next v4 05/10] drivers: base: Add device_find_in_class_name()
Quoted 21 lines · Andy Shevchenko
Quoted 5 lines · Florian Fainelli
Quoted 3 lines · Andy Shevchenko
Quoted 2 lines · Florian Fainelli
Quoted 1 line · Andy Shevchenko
On Wed, Jan 18, 2017 at 1:21 AM, Florian Fainelli <[email protected]> wrote:
Quoted 7 lines
Quoted 2 lines
But why not to use void
*class_nameto be consistent with callback anddevice_find_child()?The top-level function:
device_find_in_class_name()should have a stronger typing of its argument even if it internally usesdevice_find_child()and a callback that takes a void * argument, that's how I see it.Fair enough.
Quoted 4 lines
Quoted 2 lines
Btw,
returnget_device(parent);Not sure I follow what that means here?
Quoted 8 lines
Missed remark. Instead of
get_device(parent);
return parent;you can use
return
get_device(parent);
Seems reasonable, if I have to respin a v5, will add that, thanks!
Signature · 1 line
Florian
Greg Kroah-Hartman
maintainerRe: [PATCH net-next v4 05/10] drivers: base: Add device_find_in_class_name()
In reply to Florian FainelliQuoted 9 lines · Florian Fainelli
Add a helper function to lookup a device reference given a class name. This is a preliminary patch to remove adhoc code from
net/dsa/dsa.cand make it more generic.Signed-off-by Florian Fainelli <[email protected]>--- drivers/base/core.c | 31 +++++++++++++++++++++++++++++++ include/linux/device.h | 2 ++ 2 files changed, 33 insertions(+)
My NAK still stands here, please give me a day or so to respond to the other thread about this...
thanks,
greg k-h
PATCH v4 6/10 net: dsa: Migrate to device_find_in_class_name()
In reply to Florian FainelliNow that the base device driver code provides an identical implementation of dev_find_class() utilize device_find_in_class_name() instead of our own version of it.
--- net/dsa/dsa.c | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-)
net/dsa/dsa.c +2 -20
@@ -455,29 +455,11 @@ EXPORT_SYMBOL_GPL(dsa_switch_resume);#endif /* platform driver init and cleanup *****************************************/ -static int dev_is_class (struct device *dev,void *class) -{ -if (dev->class !=NULL && !strcmp (dev->class->name, class)) -return 1 ; - -return 0 ; -} - -static struct device *dev_find_class (struct device *parent,char *class) -{ -if (dev_is_class (parent, class)) { -get_device (parent); -return parent; - } - -return device_find_child (parent, class, dev_is_class); -} -struct mii_bus *dsa_host_dev_to_mii_bus (struct device *dev) {struct device *d; - d =dev_find_class (dev,"mdio_bus" ); + d =device_find_in_class_name (dev,"mdio_bus" );if (d !=NULL ) {struct mii_bus *bus;
@@ -495,7 +477,7 @@ static struct net_device *dev_to_net_device(struct device *dev) {struct device *d; - d =dev_find_class (dev,"net" ); + d =device_find_in_class_name (dev,"net" );if (d !=NULL ) {struct net_device *nd;
Signature · 1 line
2.9.3
PATCH v4 7/10 net: Relocate dev_to_net_device() into net/core/dev.c
In reply to Florian Fainellidev_to_net_device() is moved from net/dsa/dsa.c to net/core/dev.c since it going to be used by net/dsa/dsa2.c and the namespace of the function justifies making it available to other users potentially. We also rename it to device_to_net_device() to better illustrate what it does since it is not just a container_of() wrapper.
--- include/linux/netdevice.h | 2 ++ net/core/dev.c | 30 ++++++++++++++++++++++++++++++ net/dsa/dsa.c | 20 +------------------- 3 files changed, 33 insertions(+), 19 deletions(-)
include/linux/netdevice.h +2 -0
@@ -4390,4 +4390,6 @@ do { \#define PTYPE_HASH_SIZE (16)#define PTYPE_HASH_MASK (PTYPE_HASH_SIZE - 1) +struct net_device *device_to_net_device (struct device *dev); +#endif /* _LINUX_NETDEVICE_H */
net/core/dev.c +30 -0
@@ -8128,6 +8128,36 @@ const char *netdev_drivername(const struct net_device *dev)return empty; } +/** +* device_to_net_device - return the net_device from device +* @dev: device reference +* +* Returns the net_device associated with this device reference +* NULL if the device is not a network device, or could not be +* found. +* +* Note: caller must call dev_put() to release the net_device +* once done with it. +*/ +struct net_device *device_to_net_device (struct device *dev) +{ +struct device *d; + + d =device_find_in_class_name (dev,"net" ); +if (d) { +struct net_device *nd; + + nd =to_net_dev (d); +dev_hold (nd); +put_device (d); + +return nd; + } + +return NULL ; +} +EXPORT_SYMBOL_GPL (device_to_net_device); +static void __netdev_printk (const char *level,const struct net_device *dev,struct va_format *vaf) {
net/dsa/dsa.c +1 -19
@@ -473,24 +473,6 @@ struct mii_bus *dsa_host_dev_to_mii_bus(struct device *dev) }EXPORT_SYMBOL_GPL (dsa_host_dev_to_mii_bus); -static struct net_device *dev_to_net_device (struct device *dev) -{ -struct device *d; - - d =device_find_in_class_name (dev,"net" ); -if (d !=NULL ) { -struct net_device *nd; - - nd =to_net_dev (d); -dev_hold (nd); -put_device (d); - -return nd; - } - -return NULL ; -} -#ifdef CONFIG_OF static int dsa_of_setup_routing_table(struct dsa_platform_data *pd, struct dsa_chip_data *cd,
@@ -799,7 +781,7 @@ static int dsa_probe(struct platform_device *pdev) dev = pd->of_netdev;dev_hold (dev); }else { - dev =dev_to_net_device (pd->netdev); + dev =device_to_net_device (pd->netdev); }if (dev ==NULL ) { ret = -EPROBE_DEFER ;
Signature · 1 line
2.9.3
PATCH v4 8/10 net: dsa: Add support for platform data
In reply to Florian FainelliAllow drivers to use the new DSA API with platform data. Most of the code in net/dsa/dsa2.c does not rely so much on device_nodes and can get the same information from platform_data instead.
We purposely do not support distributed configurations with platform data, so drivers should be providing a pointer to a 'struct dsa_chip_data' structure if they wish to communicate per-port layout.
Multiple CPUs port could potentially be supported and dsa_chip_data is extended to receive up to one reference to an upstream network device per port described by a dsa_chip_data structure.
--- include/net/dsa.h | 6 ++++ net/dsa/dsa2.c | 102 ++++++++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 90 insertions(+), 18 deletions(-)
include/net/dsa.h +6 -0
@@ -42,6 +42,11 @@ struct dsa_chip_data {struct device *host_dev;int sw_addr; +/* +* Reference to network devices +*/ +struct device *netdev[DSA_MAX_PORTS ]; +/* set to size of eeprom if supported by the switch */ int eeprom_len;
@@ -140,6 +145,7 @@ struct dsa_switch_tree { };struct dsa_port { +const char *name;struct net_device *netdev;struct device_node *dn;unsigned int ageing_time;
net/dsa/dsa2.c +84 -18
171 lines not on this page · raw message
Signature · 1 line
2.9.3
PATCH v4 9/10 net: phy: Allow pre-declaration of MDIO devices
In reply to Florian FainelliAllow board support code to collect pre-declarations for MDIO devices by registering them with mdiobus_register_board_info(). SPI and I2C buses have a similar feature, we were missing this for MDIO devices, but this is particularly useful for e.g: MDIO-connected switches which need to provide their port layout (often board-specific) to a MDIO Ethernet switch driver.
--- drivers/net/phy/Makefile | 3 +- drivers/net/phy/mdio-boardinfo.c | 86 ++++++++++++++++++++++++++++++++++++++++ drivers/net/phy/mdio-boardinfo.h | 19 +++++++++ drivers/net/phy/mdio_bus.c | 4 ++ drivers/net/phy/mdio_device.c | 11 +++++ include/linux/mdio.h | 3 ++ include/linux/mod_devicetable.h | 1 + include/linux/phy.h | 19 +++++++++ 8 files changed, 145 insertions(+), 1 deletion(-) create mode 100644 drivers/net/phy/mdio-boardinfo.c create mode 100644 drivers/net/phy/mdio-boardinfo.h
drivers/net/phy/Makefile +2 -1
@@ -1,6 +1,7 @@ # Makefile for Linux PHY drivers and MDIO bus drivers -libphy-y := phy.o phy_device.o mdio_bus.o mdio_device.o +libphy-y := phy.o phy_device.o mdio_bus.o mdio_device.o \ + mdio-boardinfo.o libphy-$(CONFIG_SWPHY) += swphy.o libphy-$(CONFIG_LED_TRIGGER_PHY) += phy_led_triggers.o
drivers/net/phy/mdio-boardinfo.c new file +86 -0
86 lines not on this page · raw message
drivers/net/phy/mdio-boardinfo.h new file +19 -0
@@ -0,0 +1,19 @@ +/* +* mdio-boardinfo.h - board info interface internal to the mdio_bus +* component +*/ + +#ifndef __MDIO_BOARD_INFO_H +#define __MDIO_BOARD_INFO_H + +#include <linux/phy.h> +#include <linux/mutex.h> + +struct mdio_board_entry { +struct list_head list; +struct mdio_board_info board_info; +}; + +void mdiobus_setup_mdiodev_from_board_info (struct mii_bus *bus); + +#endif /* __MDIO_BOARD_INFO_H */
drivers/net/phy/mdio_bus.c +4 -0
@@ -41,6 +41,8 @@#define CREATE_TRACE_POINTS #include <trace/events/mdio.h> +#include "mdio-boardinfo.h" +int mdiobus_register_device (struct mdio_device *mdiodev) {if (mdiodev->bus->mdio_map[mdiodev->addr])
@@ -343,6 +345,8 @@ int __mdiobus_register(struct mii_bus *bus, struct module *owner) } } +mdiobus_setup_mdiodev_from_board_info (bus); + bus->state =MDIOBUS_REGISTERED ;pr_info ("%s: probed\n" , bus->name);return 0 ;
drivers/net/phy/mdio_device.c +11 -0
@@ -34,6 +34,17 @@ static void mdio_device_release(struct device *dev)kfree (to_mdio_device (dev)); } +int mdio_device_bus_match (struct device *dev,struct device_driver *drv) +{ +struct mdio_device *mdiodev =to_mdio_device (dev); +struct mdio_driver *mdiodrv =to_mdio_driver (drv); + +if (mdiodrv->mdiodrv.flags &MDIO_DEVICE_IS_PHY ) +return 0 ; + +return strcmp (mdiodev->modalias, drv->name) ==0 ; +} +struct mdio_device *mdio_device_create (struct mii_bus *bus,int addr) {struct mdio_device *mdiodev;
include/linux/mdio.h +3 -0
@@ -10,6 +10,7 @@#define __LINUX_MDIO_H__#include <uapi/linux/mdio.h> +#include <linux/mod_devicetable.h> struct mii_bus ;
@@ -29,6 +30,7 @@ struct mdio_device {const struct dev_pm_ops *pm_ops;struct mii_bus *bus; +char modalias[MDIO_NAME_SIZE ];int (*bus_match)(struct device *dev,struct device_driver *drv);void (*device_free)(struct mdio_device *mdiodev);
@@ -71,6 +73,7 @@ int mdio_device_register(struct mdio_device *mdiodev);void mdio_device_remove (struct mdio_device *mdiodev);int mdio_driver_register (struct mdio_driver *drv);void mdio_driver_unregister (struct mdio_driver *drv); +int mdio_device_bus_match (struct device *dev,struct device_driver *drv);static inline bool mdio_phy_id_is_c45 (int phy_id) {
include/linux/mod_devicetable.h +1 -0
@@ -501,6 +501,7 @@ struct platform_device_id {kernel_ulong_t driver_data; }; +#define MDIO_NAME_SIZE 32#define MDIO_MODULE_PREFIX "mdio:"#define MDIO_ID_FMT "%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d"
include/linux/phy.h +19 -0
@@ -882,6 +882,25 @@ void mdio_bus_exit(void);extern struct bus_type mdio_bus_type; +struct mdio_board_info { +const char *bus_id; +char modalias[MDIO_NAME_SIZE ]; +int mdio_addr; +const void *platform_data; +}; + +#if IS_ENABLED (CONFIG_PHYLIB ) +int mdiobus_register_board_info (const struct mdio_board_info *info, +unsigned int n); +#else +static inline int mdiobus_register_board_info (const struct mdio_board_info *i, +unsigned int n) +{ +return 0 ; +} +#endif + +/** * module_phy_driver() - Helper macro for registering PHY drivers * @__phy_drivers: array of PHY drivers to register
Signature · 1 line
2.9.3
PATCH v4 10/10 ARM: orion: Register DSA switch as a MDIO device
In reply to Florian FainelliUtilize the ability to pass board specific MDIO bus information towards a particular MDIO device thus allowing us to provide the per-port switch layout to the Marvell 88E6XXX switch driver.
Since we would end-up with conflicting registration paths, do not register the "dsa" platform device anymore.
Note that the MDIO devices registered by code in net/dsa/dsa2.c does not parse a dsa_platform_data, but directly take a dsa_chip_data (specific to a single switch chip), so we update the different call sites to pass this structure down to orion_ge00_switch_init().
--- arch/arm/mach-orion5x/common.c | 2 +- arch/arm/mach-orion5x/common.h | 4 ++-- arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 7 +------ arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 7 +------ arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 7 +------ arch/arm/mach-orion5x/wnr854t-setup.c | 2 +- arch/arm/mach-orion5x/wrt350n-v2-setup.c | 7 +------ arch/arm/plat-orion/common.c | 25 +++++++++++++++++++------ arch/arm/plat-orion/include/plat/common.h | 4 ++-- 9 files changed, 29 insertions(+), 36 deletions(-)
arch/arm/mach-orion5x/common.c +1 -1
@@ -105,7 +105,7 @@ void __init orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data)/***************************************************************************** * Ethernet switch ****************************************************************************/ -void __init orion5x_eth_switch_init (struct dsa_platform_data *d) +void __init orion5x_eth_switch_init (struct dsa_chip_data *d) {orion_ge00_switch_init (d); }
arch/arm/mach-orion5x/common.h +2 -2
@@ -3,7 +3,7 @@#include <linux/reboot.h> -struct dsa_platform_data ; +struct dsa_chip_data ;struct mv643xx_eth_platform_data ;struct mv_sata_platform_data ;
@@ -41,7 +41,7 @@ void orion5x_setup_wins(void);void orion5x_ehci0_init (void );void orion5x_ehci1_init (void );void orion5x_eth_init (struct mv643xx_eth_platform_data *eth_data); -void orion5x_eth_switch_init (struct dsa_platform_data *d); +void orion5x_eth_switch_init (struct dsa_chip_data *d);void orion5x_i2c_init (void );void orion5x_sata_init (struct mv_sata_platform_data *sata_data);void orion5x_spi_init (void );
arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c +1 -6
@@ -101,11 +101,6 @@ static struct dsa_chip_data rd88f5181l_fxo_switch_chip_data = { .port_names[7] = "lan3", }; -static struct dsa_platform_data __initdata rd88f5181l_fxo_switch_plat_data = { - .nr_chips =1 , - .chip = &rd88f5181l_fxo_switch_chip_data, -}; -static void __init rd88f5181l_fxo_init (void ) {/*
@@ -120,7 +115,7 @@ static void __init rd88f5181l_fxo_init(void)*/ orion5x_ehci0_init ();orion5x_eth_init (&rd88f5181l_fxo_eth_data); -orion5x_eth_switch_init (&rd88f5181l_fxo_switch_plat_data); +orion5x_eth_switch_init (&rd88f5181l_fxo_switch_chip_data);orion5x_uart0_init (); mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,
arch/arm/mach-orion5x/rd88f5181l-ge-setup.c +1 -6
@@ -102,11 +102,6 @@ static struct dsa_chip_data rd88f5181l_ge_switch_chip_data = { .port_names[7] = "lan3", }; -static struct dsa_platform_data __initdata rd88f5181l_ge_switch_plat_data = { - .nr_chips =1 , - .chip = &rd88f5181l_ge_switch_chip_data, -}; -static struct i2c_board_info __initdata rd88f5181l_ge_i2c_rtc = {I2C_BOARD_INFO ("ds1338" ,0x68 ), };
@@ -125,7 +120,7 @@ static void __init rd88f5181l_ge_init(void)*/ orion5x_ehci0_init ();orion5x_eth_init (&rd88f5181l_ge_eth_data); -orion5x_eth_switch_init (&rd88f5181l_ge_switch_plat_data); +orion5x_eth_switch_init (&rd88f5181l_ge_switch_chip_data);orion5x_i2c_init ();orion5x_uart0_init ();
arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c +1 -6
@@ -40,11 +40,6 @@ static struct dsa_chip_data rd88f6183ap_ge_switch_chip_data = { .port_names[5] = "cpu", }; -static struct dsa_platform_data __initdata rd88f6183ap_ge_switch_plat_data = { - .nr_chips =1 , - .chip = &rd88f6183ap_ge_switch_chip_data, -}; -static struct mtd_partition rd88f6183ap_ge_partitions[] = { { .name ="kernel" ,
@@ -89,7 +84,7 @@ static void __init rd88f6183ap_ge_init(void)*/ orion5x_ehci0_init ();orion5x_eth_init (&rd88f6183ap_ge_eth_data); -orion5x_eth_switch_init (&rd88f6183ap_ge_switch_plat_data); +orion5x_eth_switch_init (&rd88f6183ap_ge_switch_chip_data);spi_register_board_info (rd88f6183ap_ge_spi_slave_info,ARRAY_SIZE (rd88f6183ap_ge_spi_slave_info));orion5x_spi_init ();
arch/arm/mach-orion5x/wnr854t-setup.c +1 -1
@@ -124,7 +124,7 @@ static void __init wnr854t_init(void)* Configure peripherals. */ orion5x_eth_init (&wnr854t_eth_data); -orion5x_eth_switch_init (&wnr854t_switch_plat_data); +orion5x_eth_switch_init (&wnr854t_switch_chip_data);orion5x_uart0_init (); mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,
arch/arm/mach-orion5x/wrt350n-v2-setup.c +1 -6
@@ -191,11 +191,6 @@ static struct dsa_chip_data wrt350n_v2_switch_chip_data = { .port_names[7] = "lan4", }; -static struct dsa_platform_data __initdata wrt350n_v2_switch_plat_data = { - .nr_chips =1 , - .chip = &wrt350n_v2_switch_chip_data, -}; -static void __init wrt350n_v2_init (void ) {/*
@@ -210,7 +205,7 @@ static void __init wrt350n_v2_init(void)*/ orion5x_ehci0_init ();orion5x_eth_init (&wrt350n_v2_eth_data); -orion5x_eth_switch_init (&wrt350n_v2_switch_plat_data); +orion5x_eth_switch_init (&wrt350n_v2_switch_chip_data);orion5x_uart0_init (); mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,
arch/arm/plat-orion/common.c +19 -6
@@ -22,6 +22,7 @@#include <linux/platform_data/dma-mv_xor.h> #include <linux/platform_data/usb-ehci-orion.h> #include <plat/common.h> +#include <linux/phy.h> /* Create a clkdev entry for a given device/clk */ void __init orion_clkdev_add(const char *con_id, const char *dev_id,
@@ -470,15 +471,27 @@ void __init orion_ge11_init(struct mv643xx_eth_platform_data *eth_data,/***************************************************************************** * Ethernet switch ****************************************************************************/ -void __init orion_ge00_switch_init (struct dsa_platform_data *d) +static __initconst const char *orion_ge00_mvmdio_bus_name ="orion-mii" ; +static __initdata struct mdio_board_info + orion_ge00_switch_board_info; + +void __init orion_ge00_switch_init (struct dsa_chip_data *d) { -int i; +struct mdio_board_info *bd; +unsigned int i; + +for (i =0 ; i <ARRAY_SIZE (d->port_names); i++) +if (!strcmp (d->port_names[i],"cpu" )) +break ; - d->netdev = &orion_ge00.dev; -for (i =0 ; i < d->nr_chips; i++) - d->chip[i].host_dev = &orion_ge_mvmdio.dev; + bd = &orion_ge00_switch_board_info; + bd->bus_id = orion_ge00_mvmdio_bus_name; + bd->mdio_addr = d->sw_addr; + d->netdev[i] = &orion_ge00.dev; +strcpy (bd->modalias,"mv88e6085" ); + bd->platform_data = d; -platform_device_register_data (NULL ,"dsa" ,0 , d,sizeof (d)); +mdiobus_register_board_info (&orion_ge00_switch_board_info,1 ); }/*****************************************************************************
arch/arm/plat-orion/include/plat/common.h +2 -2
@@ -12,7 +12,7 @@#include <linux/mv643xx_eth.h> #include <linux/platform_data/usb-ehci-orion.h> -struct dsa_platform_data ; +struct dsa_chip_data ;struct mv_sata_platform_data ; void __init orion_uart0_init(void __iomem *membase,
@@ -57,7 +57,7 @@ void __init orion_ge11_init(struct mv643xx_eth_platform_data *eth_data,unsigned long mapbase, unsigned long irq); -void __init orion_ge00_switch_init (struct dsa_platform_data *d); +void __init orion_ge00_switch_init (struct dsa_chip_data *d); void __init orion_i2c_init(unsigned long mapbase, unsigned long irq,
Signature · 1 line
2.9.3
David Miller
maintainerFrom: Florian Fainelli <[email protected]>
Date: Tue, 17 Jan 2017 15:21:42 -0800
Quoted 4 lines
This is not exactly new, and was sent before, although back then, I did not have an user of the pre-declared MDIO board information, but now we do. Note that I have additional changes queued up to have b53 register platform data for MIPS bcm47xx and bcm63xx.
...
We're waiting for Greg's further review and Vivien's changes which I just applied are going to create some conflicts, so I am presuming that you will respin a v5 anyways.
Quoted 7 lines · David Miller
From: Florian Fainelli <[email protected]>
Date: Tue, 17 Jan 2017 15:21:42 -0800Quoted 4 lines
This is not exactly new, and was sent before, although back then, I did not have an user of the pre-declared MDIO board information, but now we do. Note that I have additional changes queued up to have b53 register platform data for MIPS bcm47xx and bcm63xx.
Quoted 5 lines
...
We're waiting for Greg's further review and Vivien's changes which I just applied are going to create some conflicts, so I am presuming that you will respin a v5 anyways.
Yes indeed. Thanks for your patience!
Signature · 1 line
Florian