From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9CBCD43CED9 for ; Tue, 28 Jul 2026 15:49:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785253768; cv=none; b=CS87aXcmw2MUzh4wdySxM34E6QjF5m4QJn3xd+4k4j4BfapZDQCU1GS9PTxmuJGCN/cDrxzwyoWoZF3eNljDW8r9ujzPaQfVYgD2k67VfbegdhFiODWSgoLtwxqehfeji+Ql104t71NnGhNi8OWli38nB1i39Tdy0tpIZ6p2V3w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785253768; c=relaxed/simple; bh=HtxPwbJhALSR6gxEmmq3KN2FA8fvMBnYu1DhX2mxpHs=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mpRMuXdPzGcz3LFhZQoLj02M+bftP5Sas7gC4DyxhQSA24+rI/4hRzWt/hLH7U9w1ueuB9Ph90Bn5itjaOcF5w4LW/y4w3XfY3/fhdKoQO3I1rCosIr1BRCXlC2IuMOAx/zQ8RfW9OTyMsKpKL0+u9QN5fdj3ixKd/IBUGiSx4M= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=FAFgdoXs; arc=none smtp.client-ip=209.85.128.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="FAFgdoXs" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-490cf322ed0so29140115e9.1 for ; Tue, 28 Jul 2026 08:49:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785253765; x=1785858565; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to:content-type; bh=fyT8pu9DDCRukEU+gkGjHTZrhqI/Cex3ciHiNAV4A3I=; b=FAFgdoXs6SXp4HYAXIkJljyUze7dPT1p1lyyalgqOzdcnpRhFQcYIYv3lmehFbr8ud VtcnmBI8IH/5p7svL8EWTqfgDT5rTpF825XUXhtSpqosYsoKprQ9KZzCp3cLmh1u/r3h 0CXrNerINbkmq2plYk62o6zGCthMECtUDs5bUMv5RfC+mhRxP3jdFt+URa9GJ1uZq0Sc UC5JWl3iufbIS+M0q9MlmbIBAi8XpExMbDTgtaCc26tQaP3fJJbPOIrRWln7LRAnVwIq mW0W/Lpv77SmulNt8A5/181mq+CXkmrdWLLLsHrS9HgjRvAAvsdMD6bkJnya8udvX9g4 6bHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785253765; x=1785858565; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to:content-type; bh=fyT8pu9DDCRukEU+gkGjHTZrhqI/Cex3ciHiNAV4A3I=; b=VnfmbboS23Zw6b7DaYya1SKUIqwHOWiI1OEXwnb1Qw+ZQhMfwx6YxavffRlRWz+H7d cxxHOS8usdaXbSiPr4v1axKLZg8ZiZS3quLAXTa3YULyCEE9aF1jzs005ir4aEJ9ylgp A2HkWPcjCubgzAwbVkmLGDuCVONazo3CbIkxMNzbAGmbOoV3tx2Q++H5yOz486jc/kK8 vGRPxT4+RTqp3NncR0B9ICNsKtka6EaQoRSbQ59M3nUfwE75Oh2QVEOWktrWMIk5s0kE Ex5L2iPHrS29MuvXbiX40noF9tdZ/SPAbWH4SRhPFI148Sr3cTJaZkIRK/Zk56vT0YE0 yUJw== X-Forwarded-Encrypted: i=1; AHgh+RqmpqjZoGneoi3mGxlmOnSHz8f5cnIRvVXKfpU9bUm446TSZBQ9x86leyvTAtmuvmrXeWbpYDQPjQM1@vger.kernel.org X-Gm-Message-State: AOJu0YwPGaIm60vwLfTGPWrnjejUQWtkxqZI41rioShunTIheoIRrJCx dN77oaZdYiO4q20CouONBwKtI3bae31QOu8LATYjRbB/PiToOCxTp44q X-Gm-Gg: AR+sD13n4uH4eagonpNbTkq0vqvNhF3NklFjpfoooo5p9R//98eyaYyqT31rJWukRAU nYjzg1T9tNIUi5y6GA9WRHoMRPzXoFsi3WhVoT/MnOk73lZq15NzXhFwL1/gL7HMrtspGehm4v7 +9JwWsk9OYfTSUMRn5G/jUSwJwTbCPuLHMTCr6nZq0vYe7KrcLtvxPSbzXQohmZf5kUaVyRHp9Y 2n2aNnDV1AVMtn5Jz/X/qCR4VuL+dVj8Cn+PTFn0j5mmw9f7L1cO4SllXlGrz7KeMDECGGwZl3+ LK+X1KFv+wsdJ2yh8hCTulzVjpdmAGHy7WvzK/NPGDOVkvMsmlvgit5U9b88ICVaQOsiL675dCa 9IeuA+xiYtxN4HcGcV+BAfX9jmiRLTmR5wA8pxquT9V0GEEDeOlOyvU8qrRWmSEQ9dL4VYZ8FQY 3t/I9wFPezkaWAt2RnRIW6D1uNnR6c X-Received: by 2002:a05:600c:4703:b0:493:fa66:4861 with SMTP id 5b1f17b1804b1-496c6565dfamr38085465e9.25.1785253764634; Tue, 28 Jul 2026 08:49:24 -0700 (PDT) Received: from Ansuel-XPS24.localdomain ([37.161.95.51]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-496c4632263sm94912035e9.15.2026.07.28.08.49.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jul 2026 08:49:24 -0700 (PDT) From: Christian Marangi To: Christian Marangi , Lee Jones , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Vladimir Oltean , Matthias Brugger , AngeloGioacchino Del Regno , "Chester A. Unal" , Daniel Golle , Heiner Kallweit , Russell King , Simon Horman , linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, netdev@vger.kernel.org, mfd@lists.linux.dev, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next v19 06/10] net: dsa: tag_mtk: add Airoha variant usage of this TAG Date: Tue, 28 Jul 2026 17:48:33 +0200 Message-ID: <20260728154846.1828945-7-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260728154846.1828945-1-ansuelsmth@gmail.com> References: <20260728154846.1828945-1-ansuelsmth@gmail.com> Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Add variant of the MTK TAG for Airoha Switch and comments about difference between Airoha AN8855 and Mediatek tag bitmap. Airoha AN8855 doesn't support controlling SA learning and Leaky VLAN from tag. Although these bits are not used (and even not defined for Leaky VLAN), it's worth to add comments for these difference to prevent any kind of regression in the future if ever these bits will be used. Rework the makefile, config and tag driver to better report to external tool (like libpcap) the usage of this variant with a dedicated "Airoha" name. Signed-off-by: Christian Marangi --- include/net/dsa.h | 2 ++ net/dsa/Kconfig | 11 +++++++++++ net/dsa/Makefile | 2 +- net/dsa/tag_mtk.c | 36 +++++++++++++++++++++++++++++++++--- 4 files changed, 47 insertions(+), 4 deletions(-) diff --git a/include/net/dsa.h b/include/net/dsa.h index 8c16ef23cc10..9957443e2907 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -59,6 +59,7 @@ struct tc_action; #define DSA_TAG_PROTO_MXL_GSW1XX_VALUE 31 #define DSA_TAG_PROTO_MXL862_VALUE 32 #define DSA_TAG_PROTO_NETC_VALUE 33 +#define DSA_TAG_PROTO_AIROHA_VALUE 34 enum dsa_tag_protocol { DSA_TAG_PROTO_NONE = DSA_TAG_PROTO_NONE_VALUE, @@ -73,6 +74,7 @@ enum dsa_tag_protocol { DSA_TAG_PROTO_KSZ9893 = DSA_TAG_PROTO_KSZ9893_VALUE, DSA_TAG_PROTO_LAN9303 = DSA_TAG_PROTO_LAN9303_VALUE, DSA_TAG_PROTO_MTK = DSA_TAG_PROTO_MTK_VALUE, + DSA_TAG_PROTO_AIROHA = DSA_TAG_PROTO_AIROHA_VALUE, DSA_TAG_PROTO_QCA = DSA_TAG_PROTO_QCA_VALUE, DSA_TAG_PROTO_TRAILER = DSA_TAG_PROTO_TRAILER_VALUE, DSA_TAG_PROTO_8021Q = DSA_TAG_PROTO_8021Q_VALUE, diff --git a/net/dsa/Kconfig b/net/dsa/Kconfig index d5e725b90d78..510055d7b1f3 100644 --- a/net/dsa/Kconfig +++ b/net/dsa/Kconfig @@ -24,6 +24,13 @@ config NET_DSA_TAG_NONE Say Y or M if you want to enable support for switches which don't tag frames over the CPU port. +config NET_DSA_TAG_AIROHA + tristate "Tag driver for Airoha switches" + select NET_DSA_TAG_MTK_COMMON + help + Say Y or M if you want to enable support for tagging frames for + Airoha switches. + config NET_DSA_TAG_AR9331 tristate "Tag driver for Atheros AR9331 SoC with built-in switch" help @@ -98,8 +105,12 @@ config NET_DSA_TAG_EDSA Say Y or M if you want to enable support for tagging frames for the Marvell switches which use EtherType DSA headers. +config NET_DSA_TAG_MTK_COMMON + tristate + config NET_DSA_TAG_MTK tristate "Tag driver for Mediatek switches" + select NET_DSA_TAG_MTK_COMMON help Say Y or M if you want to enable support for tagging frames for Mediatek switches. diff --git a/net/dsa/Makefile b/net/dsa/Makefile index b8c2667cd14a..fb8c359d6ef9 100644 --- a/net/dsa/Makefile +++ b/net/dsa/Makefile @@ -27,7 +27,7 @@ obj-$(CONFIG_NET_DSA_TAG_GSWIP) += tag_gswip.o obj-$(CONFIG_NET_DSA_TAG_HELLCREEK) += tag_hellcreek.o obj-$(CONFIG_NET_DSA_TAG_KSZ) += tag_ksz.o obj-$(CONFIG_NET_DSA_TAG_LAN9303) += tag_lan9303.o -obj-$(CONFIG_NET_DSA_TAG_MTK) += tag_mtk.o +obj-$(CONFIG_NET_DSA_TAG_MTK_COMMON) += tag_mtk.o obj-$(CONFIG_NET_DSA_TAG_MXL_862XX) += tag_mxl862xx.o obj-$(CONFIG_NET_DSA_TAG_MXL_GSW1XX) += tag_mxl-gsw1xx.o obj-$(CONFIG_NET_DSA_TAG_NETC) += tag_netc.o diff --git a/net/dsa/tag_mtk.c b/net/dsa/tag_mtk.c index c7dc7731675e..f8087d768da6 100644 --- a/net/dsa/tag_mtk.c +++ b/net/dsa/tag_mtk.c @@ -11,6 +11,7 @@ #include "tag.h" #define MTK_NAME "mtk" +#define AIROHA_NAME "airoha" #define MTK_HDR_LEN 4 #define MTK_HDR_XMIT_UNTAGGED 0 @@ -18,6 +19,9 @@ #define MTK_HDR_XMIT_TAGGED_TPID_88A8 2 #define MTK_HDR_RECV_SOURCE_PORT_MASK GENMASK(2, 0) #define MTK_HDR_XMIT_DP_BIT_MASK GENMASK(5, 0) +/* AN8855 doesn't support SA_DIS and Leaky VLAN + * control in tag as these bits doesn't exist. + */ #define MTK_HDR_XMIT_SA_DIS BIT(6) static struct sk_buff *mtk_tag_xmit(struct sk_buff *skb, @@ -99,6 +103,7 @@ static struct sk_buff *mtk_tag_rcv(struct sk_buff *skb, struct net_device *dev) return skb; } +#if IS_ENABLED(CONFIG_NET_DSA_TAG_MTK) static const struct dsa_device_ops mtk_netdev_ops = { .name = MTK_NAME, .proto = DSA_TAG_PROTO_MTK, @@ -107,8 +112,33 @@ static const struct dsa_device_ops mtk_netdev_ops = { .needed_headroom = MTK_HDR_LEN, }; -MODULE_DESCRIPTION("DSA tag driver for Mediatek switches"); -MODULE_LICENSE("GPL"); +DSA_TAG_DRIVER(mtk_netdev_ops); MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_MTK, MTK_NAME); +#endif -module_dsa_tag_driver(mtk_netdev_ops); +#if IS_ENABLED(CONFIG_NET_DSA_TAG_AIROHA) +static const struct dsa_device_ops airoha_netdev_ops = { + .name = AIROHA_NAME, + .proto = DSA_TAG_PROTO_AIROHA, + .xmit = mtk_tag_xmit, + .rcv = mtk_tag_rcv, + .needed_headroom = MTK_HDR_LEN, +}; + +DSA_TAG_DRIVER(airoha_netdev_ops); +MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_AIROHA, AIROHA_NAME); +#endif + +static struct dsa_tag_driver *dsa_tag_driver_array[] = { +#if IS_ENABLED(CONFIG_NET_DSA_TAG_MTK) + &DSA_TAG_DRIVER_NAME(mtk_netdev_ops), +#endif +#if IS_ENABLED(CONFIG_NET_DSA_TAG_AIROHA) + &DSA_TAG_DRIVER_NAME(airoha_netdev_ops), +#endif +}; + +module_dsa_tag_drivers(dsa_tag_driver_array); + +MODULE_DESCRIPTION("DSA tag driver for Mediatek switches"); +MODULE_LICENSE("GPL"); -- 2.53.0