[RFC net-next 08/11] net: dsa: allow updating fixed PHY link information
From: Florian Fainelli <f.fainelli@gmail.com>
Date: 2014-05-14 05:01:31
Subsystem:
networking [dsa], networking [general], the rest · Maintainers:
Andrew Lunn, Vladimir Oltean, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Allow switch drivers to hook a PHY link update callback to perform port-specific link work. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> --- include/net/dsa.h | 3 +++ net/dsa/slave.c | 18 +++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/include/net/dsa.h b/include/net/dsa.h
index a19bda9e260b..1aa40a0491d4 100644
--- a/include/net/dsa.h
+++ b/include/net/dsa.h@@ -17,6 +17,7 @@ #include <linux/workqueue.h> #include <linux/of.h> #include <linux/phy.h> +#include <linux/phy_fixed.h> #define DSA_MAX_SWITCHES 4 #define DSA_MAX_PORTS 12
@@ -183,6 +184,8 @@ struct dsa_switch_driver { */ void (*adjust_link)(struct dsa_switch *ds, int port, struct phy_device *phydev); + void (*fixed_link_update)(struct dsa_switch *ds, int port, + struct fixed_phy_status *st); /* * ethtool hardware statistics.
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 8ed94dab1867..791b0899e7ee 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c@@ -381,6 +381,18 @@ static void dsa_slave_adjust_link(struct net_device *dev) phy_print_status(p->phy); } +static int dsa_slave_fixed_link_update(struct net_device *dev, + struct fixed_phy_status *status) +{ + struct dsa_slave_priv *p = netdev_priv(dev); + struct dsa_switch *ds = p->parent; + + if (ds->drv->fixed_link_update) + ds->drv->fixed_link_update(ds, p->port, status); + + return 0; +} + /* slave device setup *******************************************************/ static void dsa_slave_phy_setup(struct dsa_slave_priv *p, struct net_device *slave_dev)
@@ -396,10 +408,14 @@ static void dsa_slave_phy_setup(struct dsa_slave_priv *p, p->phy = of_phy_connect(slave_dev, phy_dn, dsa_slave_adjust_link, 0, p->phy_interface); - else + else { p->phy = of_phy_connect_fixed_link(slave_dev, dsa_slave_adjust_link, p->phy_interface); + if (p->phy) + fixed_phy_set_link_update(p->phy, + dsa_slave_fixed_link_update); + } /* We could not connect to a designated PHY, so use the switch internal * MDIO bus instead
--
1.9.1