15 files changed, 181 insertions, 49 deletions

diff --git a/net/dsa/Kconfig b/net/dsa/Kconfig
index 48c41918fb35..91e52973ee13 100644
--- a/net/dsa/Kconfig
+++ b/net/dsa/Kconfig
@@ -44,6 +44,10 @@ config NET_DSA_TAG_GSWIP
 config NET_DSA_TAG_KSZ
         bool
 
+config NET_DSA_TAG_KSZ9477
+        bool
+        select NET_DSA_TAG_KSZ
+
 config NET_DSA_TAG_LAN9303
         bool
 
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index a69c1790bbfc..aee909bcddc4 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -55,8 +55,8 @@ const struct dsa_device_ops *dsa_device_ops[DSA_TAG_LAST] = {
 #ifdef CONFIG_NET_DSA_TAG_GSWIP
         [DSA_TAG_PROTO_GSWIP] = &gswip_netdev_ops,
 #endif
-#ifdef CONFIG_NET_DSA_TAG_KSZ
-        [DSA_TAG_PROTO_KSZ] = &ksz_netdev_ops,
+#ifdef CONFIG_NET_DSA_TAG_KSZ9477
+        [DSA_TAG_PROTO_KSZ9477] = &ksz9477_netdev_ops,
 #endif
 #ifdef CONFIG_NET_DSA_TAG_LAN9303
         [DSA_TAG_PROTO_LAN9303] = &lan9303_netdev_ops,
@@ -91,8 +91,8 @@ const char *dsa_tag_protocol_to_str(const struct dsa_device_ops *ops)
 #ifdef CONFIG_NET_DSA_TAG_GSWIP
                 [DSA_TAG_PROTO_GSWIP] = "gswip",
 #endif
-#ifdef CONFIG_NET_DSA_TAG_KSZ
-                [DSA_TAG_PROTO_KSZ] = "ksz",
+#ifdef CONFIG_NET_DSA_TAG_KSZ9477
+                [DSA_TAG_PROTO_KSZ9477] = "ksz9477",
 #endif
 #ifdef CONFIG_NET_DSA_TAG_LAN9303
                 [DSA_TAG_PROTO_LAN9303] = "lan9303",
diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h
index 9e4fd04ab53c..026a05774bf7 100644
--- a/net/dsa/dsa_priv.h
+++ b/net/dsa/dsa_priv.h
@@ -210,7 +210,7 @@ extern const struct dsa_device_ops edsa_netdev_ops;
 extern const struct dsa_device_ops gswip_netdev_ops;
 
 /* tag_ksz.c */
-extern const struct dsa_device_ops ksz_netdev_ops;
+extern const struct dsa_device_ops ksz9477_netdev_ops;
 
 /* tag_lan9303.c */
 extern const struct dsa_device_ops lan9303_netdev_ops;
diff --git a/net/dsa/master.c b/net/dsa/master.c
index 5e8c9bef78bd..71bb15f491c8 100644
--- a/net/dsa/master.c
+++ b/net/dsa/master.c
@@ -179,10 +179,38 @@ static const struct attribute_group dsa_group = {
         .attrs  = dsa_slave_attrs,
 };
 
+static void dsa_master_set_mtu(struct net_device *dev, struct dsa_port *cpu_dp)
+{
+        unsigned int mtu = ETH_DATA_LEN + cpu_dp->tag_ops->overhead;
+        int err;
+
+        rtnl_lock();
+        if (mtu <= dev->max_mtu) {
+                err = dev_set_mtu(dev, mtu);
+                if (err)
+                        netdev_dbg(dev, "Unable to set MTU to include for DSA overheads\n");
+        }
+        rtnl_unlock();
+}
+
+static void dsa_master_reset_mtu(struct net_device *dev)
+{
+        int err;
+
+        rtnl_lock();
+        err = dev_set_mtu(dev, ETH_DATA_LEN);
+        if (err)
+                netdev_dbg(dev,
+                           "Unable to reset MTU to exclude DSA overheads\n");
+        rtnl_unlock();
+}
+
 int dsa_master_setup(struct net_device *dev, struct dsa_port *cpu_dp)
 {
         int ret;
 
+        dsa_master_set_mtu(dev,  cpu_dp);
+
         /* If we use a tagging format that doesn't have an ethertype
          * field, make sure that all packets from this point on get
          * sent to the tag format's receive function.
@@ -206,6 +234,7 @@ void dsa_master_teardown(struct net_device *dev)
 {
         sysfs_remove_group(&dev->dev.kobj, &dsa_group);
         dsa_master_ethtool_teardown(dev);
+        dsa_master_reset_mtu(dev);
 
         dev->dsa_ptr = NULL;
 
diff --git a/net/dsa/port.c b/net/dsa/port.c
index ed0595459df1..2d7e01b23572 100644
--- a/net/dsa/port.c
+++ b/net/dsa/port.c
@@ -252,9 +252,6 @@ int dsa_port_vlan_add(struct dsa_port *dp,
                 .vlan = vlan,
         };
 
-        if (netif_is_bridge_master(vlan->obj.orig_dev))
-                return -EOPNOTSUPP;
-
         if (br_vlan_enabled(dp->bridge_dev))
                 return dsa_port_notify(dp, DSA_NOTIFIER_VLAN_ADD, &info);
 
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index aec78f5aca72..a3fcc1d01615 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -1050,8 +1050,6 @@ static const struct net_device_ops dsa_slave_netdev_ops = {
 static const struct switchdev_ops dsa_slave_switchdev_ops = {
         .switchdev_port_attr_get        = dsa_slave_port_attr_get,
         .switchdev_port_attr_set        = dsa_slave_port_attr_set,
-        .switchdev_port_obj_add         = dsa_slave_port_obj_add,
-        .switchdev_port_obj_del         = dsa_slave_port_obj_del,
 };
 
 static struct device_type dsa_type = {
@@ -1529,6 +1527,44 @@ err_fdb_work_init:
         return NOTIFY_BAD;
 }
 
+static int
+dsa_slave_switchdev_port_obj_event(unsigned long event,
+                        struct net_device *netdev,
+                        struct switchdev_notifier_port_obj_info *port_obj_info)
+{
+        int err = -EOPNOTSUPP;
+
+        switch (event) {
+        case SWITCHDEV_PORT_OBJ_ADD:
+                err = dsa_slave_port_obj_add(netdev, port_obj_info->obj,
+                                             port_obj_info->trans);
+                break;
+        case SWITCHDEV_PORT_OBJ_DEL:
+                err = dsa_slave_port_obj_del(netdev, port_obj_info->obj);
+                break;
+        }
+
+        port_obj_info->handled = true;
+        return notifier_from_errno(err);
+}
+
+static int dsa_slave_switchdev_blocking_event(struct notifier_block *unused,
+                                              unsigned long event, void *ptr)
+{
+        struct net_device *dev = switchdev_notifier_info_to_dev(ptr);
+
+        if (!dsa_slave_dev_check(dev))
+                return NOTIFY_DONE;
+
+        switch (event) {
+        case SWITCHDEV_PORT_OBJ_ADD: /* fall through */
+        case SWITCHDEV_PORT_OBJ_DEL:
+                return dsa_slave_switchdev_port_obj_event(event, dev, ptr);
+        }
+
+        return NOTIFY_DONE;
+}
+
 static struct notifier_block dsa_slave_nb __read_mostly = {
         .notifier_call  = dsa_slave_netdevice_event,
 };
@@ -1537,8 +1573,13 @@ static struct notifier_block dsa_slave_switchdev_notifier = {
         .notifier_call = dsa_slave_switchdev_event,
 };
 
+static struct notifier_block dsa_slave_switchdev_blocking_notifier = {
+        .notifier_call = dsa_slave_switchdev_blocking_event,
+};
+
 int dsa_slave_register_notifier(void)
 {
+        struct notifier_block *nb;
         int err;
 
         err = register_netdevice_notifier(&dsa_slave_nb);
@@ -1549,8 +1590,15 @@ int dsa_slave_register_notifier(void)
         if (err)
                 goto err_switchdev_nb;
 
+        nb = &dsa_slave_switchdev_blocking_notifier;
+        err = register_switchdev_blocking_notifier(nb);
+        if (err)
+                goto err_switchdev_blocking_nb;
+
         return 0;
 
+err_switchdev_blocking_nb:
+        unregister_switchdev_notifier(&dsa_slave_switchdev_notifier);
 err_switchdev_nb:
         unregister_netdevice_notifier(&dsa_slave_nb);
         return err;
@@ -1558,8 +1606,14 @@ err_switchdev_nb:
 
 void dsa_slave_unregister_notifier(void)
 {
+        struct notifier_block *nb;
         int err;
 
+        nb = &dsa_slave_switchdev_blocking_notifier;
+        err = unregister_switchdev_blocking_notifier(nb);
+        if (err)
+                pr_err("DSA: failed to unregister switchdev blocking notifier (%d)\n", err);
+
         err = unregister_switchdev_notifier(&dsa_slave_switchdev_notifier);
         if (err)
                 pr_err("DSA: failed to unregister switchdev notifier (%d)\n", err);
diff --git a/net/dsa/tag_brcm.c b/net/dsa/tag_brcm.c
index 2b06bb91318b..4aa1d368a5ae 100644
--- a/net/dsa/tag_brcm.c
+++ b/net/dsa/tag_brcm.c
@@ -174,6 +174,7 @@ static struct sk_buff *brcm_tag_rcv(struct sk_buff *skb, struct net_device *dev,
 const struct dsa_device_ops brcm_netdev_ops = {
         .xmit   = brcm_tag_xmit,
         .rcv    = brcm_tag_rcv,
+        .overhead = BRCM_TAG_LEN,
 };
 #endif
 
@@ -196,5 +197,6 @@ static struct sk_buff *brcm_tag_rcv_prepend(struct sk_buff *skb,
 const struct dsa_device_ops brcm_prepend_netdev_ops = {
         .xmit   = brcm_tag_xmit_prepend,
         .rcv    = brcm_tag_rcv_prepend,
+        .overhead = BRCM_TAG_LEN,
 };
 #endif
diff --git a/net/dsa/tag_dsa.c b/net/dsa/tag_dsa.c
index cd13cfc542ce..8b2f92e3f3a2 100644
--- a/net/dsa/tag_dsa.c
+++ b/net/dsa/tag_dsa.c
@@ -149,4 +149,5 @@ static struct sk_buff *dsa_rcv(struct sk_buff *skb, struct net_device *dev,
 const struct dsa_device_ops dsa_netdev_ops = {
         .xmit   = dsa_xmit,
         .rcv    = dsa_rcv,
+        .overhead = DSA_HLEN,
 };
diff --git a/net/dsa/tag_edsa.c b/net/dsa/tag_edsa.c
index 4083326b806e..f5b87ee5c94e 100644
--- a/net/dsa/tag_edsa.c
+++ b/net/dsa/tag_edsa.c
@@ -168,4 +168,5 @@ static struct sk_buff *edsa_rcv(struct sk_buff *skb, struct net_device *dev,
 const struct dsa_device_ops edsa_netdev_ops = {
         .xmit   = edsa_xmit,
         .rcv    = edsa_rcv,
+        .overhead = EDSA_HLEN,
 };
diff --git a/net/dsa/tag_gswip.c b/net/dsa/tag_gswip.c
index 49e9b73f1be3..cb6f82ffe5eb 100644
--- a/net/dsa/tag_gswip.c
+++ b/net/dsa/tag_gswip.c
@@ -106,4 +106,5 @@ static struct sk_buff *gswip_tag_rcv(struct sk_buff *skb,
 const struct dsa_device_ops gswip_netdev_ops = {
         .xmit = gswip_tag_xmit,
         .rcv = gswip_tag_rcv,
+        .overhead = GSWIP_RX_HEADER_LEN,
 };
diff --git a/net/dsa/tag_ksz.c b/net/dsa/tag_ksz.c
index 0f62effad88f..da71b9e2af52 100644
--- a/net/dsa/tag_ksz.c
+++ b/net/dsa/tag_ksz.c
@@ -14,34 +14,18 @@
 #include <net/dsa.h>
 #include "dsa_priv.h"
 
-/* For Ingress (Host -> KSZ), 2 bytes are added before FCS.
- * ---------------------------------------------------------------------------
- * DA(6bytes)|SA(6bytes)|....|Data(nbytes)|tag0(1byte)|tag1(1byte)|FCS(4bytes)
- * ---------------------------------------------------------------------------
- * tag0 : Prioritization (not used now)
- * tag1 : each bit represents port (eg, 0x01=port1, 0x02=port2, 0x10=port5)
- *
- * For Egress (KSZ -> Host), 1 byte is added before FCS.
- * ---------------------------------------------------------------------------
- * DA(6bytes)|SA(6bytes)|....|Data(nbytes)|tag0(1byte)|FCS(4bytes)
- * ---------------------------------------------------------------------------
- * tag0 : zero-based value represents port
- *        (eg, 0x00=port1, 0x02=port3, 0x06=port7)
- */
-
-#define KSZ_INGRESS_TAG_LEN     2
-#define KSZ_EGRESS_TAG_LEN      1
+/* Typically only one byte is used for tail tag. */
+#define KSZ_EGRESS_TAG_LEN              1
 
-static struct sk_buff *ksz_xmit(struct sk_buff *skb, struct net_device *dev)
+static struct sk_buff *ksz_common_xmit(struct sk_buff *skb,
+                                       struct net_device *dev, int len)
 {
-        struct dsa_port *dp = dsa_slave_to_port(dev);
         struct sk_buff *nskb;
         int padlen;
-        u8 *tag;
 
         padlen = (skb->len >= ETH_ZLEN) ? 0 : ETH_ZLEN - skb->len;
 
-        if (skb_tailroom(skb) >= padlen + KSZ_INGRESS_TAG_LEN) {
+        if (skb_tailroom(skb) >= padlen + len) {
                 /* Let dsa_slave_xmit() free skb */
                 if (__skb_put_padto(skb, skb->len + padlen, false))
                         return NULL;
@@ -49,7 +33,7 @@ static struct sk_buff *ksz_xmit(struct sk_buff *skb, struct net_device *dev)
                 nskb = skb;
         } else {
                 nskb = alloc_skb(NET_IP_ALIGN + skb->len +
-                                 padlen + KSZ_INGRESS_TAG_LEN, GFP_ATOMIC);
+                                 padlen + len, GFP_ATOMIC);
                 if (!nskb)
                         return NULL;
                 skb_reserve(nskb, NET_IP_ALIGN);
@@ -70,33 +54,88 @@ static struct sk_buff *ksz_xmit(struct sk_buff *skb, struct net_device *dev)
                 consume_skb(skb);
         }
 
-        tag = skb_put(nskb, KSZ_INGRESS_TAG_LEN);
-        tag[0] = 0;
-        tag[1] = 1 << dp->index; /* destination port */
-
         return nskb;
 }
 
-static struct sk_buff *ksz_rcv(struct sk_buff *skb, struct net_device *dev,
-                               struct packet_type *pt)
+static struct sk_buff *ksz_common_rcv(struct sk_buff *skb,
+                                      struct net_device *dev,
+                                      unsigned int port, unsigned int len)
 {
-        u8 *tag;
-        int source_port;
+        skb->dev = dsa_master_find_slave(dev, 0, port);
+        if (!skb->dev)
+                return NULL;
 
-        tag = skb_tail_pointer(skb) - KSZ_EGRESS_TAG_LEN;
+        pskb_trim_rcsum(skb, skb->len - len);
 
-        source_port = tag[0] & 7;
+        return skb;
+}
 
-        skb->dev = dsa_master_find_slave(dev, 0, source_port);
-        if (!skb->dev)
+/*
+ * For Ingress (Host -> KSZ9477), 2 bytes are added before FCS.
+ * ---------------------------------------------------------------------------
+ * DA(6bytes)|SA(6bytes)|....|Data(nbytes)|tag0(1byte)|tag1(1byte)|FCS(4bytes)
+ * ---------------------------------------------------------------------------
+ * tag0 : Prioritization (not used now)
+ * tag1 : each bit represents port (eg, 0x01=port1, 0x02=port2, 0x10=port5)
+ *
+ * For Egress (KSZ9477 -> Host), 1 byte is added before FCS.
+ * ---------------------------------------------------------------------------
+ * DA(6bytes)|SA(6bytes)|....|Data(nbytes)|tag0(1byte)|FCS(4bytes)
+ * ---------------------------------------------------------------------------
+ * tag0 : zero-based value represents port
+ *        (eg, 0x00=port1, 0x02=port3, 0x06=port7)
+ */
+
+#define KSZ9477_INGRESS_TAG_LEN         2
+#define KSZ9477_PTP_TAG_LEN             4
+#define KSZ9477_PTP_TAG_INDICATION      0x80
+
+#define KSZ9477_TAIL_TAG_OVERRIDE       BIT(9)
+#define KSZ9477_TAIL_TAG_LOOKUP         BIT(10)
+
+static struct sk_buff *ksz9477_xmit(struct sk_buff *skb,
+                                    struct net_device *dev)
+{
+        struct dsa_port *dp = dsa_slave_to_port(dev);
+        struct sk_buff *nskb;
+        u16 *tag;
+        u8 *addr;
+
+        nskb = ksz_common_xmit(skb, dev, KSZ9477_INGRESS_TAG_LEN);
+        if (!nskb)
                 return NULL;
 
-        pskb_trim_rcsum(skb, skb->len - KSZ_EGRESS_TAG_LEN);
+        /* Tag encoding */
+        tag = skb_put(nskb, KSZ9477_INGRESS_TAG_LEN);
+        addr = skb_mac_header(nskb);
 
-        return skb;
+        *tag = BIT(dp->index);
+
+        if (is_link_local_ether_addr(addr))
+                *tag |= KSZ9477_TAIL_TAG_OVERRIDE;
+
+        *tag = cpu_to_be16(*tag);
+
+        return nskb;
+}
+
+static struct sk_buff *ksz9477_rcv(struct sk_buff *skb, struct net_device *dev,
+                                   struct packet_type *pt)
+{
+        /* Tag decoding */
+        u8 *tag = skb_tail_pointer(skb) - KSZ_EGRESS_TAG_LEN;
+        unsigned int port = tag[0] & 7;
+        unsigned int len = KSZ_EGRESS_TAG_LEN;
+
+        /* Extra 4-bytes PTP timestamp */
+        if (tag[0] & KSZ9477_PTP_TAG_INDICATION)
+                len += KSZ9477_PTP_TAG_LEN;
+
+        return ksz_common_rcv(skb, dev, port, len);
 }
 
-const struct dsa_device_ops ksz_netdev_ops = {
-        .xmit   = ksz_xmit,
-        .rcv    = ksz_rcv,
+const struct dsa_device_ops ksz9477_netdev_ops = {
+        .xmit   = ksz9477_xmit,
+        .rcv    = ksz9477_rcv,
+        .overhead = KSZ9477_INGRESS_TAG_LEN,
 };
diff --git a/net/dsa/tag_lan9303.c b/net/dsa/tag_lan9303.c
index 548c00254c07..f48889e46ff7 100644
--- a/net/dsa/tag_lan9303.c
+++ b/net/dsa/tag_lan9303.c
@@ -140,4 +140,5 @@ static struct sk_buff *lan9303_rcv(struct sk_buff *skb, struct net_device *dev,
 const struct dsa_device_ops lan9303_netdev_ops = {
         .xmit = lan9303_xmit,
         .rcv = lan9303_rcv,
+        .overhead = LAN9303_TAG_LEN,
 };
diff --git a/net/dsa/tag_mtk.c b/net/dsa/tag_mtk.c
index 11535bc70743..f39f4dfeda34 100644
--- a/net/dsa/tag_mtk.c
+++ b/net/dsa/tag_mtk.c
@@ -109,4 +109,5 @@ const struct dsa_device_ops mtk_netdev_ops = {
         .xmit           = mtk_tag_xmit,
         .rcv            = mtk_tag_rcv,
         .flow_dissect   = mtk_tag_flow_dissect,
+        .overhead       = MTK_HDR_LEN,
 };
diff --git a/net/dsa/tag_qca.c b/net/dsa/tag_qca.c
index 613f4ee97771..ed4f6dc26365 100644
--- a/net/dsa/tag_qca.c
+++ b/net/dsa/tag_qca.c
@@ -101,4 +101,5 @@ static struct sk_buff *qca_tag_rcv(struct sk_buff *skb, struct net_device *dev,
 const struct dsa_device_ops qca_netdev_ops = {
         .xmit   = qca_tag_xmit,
         .rcv    = qca_tag_rcv,
+        .overhead = QCA_HDR_LEN,
 };
diff --git a/net/dsa/tag_trailer.c b/net/dsa/tag_trailer.c
index 56197f0d9608..b40756ed6e57 100644
--- a/net/dsa/tag_trailer.c
+++ b/net/dsa/tag_trailer.c
@@ -84,4 +84,5 @@ static struct sk_buff *trailer_rcv(struct sk_buff *skb, struct net_device *dev,
 const struct dsa_device_ops trailer_netdev_ops = {
         .xmit   = trailer_xmit,
         .rcv    = trailer_rcv,
+        .overhead = 4,
 };