From: Florian Fainelli <f.fainelli@gmail.com>
To: netdev@vger.kernel.org
Cc: davem@davemlof.net, jhs@mojatatu.com, linville@tuxdriver.com,
	alexander.h.duyck@intel.com,
	Florian Fainelli <f.fainelli@gmail.com>
Subject: [PATCH net-next v3 08/12] net: dsa: allow updating fixed PHY link information
Date: Sun, 24 Aug 2014 11:44:25 -0700	[thread overview]
Message-ID: <1408905869-10471-9-git-send-email-f.fainelli@gmail.com> (raw)
In-Reply-To: <1408905869-10471-1-git-send-email-f.fainelli@gmail.com>
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   | 17 +++++++++++++++++
 2 files changed, 20 insertions(+)
diff --git a/include/net/dsa.h b/include/net/dsa.h
index 4507c50d29a6..9c0fd1b5e530 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
@@ -184,6 +185,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 893afe9e60aa..ee019ec29dec 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -382,6 +382,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)
@@ -389,6 +401,7 @@ static void dsa_slave_phy_setup(struct dsa_slave_priv *p,
 	struct dsa_switch *ds = p->parent;
 	struct dsa_chip_data *cd = ds->pd;
 	struct device_node *phy_dn, *port_dn;
+	unsigned int phy_is_fixed = 0;
 	int ret;
 
 	port_dn = cd->port_dn[p->port];
@@ -404,6 +417,7 @@ static void dsa_slave_phy_setup(struct dsa_slave_priv *p,
 			pr_err("failed to register fixed PHY\n");
 			return;
 		}
+		phy_is_fixed = 1;
 		phy_dn = port_dn;
 	}
 
@@ -412,6 +426,9 @@ static void dsa_slave_phy_setup(struct dsa_slave_priv *p,
 					dsa_slave_adjust_link, 0,
 					p->phy_interface);
 
+	if (p->phy && phy_is_fixed)
+		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
next prev parent reply	other threads:[~2014-08-24 18:45 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-24 18:44 [PATCH net-next v3 00/12] dsa: support for Broadcom Starfighter 2 Florian Fainelli
2014-08-24 18:44 ` [PATCH net-next v3 01/12] net: dsa: rework skb->protocol override helpers Florian Fainelli
2014-08-24 18:44 ` [PATCH net-next v3 02/12] net: phy: add generic UniMAC MDIO bus driver Florian Fainelli
2014-08-24 18:44 ` [PATCH net-next v3 03/12] net: dsa: provide a switch device device tree node pointer Florian Fainelli
2014-08-24 18:44 ` [PATCH net-next v3 04/12] net: dsa: retain a per-port device_node pointer Florian Fainelli
2014-08-24 23:32   ` Alexander Duyck
2014-08-25  2:30     ` Florian Fainelli
2014-08-26  0:51       ` Florian Fainelli
2014-08-24 18:44 ` [PATCH net-next v3 05/12] net: dsa: allow for more complex PHY setups Florian Fainelli
2014-08-24 18:44 ` [PATCH net-next v3 06/12] net: dsa: allow switches to work without tagging Florian Fainelli
2014-08-24 23:27   ` Alexander Duyck
2014-08-24 18:44 ` [PATCH net-next v3 07/12] net: dsa: allow drivers to do link adjustment Florian Fainelli
2014-08-24 18:44 ` Florian Fainelli [this message]
2014-08-25  4:56   ` [PATCH net-next v3 08/12] net: dsa: allow updating fixed PHY link information David Miller
2014-08-25 19:33   ` Sergei Shtylyov
2014-08-24 18:44 ` [PATCH net-next v3 09/12] net: dsa: add Broadcom tag RX/TX handler Florian Fainelli
2014-08-24 22:51   ` Alexander Duyck
2014-08-25  2:37     ` Florian Fainelli
2014-08-25 14:51       ` Alexander Duyck
2014-08-24 18:44 ` [PATCH net-next v3 10/12] net: dsa: add Broadcom SF2 switch driver Florian Fainelli
2014-08-24 18:44 ` [PATCH net-next v3 11/12] Documentation: devicetree: update dsa binding with optional properties Florian Fainelli
2014-08-24 18:44 ` [PATCH net-next v3 12/12] Documentation: devicetree: add Broadcom Starfighter 2 binding Florian Fainelli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox
  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):
  git send-email \
    --in-reply-to=1408905869-10471-9-git-send-email-f.fainelli@gmail.com \
    --to=f.fainelli@gmail.com \
    --cc=alexander.h.duyck@intel.com \
    --cc=davem@davemlof.net \
    --cc=jhs@mojatatu.com \
    --cc=linville@tuxdriver.com \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY
  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
  Be sure your reply has a Subject: header at the top and a blank line
  before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).