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 v4 08/13] net: dsa: allow drivers to do link adjustment
Date: Mon, 25 Aug 2014 21:49:36 -0700 [thread overview]
Message-ID: <1409028581-17399-9-git-send-email-f.fainelli@gmail.com> (raw)
In-Reply-To: <1409028581-17399-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 1035f6452d79..2d3835924dd2 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
@@ -182,6 +183,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 241c2a1684cb..398d0663d3dd 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -333,6 +333,7 @@ static const struct dsa_device_ops notag_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) {
@@ -350,6 +351,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
next prev parent reply other threads:[~2014-08-26 4:50 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-26 4:49 [PATCH net-next v4 00/13] dsa: Broadcom Starfighter 2 switch support Florian Fainelli
2014-08-26 4:49 ` [PATCH net-next v4 01/13] net: dsa: reduce number of protocol hooks Florian Fainelli
2014-08-27 15:25 ` Alexander Duyck
2014-08-27 23:24 ` David Miller
2014-08-27 23:43 ` Florian Fainelli
2014-08-28 1:49 ` Alexander Duyck
2014-08-26 4:49 ` [PATCH net-next v4 02/13] net: phy: add generic UniMAC MDIO bus driver Florian Fainelli
2014-08-26 4:49 ` [PATCH net-next v4 03/13] net: phy: provide stub for fixed_phy_set_link_update Florian Fainelli
2014-08-26 4:49 ` [PATCH net-next v4 04/13] net: dsa: provide a switch device device tree node pointer Florian Fainelli
2014-08-26 4:49 ` [PATCH net-next v4 05/13] net: dsa: retain a per-port device_node pointer Florian Fainelli
2014-08-26 4:49 ` [PATCH net-next v4 06/13] net: dsa: allow for more complex PHY setups Florian Fainelli
2014-08-26 4:49 ` [PATCH net-next v4 07/13] net: dsa: allow switches to work without tagging Florian Fainelli
2014-08-26 4:49 ` Florian Fainelli [this message]
2014-08-26 4:49 ` [PATCH net-next v4 09/13] net: dsa: allow updating fixed PHY link information Florian Fainelli
2014-08-26 4:49 ` [PATCH net-next v4 10/13] net: dsa: add Broadcom tag RX/TX handler Florian Fainelli
2014-08-26 4:49 ` [PATCH net-next v4 11/13] net: dsa: add Broadcom SF2 switch driver Florian Fainelli
2014-08-26 4:49 ` [PATCH net-next v4 12/13] Documentation: devicetree: update dsa binding with optional properties Florian Fainelli
2014-08-26 22:40 ` Sergei Shtylyov
2014-08-26 4:49 ` [PATCH net-next v4 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=1409028581-17399-9-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).