netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Florian Fainelli <f.fainelli@gmail.com>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, linville@tuxdriver.com,
	Florian Fainelli <f.fainelli@gmail.com>
Subject: [PATCH net-next v2 07/12] net: dsa: allow drivers to do link adjustment
Date: Tue,  5 Aug 2014 15:31:41 -0700	[thread overview]
Message-ID: <1407277906-19989-8-git-send-email-f.fainelli@gmail.com> (raw)
In-Reply-To: <1407277906-19989-1-git-send-email-f.fainelli@gmail.com>

Whenever libphy determines that the link status of a given PHY/port has
changed, allow to call into the switch driver link adjustment callback
so proper actions can be taken care of by the switch driver upon link
notification.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
 include/net/dsa.h | 7 +++++++
 net/dsa/slave.c   | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/include/net/dsa.h b/include/net/dsa.h
index 35141155f368..e024511dbcdb 100644
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -16,6 +16,7 @@
 #include <linux/timer.h>
 #include <linux/workqueue.h>
 #include <linux/of.h>
+#include <linux/phy.h>
 
 #define DSA_MAX_SWITCHES	4
 #define DSA_MAX_PORTS		12
@@ -179,6 +180,12 @@ struct dsa_switch_driver {
 	void	(*poll_link)(struct dsa_switch *ds);
 
 	/*
+	 * Link state adjustment (called from libphy)
+	 */
+	void	(*adjust_link)(struct dsa_switch *ds, int port,
+				struct phy_device *phydev);
+
+	/*
 	 * ethtool hardware statistics.
 	 */
 	void	(*get_strings)(struct dsa_switch *ds, int port, uint8_t *data);
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index d1dfa3d8552f..08a92db7f109 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -357,6 +357,7 @@ static const struct net_device_ops dummy_netdev_ops = {
 static void dsa_slave_adjust_link(struct net_device *dev)
 {
 	struct dsa_slave_priv *p = netdev_priv(dev);
+	struct dsa_switch *ds = p->parent;
 	unsigned int status_changed = 0;
 
 	if (p->old_link != p->phy->link) {
@@ -374,6 +375,9 @@ static void dsa_slave_adjust_link(struct net_device *dev)
 		p->old_pause = p->phy->pause;
 	}
 
+	if (ds->drv->adjust_link && status_changed)
+		ds->drv->adjust_link(ds, p->port, p->phy);
+
 	if (status_changed)
 		phy_print_status(p->phy);
 }
-- 
1.9.1

  parent reply	other threads:[~2014-08-05 22:32 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-05 22:31 [PATCH net-next v2 00/12] dsa: support for Broadcom Starfighter 2 Florian Fainelli
2014-08-05 22:31 ` [PATCH net-next v2 01/12] net: phy: add generic UniMAC MDIO bus driver Florian Fainelli
2014-08-05 22:31 ` [PATCH net-next v2 02/12] net: dsa: add Broadcom tag hook Florian Fainelli
2014-08-06 12:25   ` Sergei Shtylyov
2014-08-06 14:47   ` Alexander Duyck
2014-08-06 18:37     ` Florian Fainelli
2014-08-06 20:16       ` Alexander Duyck
2014-08-05 22:31 ` [PATCH net-next v2 03/12] net: dsa: provide a switch device device tree node pointer Florian Fainelli
2014-08-05 22:31 ` [PATCH net-next v2 04/12] net: dsa: retain a per-port device_node pointer Florian Fainelli
2014-08-05 22:31 ` [PATCH net-next v2 05/12] net: dsa: allow for more complex PHY setups Florian Fainelli
2014-08-05 22:31 ` [PATCH net-next v2 06/12] net: dsa: allow switches to work without tagging Florian Fainelli
2014-08-05 22:31 ` Florian Fainelli [this message]
2014-08-05 22:31 ` [PATCH net-next v2 08/12] net: dsa: allow updating fixed PHY link information Florian Fainelli
2014-08-05 22:31 ` [PATCH net-next v2 09/12] net: dsa: add Broadcom tag RX/TX handler Florian Fainelli
2014-08-05 22:31 ` [PATCH net-next v2 10/12] net: dsa: add Broadcom SF2 switch driver Florian Fainelli
2014-08-05 22:31 ` [PATCH net-next v2 11/12] Documentation: devicetree: update dsa binding with optional properties Florian Fainelli
2014-08-05 22:31 ` [PATCH net-next v2 12/12] Documentation: devicetree: add Broadcom Starfighter 2 binding Florian Fainelli
2014-08-05 22:38 ` [PATCH net-next v2 00/12] dsa: support for Broadcom Starfighter 2 David Miller

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=1407277906-19989-8-git-send-email-f.fainelli@gmail.com \
    --to=f.fainelli@gmail.com \
    --cc=davem@davemloft.net \
    --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).