netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Florian Fainelli <f.fainelli@gmail.com>
To: netdev@vger.kernel.org
Cc: Florian Fainelli <f.fainelli@gmail.com>,
	davem@davemloft.net, linville@tuxdriver.com, jhs@mojatatu.com,
	alexander.duyck@gmail.com
Subject: [PATCH net-next v5 09/13] net: dsa: allow updating fixed PHY link information
Date: Wed, 27 Aug 2014 17:04:54 -0700	[thread overview]
Message-ID: <1409184298-1793-10-git-send-email-f.fainelli@gmail.com> (raw)
In-Reply-To: <1409184298-1793-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>
---
Changes in v4:
- changed phy_is_fixed from 'unsigned int' to 'bool'

 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 2d3835924dd2..2c9563f0b2f4 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
@@ -187,6 +188,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 398d0663d3dd..18ff53836fe3 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -358,6 +358,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)
@@ -365,6 +377,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;
+	bool phy_is_fixed = false;
 	int ret;
 
 	port_dn = cd->port_dn[p->port];
@@ -380,6 +393,7 @@ static void dsa_slave_phy_setup(struct dsa_slave_priv *p,
 			pr_err("failed to register fixed PHY\n");
 			return;
 		}
+		phy_is_fixed = true;
 		phy_dn = port_dn;
 	}
 
@@ -388,6 +402,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

  parent reply	other threads:[~2014-08-28  0:06 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-28  0:04 [PATCH net-next v5 00/13] dsa: Broadcom Starfighter 2 switch support Florian Fainelli
2014-08-28  0:04 ` [PATCH net-next v5 01/13] net: dsa: reduce number of protocol hooks Florian Fainelli
2014-08-28  0:04 ` [PATCH net-next v5 02/13] net: phy: add generic UniMAC MDIO bus driver Florian Fainelli
2014-08-28  0:04 ` [PATCH net-next v5 03/13] net: phy: provide stub for fixed_phy_set_link_update Florian Fainelli
2014-08-28  0:04 ` [PATCH net-next v5 04/13] net: dsa: provide a switch device device tree node pointer Florian Fainelli
2014-08-28  0:04 ` [PATCH net-next v5 05/13] net: dsa: retain a per-port device_node pointer Florian Fainelli
2014-08-28  0:04 ` [PATCH net-next v5 06/13] net: dsa: allow for more complex PHY setups Florian Fainelli
2014-08-28  0:04 ` [PATCH net-next v5 07/13] net: dsa: allow switches to work without tagging Florian Fainelli
2014-08-28  0:04 ` [PATCH net-next v5 08/13] net: dsa: allow drivers to do link adjustment Florian Fainelli
2014-08-28  0:04 ` Florian Fainelli [this message]
2014-08-28  0:04 ` [PATCH net-next v5 10/13] net: dsa: add Broadcom tag RX/TX handler Florian Fainelli
2014-08-28  0:04 ` [PATCH net-next v5 11/13] net: dsa: add Broadcom SF2 switch driver Florian Fainelli
2014-09-09 19:37   ` Alexander Duyck
2014-08-28  0:04 ` [PATCH net-next v5 12/13] Documentation: devicetree: update dsa binding with optional properties Florian Fainelli
2014-08-28  0:04 ` [PATCH net-next v5 13/13] 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=1409184298-1793-10-git-send-email-f.fainelli@gmail.com \
    --to=f.fainelli@gmail.com \
    --cc=alexander.duyck@gmail.com \
    --cc=davem@davemloft.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).