Merge branch 'PTP-support-for-DSA-and-mv88e6xxx-driver'

Andrew Lunn says:

====================
PTP support for DSA and mv88e6xxx driver.

This patchset adds support for using the PTP hardware in switches
supported by the mv88e6xxx driver. The code was produces in
collaboration with Brandon Streiff doing the initial implementation,
and then Richard Cochran and Andrew Lunn making further changes and
cleanups.

The code is sufficient to use ptp4l on a single DSA interface, either
as a master or a slave. Due to the use of an MDIO bus to access the
switch, reading hardware timestamps is slower than what ptp4l
expects. Thus it is necessary to use the option
--tx_timestamp_timeout=32. Heavy use of ethtool -S, or bridge fdb show
can also upset ptp4l. Patches to address this will follow.

Further work is requires to support bridges using Boundary Clock or
Transparent Clock mode.

Since the RFC, an overflow bug has been fixed. Brandon Streiff
has also Acked-by: the updates to his initial patchset.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 95 insertions, 0 deletions

diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 6a9d0f50fbee..e63c554e0623 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -23,6 +23,7 @@
 #include <linux/netdevice.h>
 #include <linux/sysfs.h>
 #include <linux/phy_fixed.h>
+#include <linux/ptp_classify.h>
 #include <linux/gpio/consumer.h>
 #include <linux/etherdevice.h>
 
@@ -122,6 +123,38 @@ struct net_device *dsa_dev_to_net_device(struct device *dev)
 }
 EXPORT_SYMBOL_GPL(dsa_dev_to_net_device);
 
+/* Determine if we should defer delivery of skb until we have a rx timestamp.
+ *
+ * Called from dsa_switch_rcv. For now, this will only work if tagging is
+ * enabled on the switch. Normally the MAC driver would retrieve the hardware
+ * timestamp when it reads the packet out of the hardware. However in a DSA
+ * switch, the DSA driver owning the interface to which the packet is
+ * delivered is never notified unless we do so here.
+ */
+static bool dsa_skb_defer_rx_timestamp(struct dsa_slave_priv *p,
+                                       struct sk_buff *skb)
+{
+        struct dsa_switch *ds = p->dp->ds;
+        unsigned int type;
+
+        if (skb_headroom(skb) < ETH_HLEN)
+                return false;
+
+        __skb_push(skb, ETH_HLEN);
+
+        type = ptp_classify_raw(skb);
+
+        __skb_pull(skb, ETH_HLEN);
+
+        if (type == PTP_CLASS_NONE)
+                return false;
+
+        if (likely(ds->ops->port_rxtstamp))
+                return ds->ops->port_rxtstamp(ds, p->dp->index, skb, type);
+
+        return false;
+}
+
 static int dsa_switch_rcv(struct sk_buff *skb, struct net_device *dev,
                           struct packet_type *pt, struct net_device *unused)
 {
@@ -157,6 +190,9 @@ static int dsa_switch_rcv(struct sk_buff *skb, struct net_device *dev,
         s->rx_bytes += skb->len;
         u64_stats_update_end(&s->syncp);
 
+        if (dsa_skb_defer_rx_timestamp(p, skb))
+                return 0;
+
         netif_receive_skb(skb);
 
         return 0;
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index f52307296de4..3376dad6dcfd 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -21,6 +21,7 @@
 #include <net/tc_act/tc_mirred.h>
 #include <linux/if_bridge.h>
 #include <linux/netpoll.h>
+#include <linux/ptp_classify.h>
 
 #include "dsa_priv.h"
 
@@ -255,6 +256,22 @@ dsa_slave_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb,
 
 static int dsa_slave_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
+        struct dsa_slave_priv *p = netdev_priv(dev);
+        struct dsa_switch *ds = p->dp->ds;
+        int port = p->dp->index;
+
+        /* Pass through to switch driver if it supports timestamping */
+        switch (cmd) {
+        case SIOCGHWTSTAMP:
+                if (ds->ops->port_hwtstamp_get)
+                        return ds->ops->port_hwtstamp_get(ds, port, ifr);
+                break;
+        case SIOCSHWTSTAMP:
+                if (ds->ops->port_hwtstamp_set)
+                        return ds->ops->port_hwtstamp_set(ds, port, ifr);
+                break;
+        }
+
         if (!dev->phydev)
                 return -ENODEV;
 
@@ -385,6 +402,30 @@ static inline netdev_tx_t dsa_slave_netpoll_send_skb(struct net_device *dev,
         return NETDEV_TX_OK;
 }
 
+static void dsa_skb_tx_timestamp(struct dsa_slave_priv *p,
+                                 struct sk_buff *skb)
+{
+        struct dsa_switch *ds = p->dp->ds;
+        struct sk_buff *clone;
+        unsigned int type;
+
+        type = ptp_classify_raw(skb);
+        if (type == PTP_CLASS_NONE)
+                return;
+
+        if (!ds->ops->port_txtstamp)
+                return;
+
+        clone = skb_clone_sk(skb);
+        if (!clone)
+                return;
+
+        if (ds->ops->port_txtstamp(ds, p->dp->index, clone, type))
+                return;
+
+        kfree_skb(clone);
+}
+
 static netdev_tx_t dsa_slave_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct dsa_slave_priv *p = netdev_priv(dev);
@@ -397,6 +438,11 @@ static netdev_tx_t dsa_slave_xmit(struct sk_buff *skb, struct net_device *dev)
         s->tx_bytes += skb->len;
         u64_stats_update_end(&s->syncp);
 
+        /* Identify PTP protocol packets, clone them, and pass them to the
+         * switch driver
+         */
+        dsa_skb_tx_timestamp(p, skb);
+
         /* Transmit function may have to reallocate the original SKB,
          * in which case it must have freed it. Only free it here on error.
          */
@@ -918,6 +964,18 @@ static int dsa_slave_set_rxnfc(struct net_device *dev,
         return ds->ops->set_rxnfc(ds, dp->index, nfc);
 }
 
+static int dsa_slave_get_ts_info(struct net_device *dev,
+                                 struct ethtool_ts_info *ts)
+{
+        struct dsa_slave_priv *p = netdev_priv(dev);
+        struct dsa_switch *ds = p->dp->ds;
+
+        if (!ds->ops->get_ts_info)
+                return -EOPNOTSUPP;
+
+        return ds->ops->get_ts_info(ds, p->dp->index, ts);
+}
+
 static const struct ethtool_ops dsa_slave_ethtool_ops = {
         .get_drvinfo            = dsa_slave_get_drvinfo,
         .get_regs_len           = dsa_slave_get_regs_len,
@@ -938,6 +996,7 @@ static const struct ethtool_ops dsa_slave_ethtool_ops = {
         .set_link_ksettings     = phy_ethtool_set_link_ksettings,
         .get_rxnfc              = dsa_slave_get_rxnfc,
         .set_rxnfc              = dsa_slave_set_rxnfc,
+        .get_ts_info            = dsa_slave_get_ts_info,
 };
 
 /* legacy way, bypassing the bridge *****************************************/