From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 29746CA5FA2 for ; Mon, 28 Sep 2026 19:47:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=rbIAcFETs7Fo7Fiw9hweWROaB2K6gpG5L37UCuTLIIU=; b=0J6Vx4BowxDrSS04ZhjbiJLk3u krCxGQAWDn3pVQkiIlz7rvJyXZv8XtOEud5bw0SbYIz7prTF33r2ieoUlQExT7I4kY1IHpq5feZJM Kv5eL95GIuOkaelDfx1wPQD6mUhKkANSk8pmTBI8uWy3XNNcxsnGJKVC9qZSXaichsA0+EiQOb5iC CiobYf39FkuS+ih4EToyB2CYJXXmmCsoeAopu9/1X64vr+R3DKlDKYzjqYcC4JRE7iNEX3eX5NcRo 1ts0U6k66eAN/1/9BMsBZehsxKnr6uECnv1Dha32c/Vy+lYXR/IIjzmTWynCIwlLMrYTe6Y9NYFgQ zcZA6/+Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1xBHJO-00000001V0O-1DOB; Mon, 28 Sep 2026 19:46:54 +0000 Received: from mail-wr2-x1d.google.com ([2a00:1450:4864:30::1d]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1xBHIf-00000001UXp-2muR for linux-arm-kernel@lists.infradead.org; Mon, 28 Sep 2026 19:46:10 +0000 Received: by mail-wr2-x1d.google.com with SMTP id ffacd0b85a97d-4887d06c669so2653909f8f.3 for ; Mon, 28 Sep 2026 12:46:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790624768; x=1791229568; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=rbIAcFETs7Fo7Fiw9hweWROaB2K6gpG5L37UCuTLIIU=; b=jolvIjZHJMwgr4+AqopzYwCc9ekf4Ed2JbFPf8h0JExf1Lk2Sc+KyYrfUm+0xeK5hT cOOqRTmfQoBfRwI3w5e63WFM0Ny4CyII7zTyIJxS7RWYnC7H6q1N19fLzX52cFbklgef 9vWL97HVVtI7Cl0/WEnODi9hd38osRsGScbPwmYttWbtOHvSez7SXouHlbLUJWdO88kR Yq+ihQXUtKBQ63XpCZBcBGaVZNCwGqRzH1NEyFx+7z2/Ax4KJobdpQ/tTWaIZ3dDqPqZ wvINe4aawiSMYX3c6GszZrh4hXB64bSGaIun2Es4KAniDmO2YMuAijklw037nI2d0hRV IFjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790624768; x=1791229568; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=rbIAcFETs7Fo7Fiw9hweWROaB2K6gpG5L37UCuTLIIU=; b=bCx1fKvYp4LNa5sQiCrUi1m2AQzxcAu/3BfJG9Gjn/oSOSerUofGnPGsrIeA9YtDk2 3yi4fDE8Pnd/tSIFOnEY9UI10rc/thqbt1mzomzJ7ruv+si5CdBxthm8suksCD7FOZru PaVaMbycwxOMBtx0qZc1pud8ON7uYe6tSfzsszBFxvlVP+2/9Kyyl+oBjbVJS+OgxN2I YVUgFTDyO5o8XMvKWlLTVYT/ULwXHfl2eTSTDU1Iw9odJRK0H98edEc+RqHGU01FHKd7 sX0gA4clc8WtD+3Zdnd0aBvxDMIbfyk/+R61GaFXwc95b+H6pwWiRmeqReQ1RPQRWX4e ZhyA== X-Forwarded-Encrypted: i=1; AKwUvBw0ydZQKB8MVGkfFn374IMC5GqX1Vkd8sf1MMCPS+jKlgdFt7ena3viqTs7ZxLYRVOYs22ZWuz7oRPD7ro1AXJ/@lists.infradead.org X-Gm-Message-State: AFq9FYJGSkI6nKK36WL2eMBrjR7CSZdt1DyxQoPra12E0lIoo5STFqtI HP/hfzoFP/f8uJJmbzKGQlgkVqlFrMNkdOWBO/y/gA5QW/axZI8mN7rR X-Gm-Gg: AYBFou1wRyvHHaeKd2r8aPxtf/wyvloiTThecClXzkv/vVJNcaIy5mv9BkpVoxWrTIU 9gqn4MsWkRwXXk2Op2N9iisIr57+skH5ljQ+Gq1gmmYC7Rl8M9xWIzPqA9edMDXeTQ4QHi0mRin dgfch/l03i4MFdqlt2/xR31CDbBLHiVho9tn71Cobz6aIoZK//VutwP2W68zkJs6Y3qWfns6mAE r7PM5a9DXO4uJ5KLg3LsqUiBkqyJrgTul5kCfhHWnQe9NsAvIdZvb/qPA4uFH9a/ZgwQnyNerNI SukaflGHYvHMjpeer88rB055SltECU1hckT6HZ0A/TeoDYXJ/wefcdTciIUX3xihIgikRD2vIe+ LRpK3jd8t9/R/CbkM4VkrEv8Y+/trjJcPeZcUCU7N5kb7zXr3oCq6/Od3XDla3ve4cksIwAdvKR mFeGemz0FvJDujfCnXBZKGc54F8XQbOPVcJqkmFOazJpur1qSVzSjfazTPdL+GBmqhrApSIHkLN 5QTP3Tp1dAftXscy/tve8f96Gy1XYCfOG0iKZJNU83ytKReyW2gTozmIWchFVQN X-Received: by 2002:a05:6000:40d9:b0:487:342:d148 with SMTP id ffacd0b85a97d-48872ac7199mr23494967f8f.38.1790624767700; Mon, 28 Sep 2026 12:46:07 -0700 (PDT) Received: from Ansuel-XPS24.localdomain (host-82-57-191-234.retail.telecomitalia.it. [82.57.191.234]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-48af071532dsm1527706f8f.20.2026.09.28.12.46.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Sep 2026 12:46:07 -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 , Joris Vaisvila , 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 Cc: Andrew Lunn Subject: [PATCH net-next v24 06/10] net: dsa: tag_mtk: add Airoha variant usage of this TAG Date: Mon, 28 Sep 2026 21:45:05 +0200 Message-ID: <20260928194511.41878-7-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260928194511.41878-1-ansuelsmth@gmail.com> References: <20260928194511.41878-1-ansuelsmth@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260928_124609_741906_0BDCD2CE X-CRM114-Status: GOOD ( 19.89 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 Reviewed-by: Andrew Lunn --- 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 5d12191b6f6f..9824c63ad50b 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -62,6 +62,7 @@ struct tc_action; #define DSA_TAG_PROTO_KSZ8463_VALUE 34 #define DSA_TAG_PROTO_MT7628_VALUE 35 #define DSA_TAG_PROTO_KS8995_VALUE 36 +#define DSA_TAG_PROTO_AIROHA_VALUE 37 enum dsa_tag_protocol { DSA_TAG_PROTO_NONE = DSA_TAG_PROTO_NONE_VALUE, @@ -76,6 +77,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 4f44bf3ede23..28a249f04a43 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 @@ -104,8 +111,12 @@ config NET_DSA_TAG_MT7628 Say Y or M if you want to enable support for tagging frames for the switch embedded in the MT7628 SoC. +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 1f9cc30e9988..7ccaa528a989 100644 --- a/net/dsa/Makefile +++ b/net/dsa/Makefile @@ -29,7 +29,7 @@ obj-$(CONFIG_NET_DSA_TAG_KS8995) += tag_ks8995.o obj-$(CONFIG_NET_DSA_TAG_KSZ) += tag_ksz.o obj-$(CONFIG_NET_DSA_TAG_LAN9303) += tag_lan9303.o obj-$(CONFIG_NET_DSA_TAG_MT7628) += tag_mt7628.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.55.0