net: dsa: support tag protocol setup

Supported tag protocol setup.

Signed-off-by: Yangbo Lu <[email protected]>

Author: yangbolu1991

include/zephyr/net/dsa_core.h

@@ -137,6 +137,8 @@ struct dsa_port_config {
 	const struct device *phy_dev;
 	/** PHY mode */
 	const char *phy_mode;
+	/** Tag protocol */
+	const int tag_proto;
 	/** Ethernet device connected to the port */
 	const struct device *ethernet_connection;
 	/** Instance specific config */

subsys/net/l2/ethernet/dsa/dsa_port.c

@@ -10,6 +10,7 @@ LOG_MODULE_REGISTER(net_dsa_port, CONFIG_NET_DSA_LOG_LEVEL);
 #include <zephyr/net/ethernet.h>
 #include <zephyr/net/phy.h>
 #include <zephyr/net/dsa_core.h>
+#include "dsa_tag.h"
 
 #if defined(CONFIG_NET_INTERFACE_NAME_LEN)
 #define INTERFACE_NAME_LEN CONFIG_NET_INTERFACE_NAME_LEN
@@ -28,19 +29,18 @@ int dsa_port_initialize(const struct device *dev)
 
 	dsa_switch_ctx->init_ports++;
 
-	/* Find conduit port */
+	/* Find the connection of conduit port and cpu port */
 	if (dsa_switch_ctx->iface_conduit == NULL && cfg->ethernet_connection != NULL) {
 		dsa_switch_ctx->iface_conduit = net_if_lookup_by_dev(cfg->ethernet_connection);
 		if (dsa_switch_ctx->iface_conduit == NULL) {
 			LOG_ERR("DSA: Conduit iface NOT found!");
 		}
 
+		/* Set up tag protocol on the cpu port */
 		eth_ctx->dsa_port = DSA_CPU_PORT;
+		dsa_tag_setup(dev);
 
-		/*
-		 * Provide pointer to DSA switch context to conduit's eth interface
-		 * struct ethernet_context
-		 */
+		/* Provide DSA information to the conduit port */
 		eth_ctx_conduit = net_if_l2_data(dsa_switch_ctx->iface_conduit);
 		eth_ctx_conduit->dsa_switch_ctx = dsa_switch_ctx;
 		eth_ctx_conduit->dsa_port = DSA_CONDUIT_PORT;

subsys/net/l2/ethernet/dsa/dsa_tag.c

@@ -4,8 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(net_dsa_tag, CONFIG_NET_DSA_LOG_LEVEL);
+
 #include <zephyr/net/ethernet.h>
 #include <zephyr/net/dsa_core.h>
+#include "dsa_tag.h"
 
 struct net_if *dsa_tag_recv(struct net_if *iface, struct net_pkt *pkt)
 {
@@ -36,3 +40,24 @@ struct net_pkt *dsa_tag_xmit(struct net_if *iface, struct net_pkt *pkt)
 
 	return dsa_switch_ctx->dapi->xmit(iface, pkt);
 }
+
+void dsa_tag_setup(const struct device *dev_cpu)
+{
+	const struct dsa_port_config *cfg = dev_cpu->config;
+	struct dsa_switch_context *dsa_switch_ctx = dev_cpu->data;
+
+	switch (cfg->tag_proto) {
+#ifdef CONFIG_DSA_TAG_PROTOCOL_NETC
+	case DSA_TAG_PROTO_NETC:
+		dsa_switch_ctx->dapi->recv = dsa_tag_netc_recv;
+		dsa_switch_ctx->dapi->xmit = dsa_tag_netc_xmit;
+		break;
+#endif
+	case DSA_TAG_PROTO_NOTAG:
+		dsa_switch_ctx->dapi->recv = NULL;
+		dsa_switch_ctx->dapi->xmit = NULL;
+		break;
+	default:
+		LOG_ERR("DSA tag protocol %d not supported", cfg->tag_proto);
+	}
+}

subsys/net/l2/ethernet/dsa/dsa_tag.h

@@ -6,7 +6,13 @@
 #ifndef ZEPHYR_SUBSYS_DSA_TAG_PRIV_H_
 #define ZEPHYR_SUBSYS_DSA_TAG_PRIV_H_
 
+#include <zephyr/dt-bindings/ethernet/dsa_tag_proto.h>
+#ifdef CONFIG_DSA_TAG_PROTOCOL_NETC
+#include "dsa_tag_netc.h"
+#endif
+
 struct net_if *dsa_tag_recv(struct net_if *iface, struct net_pkt *pkt);
 struct net_pkt *dsa_tag_xmit(struct net_if *iface, struct net_pkt *pkt);
+void dsa_tag_setup(const struct device *dev_cpu);
 
 #endif