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 7B135C88E4D for ; Fri, 11 Sep 2026 22:54:59 +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:To:From:Reply-To: Cc:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=9Tz2CwjjJhiae7LDEb+iwsLlaTftt3gAWGBis4F4zcg=; b=AmrYd2pPRsKJROOzbzwWfh8owW 5r0A+udF4CnVrjl1lTCBXOl9XEqABHQXkMHB8/nKlQ0UTnJV1AxkM8BcJFld0kkfmPkeFx0hCl9PL +uldSU10GkivU52PYwCEvobKk8VX4fDGffWaLqSckQqoqYBGZjn6MGXdA/1E1HKFqUvep5SFp3vna 4hP0fNwK+R+Z71Z0N7E+eRB6UMWMOupncjDWb8+G/sYaxVhJHZyOMSRAkz73IMcATntTTYjO/FLlL OqzdFOLbAjwn7UL807sYk7mt3ycqsfx7GzW0UATHLwBT69HiPK/pzMhsNhj+YVWhmDt5h0S/x0PAq 8n3/r2tw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1x5A94-00000000JFS-0trt; Fri, 11 Sep 2026 22:54:58 +0000 Received: from mail-wm2-x10.google.com ([2a00:1450:4864:31::10]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1x5A8r-00000000J1l-3kwI for linux-mediatek@lists.infradead.org; Fri, 11 Sep 2026 22:54:49 +0000 Received: by mail-wm2-x10.google.com with SMTP id 5b1f17b1804b1-49ccff31419so686875e9.3 for ; Fri, 11 Sep 2026 15:54:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789167284; x=1789772084; darn=lists.infradead.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=9Tz2CwjjJhiae7LDEb+iwsLlaTftt3gAWGBis4F4zcg=; b=o9Ej8DKepG496m2FZNURjIxOGYQiolomsiEY936WNFWTaacPWsLupbh+aVlQ7HH7go AM05sq8M5GgdCv6PaltUyKSNSWxi3jVwvX/uQ3H7AjCNZVvBYrsmpkqiGl2mniCOkpgh kkEgcQdzQYM4xqRCzsKaiWEEXOe1x/CsHjxQO4OqLv3D9w0A9HDIJBBbheslgK97Zmfj 9Pt0zoNihmqJc3V4l4FJMweyqH4nHoweSucGvqrLX12fQICXVgaugmkg/oQHhUwTBJHD bnsZVDavfzwbFZyeoPIYRh5UFIoL7JyTZb6qj3gKTud/kiko+vJ/blugiNt76eJwsvpq XZEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789167284; x=1789772084; 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=9Tz2CwjjJhiae7LDEb+iwsLlaTftt3gAWGBis4F4zcg=; b=KU01ARVEtAzP2NparWnbdtPIcSuepyt0X0QHhQ4MZbU+7Aqu2Dmj4BeZD8vkcm7ByT IaSLT+MRkLUw7hEBbxxUhccoP4tYHX2LqXiVvK/ZbDK8qpXsiC7k35V1ZEuiWWK0TxuF l/6qVzQR6oRXbRVpYBTnEvnlzwgxrERbB5EHuPmSDtwQBLkJR+T2KEXlEmBu/WYFWr84 qd0PTRxtFsENFHkUAkQ1N0UJUnKzGk7+Mg/Ktf2wL1ItTYHFayVFmMNWjD6bUsET6TTE snqFQZqDN/X9fqQPOzfrc9euueLuSi2bPnnB8XVJu+ZIAa12TFztpeI6SfHsgpq/WtkL yozg== X-Forwarded-Encrypted: i=1; AKwUvBwHJbVVEFYOIJG6qAvFf4lldX5K6bh9HE9Asc2nGHh5V6/mMQiulReDJ8TfGab3CQstdpgS9xtlwSRM2zy0qQ==@lists.infradead.org X-Gm-Message-State: AFuF++lJJ/nMGWNdD3p8fjxLxYV2jgj5z0U+jwSOFy/VLEVcyxeiJF1c d4ff7BbjUeIexNN/ArhHFCcyVS/MGXVO7OJDMHnLDlCBxeMXBKAaNJYV X-Gm-Gg: AYBFou1QFfuAyZ+Xu2B8Zcz3holyobP7CX6MCleLFcma2m6OeCsZ814meHLs7Bowrwl RlUN+f5yatl6waeNdCwwiW4q+/BqUUqNrg87G+eREL3zjn880v3sSrXDKPc4eE5qB0cJ8XvLS3i aaaOk4kKYY+ZfzyrWNPBMWDoHZWmHqFY8g8cVVm0mELVkT+PPjd7EyXZiLHnIq2o2EkyhlAKC5G RKQZj392OLNsnfc7WXDkibGXfbu2jS+28pgLPLjB+uOEt1uH9XUem2qakdewFrnLO8wgHS7DGfS EkCbUKzqDijkaN0IZwEvN1h6wP+kZC9kyMPM5c1jInSZqnHm2kgiNlwqSRKaq9inMEXBiXxmd8a UJ90AAegk9BueNvoPMDWHy7CQ2w7yyrov6/L3PuwGZU7sYWh28A1CnvwBueOOit/dggbBz9Aa3/ GrApWHDIJD3iyzn4BDnRrS269qo/atk+C8rh7+GaNiiwErNgQJcavH21v2afC8VhUsq8mid6trl chsmwGQyFZcDUbuocbxY6tXHe5eQSjf5pd4nIYYz/s6Z0D8Yqp/XpaH84ziW7nU X-Received: by 2002:a05:600c:468e:b0:49c:eb17:cf3b with SMTP id 5b1f17b1804b1-49e6cabd4b4mr2149135e9.8.1789167284161; Fri, 11 Sep 2026 15:54:44 -0700 (PDT) Received: from Ansuel-XPS24.localdomain (host-79-26-252-140.retail.telecomitalia.it. [79.26.252.140]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-49e6221ffb0sm77593685e9.3.2026.09.11.15.54.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Sep 2026 15:54:43 -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 v21 6/9] net: dsa: tag_mtk: add Airoha variant usage of this TAG Date: Sat, 12 Sep 2026 00:53:30 +0200 Message-ID: <20260911225414.225980-7-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260911225414.225980-1-ansuelsmth@gmail.com> References: <20260911225414.225980-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-20260911_155446_045401_00D05879 X-CRM114-Status: GOOD ( 18.01 ) X-BeenThere: linux-mediatek@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-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=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 --- 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 7507d632e7c6..c5659e9ab6d3 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -61,6 +61,7 @@ struct tc_action; #define DSA_TAG_PROTO_NETC_VALUE 33 #define DSA_TAG_PROTO_KSZ8463_VALUE 34 #define DSA_TAG_PROTO_MT7628_VALUE 35 +#define DSA_TAG_PROTO_AIROHA_VALUE 36 enum dsa_tag_protocol { DSA_TAG_PROTO_NONE = DSA_TAG_PROTO_NONE_VALUE, @@ -75,6 +76,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 23b4b74004ed..07ad0f13416e 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 d15bcf5c68f0..57739a488a6a 100644 --- a/net/dsa/Makefile +++ b/net/dsa/Makefile @@ -28,7 +28,7 @@ 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_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.53.0