net: dsa: add a second tagger for Ocelot switches based on tag_8021q

There are use cases for which the existing tagger, based on the NPI
(Node Processor Interface) functionality, is insufficient.

Namely:
- Frames injected through the NPI port bypass the frame analyzer, so no
  source address learning is performed, no TSN stream classification,
  etc.
- Flow control is not functional over an NPI port (PAUSE frames are
  encapsulated in the same Extraction Frame Header as all other frames)
- There can be at most one NPI port configured for an Ocelot switch. But
  in NXP LS1028A and T1040 there are two Ethernet CPU ports. The non-NPI
  port is currently either disabled, or operated as a plain user port
  (albeit an internally-facing one). Having the ability to configure the
  two CPU ports symmetrically could pave the way for e.g. creating a LAG
  between them, to increase bandwidth seamlessly for the system.

So there is a desire to have an alternative to the NPI mode. This change
keeps the default tagger for the Seville and Felix switches as "ocelot",
but it can be changed via the following device attribute:

echo ocelot-8021q > /sys/class/<dsa-master>/dsa/tagging

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index 627e90a..d1b0057 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -12859,6 +12859,7 @@ F:      drivers/net/dsa/ocelot/*
 F:     drivers/net/ethernet/mscc/
 F:     include/soc/mscc/ocelot*
 F:     net/dsa/tag_ocelot.c
+F:     net/dsa/tag_ocelot_8021q.c
 F:     tools/testing/selftests/drivers/net/ocelot/*
 
 OCXL (Open Coherent Accelerator Processor Interface OpenCAPI) DRIVER

diff --git a/drivers/net/dsa/ocelot/Kconfig b/drivers/net/dsa/ocelot/Kconfig
index c110e82..932b6b6 100644 (file)
--- a/drivers/net/dsa/ocelot/Kconfig
+++ b/drivers/net/dsa/ocelot/Kconfig
@@ -6,6 +6,7 @@ config NET_DSA_MSCC_FELIX
        depends on NET_VENDOR_FREESCALE
        depends on HAS_IOMEM
        select MSCC_OCELOT_SWITCH_LIB
+       select NET_DSA_TAG_OCELOT_8021Q
        select NET_DSA_TAG_OCELOT
        select FSL_ENETC_MDIO
        select PCS_LYNX
@@ -19,6 +20,7 @@ config NET_DSA_MSCC_SEVILLE
        depends on NET_VENDOR_MICROSEMI
        depends on HAS_IOMEM
        select MSCC_OCELOT_SWITCH_LIB
+       select NET_DSA_TAG_OCELOT_8021Q
        select NET_DSA_TAG_OCELOT
        select PCS_LYNX
        help

diff --git a/include/net/dsa.h b/include/net/dsa.h
index 7ea3918..60acb9f 100644 (file)
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -47,6 +47,7 @@ struct phylink_link_state;
 #define DSA_TAG_PROTO_RTL4_A_VALUE             17
 #define DSA_TAG_PROTO_HELLCREEK_VALUE          18
 #define DSA_TAG_PROTO_XRS700X_VALUE            19
+#define DSA_TAG_PROTO_OCELOT_8021Q_VALUE       20
 
 enum dsa_tag_protocol {
        DSA_TAG_PROTO_NONE              = DSA_TAG_PROTO_NONE_VALUE,
@@ -69,6 +70,7 @@ enum dsa_tag_protocol {
        DSA_TAG_PROTO_RTL4_A            = DSA_TAG_PROTO_RTL4_A_VALUE,
        DSA_TAG_PROTO_HELLCREEK         = DSA_TAG_PROTO_HELLCREEK_VALUE,
        DSA_TAG_PROTO_XRS700X           = DSA_TAG_PROTO_XRS700X_VALUE,
+       DSA_TAG_PROTO_OCELOT_8021Q      = DSA_TAG_PROTO_OCELOT_8021Q_VALUE,
 };
 
 struct packet_type;

diff --git a/net/dsa/Kconfig b/net/dsa/Kconfig
index 2d226a5..a45572c 100644 (file)
--- a/net/dsa/Kconfig
+++ b/net/dsa/Kconfig
@@ -105,11 +105,26 @@ config NET_DSA_TAG_RTL4_A
          the Realtek RTL8366RB.
 
 config NET_DSA_TAG_OCELOT
-       tristate "Tag driver for Ocelot family of switches"
+       tristate "Tag driver for Ocelot family of switches, using NPI port"
        select PACKING
        help
-         Say Y or M if you want to enable support for tagging frames for the
-         Ocelot switches (VSC7511, VSC7512, VSC7513, VSC7514, VSC9959).
+         Say Y or M if you want to enable NPI tagging for the Ocelot switches
+         (VSC7511, VSC7512, VSC7513, VSC7514, VSC9953, VSC9959). In this mode,
+         the frames over the Ethernet CPU port are prepended with a
+         hardware-defined injection/extraction frame header.  Flow control
+         (PAUSE frames) over the CPU port is not supported when operating in
+         this mode.
+
+config NET_DSA_TAG_OCELOT_8021Q
+       tristate "Tag driver for Ocelot family of switches, using VLAN"
+       select NET_DSA_TAG_8021Q
+       help
+         Say Y or M if you want to enable support for tagging frames with a
+         custom VLAN-based header. Frames that require timestamping, such as
+         PTP, are not delivered over Ethernet but over register-based MMIO.
+         Flow control over the CPU port is functional in this mode. When using
+         this mode, less TCAM resources (VCAP IS1, IS2, ES0) are available for
+         use with tc-flower.
 
 config NET_DSA_TAG_QCA
        tristate "Tag driver for Qualcomm Atheros QCA8K switches"

diff --git a/net/dsa/Makefile b/net/dsa/Makefile
index 92cea21..44bc799 100644 (file)
--- a/net/dsa/Makefile
+++ b/net/dsa/Makefile
@@ -15,6 +15,7 @@ obj-$(CONFIG_NET_DSA_TAG_RTL4_A) += tag_rtl4_a.o
 obj-$(CONFIG_NET_DSA_TAG_LAN9303) += tag_lan9303.o
 obj-$(CONFIG_NET_DSA_TAG_MTK) += tag_mtk.o
 obj-$(CONFIG_NET_DSA_TAG_OCELOT) += tag_ocelot.o
+obj-$(CONFIG_NET_DSA_TAG_OCELOT_8021Q) += tag_ocelot_8021q.o
 obj-$(CONFIG_NET_DSA_TAG_QCA) += tag_qca.o
 obj-$(CONFIG_NET_DSA_TAG_SJA1105) += tag_sja1105.o
 obj-$(CONFIG_NET_DSA_TAG_TRAILER) += tag_trailer.o

diff --git a/net/dsa/tag_ocelot_8021q.c b/net/dsa/tag_ocelot_8021q.c
new file mode 100644 (file)
index 0000000..8991ebf
--- /dev/null
+++ b/net/dsa/tag_ocelot_8021q.c
@@ -0,0 +1,68 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright 2020-2021 NXP Semiconductors
+ *
+ * An implementation of the software-defined tag_8021q.c tagger format, which
+ * also preserves full functionality under a vlan_filtering bridge. It does
+ * this by using the TCAM engines for:
+ * - pushing the RX VLAN as a second, outer tag, on egress towards the CPU port
+ * - redirecting towards the correct front port based on TX VLAN and popping
+ *   that on egress
+ */
+#include <linux/dsa/8021q.h>
+#include "dsa_priv.h"
+
+static struct sk_buff *ocelot_xmit(struct sk_buff *skb,
+                                  struct net_device *netdev)
+{
+       struct dsa_port *dp = dsa_slave_to_port(netdev);
+       u16 tx_vid = dsa_8021q_tx_vid(dp->ds, dp->index);
+       u16 queue_mapping = skb_get_queue_mapping(skb);
+       u8 pcp = netdev_txq_to_tc(netdev, queue_mapping);
+
+       return dsa_8021q_xmit(skb, netdev, ETH_P_8021Q,
+                             ((pcp << VLAN_PRIO_SHIFT) | tx_vid));
+}
+
+static struct sk_buff *ocelot_rcv(struct sk_buff *skb,
+                                 struct net_device *netdev,
+                                 struct packet_type *pt)
+{
+       int src_port, switch_id, qos_class;
+       u16 vid, tci;
+
+       skb_push_rcsum(skb, ETH_HLEN);
+       if (skb_vlan_tag_present(skb)) {
+               tci = skb_vlan_tag_get(skb);
+               __vlan_hwaccel_clear_tag(skb);
+       } else {
+               __skb_vlan_pop(skb, &tci);
+       }
+       skb_pull_rcsum(skb, ETH_HLEN);
+
+       vid = tci & VLAN_VID_MASK;
+       src_port = dsa_8021q_rx_source_port(vid);
+       switch_id = dsa_8021q_rx_switch_id(vid);
+       qos_class = (tci & VLAN_PRIO_MASK) >> VLAN_PRIO_SHIFT;
+
+       skb->dev = dsa_master_find_slave(netdev, switch_id, src_port);
+       if (!skb->dev)
+               return NULL;
+
+       skb->offload_fwd_mark = 1;
+       skb->priority = qos_class;
+
+       return skb;
+}
+
+static const struct dsa_device_ops ocelot_8021q_netdev_ops = {
+       .name                   = "ocelot-8021q",
+       .proto                  = DSA_TAG_PROTO_OCELOT_8021Q,
+       .xmit                   = ocelot_xmit,
+       .rcv                    = ocelot_rcv,
+       .overhead               = VLAN_HLEN,
+};
+
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_OCELOT_8021Q);
+
+module_dsa_tag_driver(ocelot_8021q_netdev_ops);