From nobody Thu Oct 2 20:44:53 2025 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) (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 359D81E833D for ; Fri, 12 Sep 2025 02:47:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757645276; cv=none; b=CEasEZVFhf4kAg/ladX17ZQq7wQhbu5qeKsMkRX7AnAirosMaG/hiIvPgUi+4VCEyaQ/1Q5PHAByoG3kJRO1K9Qiz0PHMObusrfxHWsMlw77tzX37Q1O1AwfEgxVA8eREslEIC8Tuvs5HCghp4Iw9XwqXKhlwlUKt/dWaRgshF4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757645276; c=relaxed/simple; bh=vSWwbQxf5KT4HkeJD+pU8m0AGeh439pmbQfV3q1jwu4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Vl8xDjlt7CxKjiI7VmSmSYWNQN50Rv0XlDN9I/FzHJPZWl3S4MjFzPYgf2UloWNYe3jVtpUDfC0Ugc/LdQWORvdUu5V0Vy1ZpZRGESy9lSgfTvEXrBXBLt9pQ7U9EgnukA5+L8I6gpxUlDCX4RjG0wupvrBURoynWYCZNZN1Jrc= 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=IuNyor3+; arc=none smtp.client-ip=209.85.216.46 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="IuNyor3+" Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-32da35469f7so1280825a91.1 for ; Thu, 11 Sep 2025 19:47:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757645274; x=1758250074; darn=vger.kernel.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; bh=XOB8+c3LeZXokEHs6F4/VuMcwqCqjuk9sTez5HnCgog=; b=IuNyor3+ICYLcy11Q7CVYTVK17MP3D8zrj/jEn7VVzRSf9M5skZ+owKPJD1kzKUNJh L1HZDNSS5fL4z9ltIzJE/09qK4rXHHrIsc+o7SGxb/iNZ+Cfo17e4T+nccx8tmnAkzwV 0icUqYIzIaII8h224Nrx3N8gGHxtfvl3tgpP0Jz/IldjxME8OiNZZ6y3lBZoI1eBWFae zkfswuTGX5CS/VHjeUOzoYgNpZ8ikK5tuz7x/0QYOSaVUWnrD29gLZ1rQQ0E803Aj8Pq 8UQFQGQh3jPNgAbzFqVXQFGHQFkQBUX1Y6ulbbtmPmqtI+8xuwdExkEy+sBo0brMAvAa Oj7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757645274; x=1758250074; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XOB8+c3LeZXokEHs6F4/VuMcwqCqjuk9sTez5HnCgog=; b=J/s+tH+/S4qRowBhG/ZivBuz8xhnRvStq+8472lJCvTjIvSoocnI1Y1IFkFhL+6CE4 q0lSRc49qCFTK8KahpU3HJA3zvIE60lESqaccJQu7gViE5HujcLFsa/oLfuMaT1wLJ7n kFPOMHmSbUEOT2IYc/PUlN5NqrLsP/jtd2n9Ns7rUDjrKqUPFUFMCa8h3gGSAleHEbkA 2lHvnl5vnilkSss5fPEKvQ+BXKaSZQkw2cHHtXS/jeWqdq9aHEIzLZdNrsv3qL2HsgwI K1X2yuz2UE/rSkgy4nlv5JQkE7LDrznZ8WXzDq7/Cb7RgpGe55RsRDsIophFDVImF2/c 5SWg== X-Forwarded-Encrypted: i=1; AJvYcCV7Y+jApGTuS3mA9VjLW6yzZijS4NTchVU6bjCt24PzUXn0GJMqBwnhhuiitPMuq5qTIR60PLt76Dtk0bs=@vger.kernel.org X-Gm-Message-State: AOJu0YzSRxBkjmrSjG+oLX2pKH3+bBql3Jb3O9hVRWuxVf5PTW3t6Pp3 7+QKW9JjNDCgHpuL8vFP9CAHVw36I+eOokmWK3yb/aRgLaF6ax7+uP3u X-Gm-Gg: ASbGncsdh2D2mjza/NCSn/4CVbjq4pOtjNKkYaJwOFLB9DuZo6vDnknixpkKM50njXH +rU7SFVKEBhQZvy18HV9Fwg3ZSRFWlLsqasQ61ZXRWAuUSYi3qSo2xHvUSC6D1PXoUgBiYKoX6/ 1PN4yRJTgTfCgU9CkezkHhsG/Qsa1KPsp3gFRy/JQAGpAqj4H/1mJ0gbLFEzuDeEbsBTm9hnhTH JeVhNnFOZL65y4f6JbFBYVHFRzTO6PcuO/FuBb+6fkVSIHjVWIOq4i7Xtx744M+npdB/OK7CYfv RMxpUAr+98VCfuTVZV1/7/m0Hs0z+oR0NHuPrTXNfG9QfyBeVOKQKcCLcUVYZaagSVdLRojydOG D8vSkwLCNiC+9ce0VfjuVgjO54ksBkPaEoIKwJTqZ X-Google-Smtp-Source: AGHT+IEAa1SSvOxNw6eDjYM4JUsXmPAfjiilClnEg9xjJO/fmocQUvIiCBdJd6zqtNlYzLJxPvZe0w== X-Received: by 2002:a17:90b:5905:b0:327:f216:4360 with SMTP id 98e67ed59e1d1-32de4eac480mr1521409a91.8.1757645274390; Thu, 11 Sep 2025 19:47:54 -0700 (PDT) Received: from d.home.yangfl.dn42 ([45.32.227.231]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-32dd61eaa42sm4349827a91.5.2025.09.11.19.47.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Sep 2025 19:47:54 -0700 (PDT) From: David Yang To: netdev@vger.kernel.org Cc: David Yang , Andrew Lunn , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Simon Horman , Russell King , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next v8 2/3] net: dsa: tag_yt921x: add support for Motorcomm YT921x tags Date: Fri, 12 Sep 2025 10:46:16 +0800 Message-ID: <20250912024620.4032846-3-mmyangfl@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250912024620.4032846-1-mmyangfl@gmail.com> References: <20250912024620.4032846-1-mmyangfl@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add support for Motorcomm YT921x tags, which includes a proper configurable ethertype field (default to 0x9988). Signed-off-by: David Yang Reviewed-by: Andrew Lunn --- include/net/dsa.h | 2 + include/uapi/linux/if_ether.h | 1 + net/dsa/Kconfig | 6 ++ net/dsa/Makefile | 1 + net/dsa/tag_yt921x.c | 138 ++++++++++++++++++++++++++++++++++ 5 files changed, 148 insertions(+) create mode 100644 net/dsa/tag_yt921x.c diff --git a/include/net/dsa.h b/include/net/dsa.h index d73ea0880066..67762fdaf3c7 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -55,6 +55,7 @@ struct tc_action; #define DSA_TAG_PROTO_LAN937X_VALUE 27 #define DSA_TAG_PROTO_VSC73XX_8021Q_VALUE 28 #define DSA_TAG_PROTO_BRCM_LEGACY_FCS_VALUE 29 +#define DSA_TAG_PROTO_YT921X_VALUE 30 =20 enum dsa_tag_protocol { DSA_TAG_PROTO_NONE =3D DSA_TAG_PROTO_NONE_VALUE, @@ -87,6 +88,7 @@ enum dsa_tag_protocol { DSA_TAG_PROTO_RZN1_A5PSW =3D DSA_TAG_PROTO_RZN1_A5PSW_VALUE, DSA_TAG_PROTO_LAN937X =3D DSA_TAG_PROTO_LAN937X_VALUE, DSA_TAG_PROTO_VSC73XX_8021Q =3D DSA_TAG_PROTO_VSC73XX_8021Q_VALUE, + DSA_TAG_PROTO_YT921X =3D DSA_TAG_PROTO_YT921X_VALUE, }; =20 struct dsa_switch; diff --git a/include/uapi/linux/if_ether.h b/include/uapi/linux/if_ether.h index 69e0457eb200..cfd200c87e5e 100644 --- a/include/uapi/linux/if_ether.h +++ b/include/uapi/linux/if_ether.h @@ -114,6 +114,7 @@ #define ETH_P_QINQ1 0x9100 /* deprecated QinQ VLAN [ NOT AN OFFICIALLY RE= GISTERED ID ] */ #define ETH_P_QINQ2 0x9200 /* deprecated QinQ VLAN [ NOT AN OFFICIALLY RE= GISTERED ID ] */ #define ETH_P_QINQ3 0x9300 /* deprecated QinQ VLAN [ NOT AN OFFICIALLY RE= GISTERED ID ] */ +#define ETH_P_YT921X 0x9988 /* Motorcomm YT921x DSA [ NOT AN OFFICIALLY R= EGISTERED ID ] */ #define ETH_P_EDSA 0xDADA /* Ethertype DSA [ NOT AN OFFICIALLY REGISTERED= ID ] */ #define ETH_P_DSA_8021Q 0xDADB /* Fake VLAN Header for DSA [ NOT AN OFFIC= IALLY REGISTERED ID ] */ #define ETH_P_DSA_A5PSW 0xE001 /* A5PSW Tag Value [ NOT AN OFFICIALLY REG= ISTERED ID ] */ diff --git a/net/dsa/Kconfig b/net/dsa/Kconfig index 869cbe57162f..6b94028b1fcc 100644 --- a/net/dsa/Kconfig +++ b/net/dsa/Kconfig @@ -190,4 +190,10 @@ config NET_DSA_TAG_XRS700X Say Y or M if you want to enable support for tagging frames for Arrow SpeedChips XRS700x switches that use a single byte tag trailer. =20 +config NET_DSA_TAG_YT921X + tristate "Tag driver for Motorcomm YT921x switches" + help + Say Y or M if you want to enable support for tagging frames for + Motorcomm YT921x switches. + endif diff --git a/net/dsa/Makefile b/net/dsa/Makefile index 555c07cfeb71..4b011a1d5c87 100644 --- a/net/dsa/Makefile +++ b/net/dsa/Makefile @@ -39,6 +39,7 @@ obj-$(CONFIG_NET_DSA_TAG_SJA1105) +=3D tag_sja1105.o obj-$(CONFIG_NET_DSA_TAG_TRAILER) +=3D tag_trailer.o obj-$(CONFIG_NET_DSA_TAG_VSC73XX_8021Q) +=3D tag_vsc73xx_8021q.o obj-$(CONFIG_NET_DSA_TAG_XRS700X) +=3D tag_xrs700x.o +obj-$(CONFIG_NET_DSA_TAG_YT921X) +=3D tag_yt921x.o =20 # for tracing framework to find trace.h CFLAGS_trace.o :=3D -I$(src) diff --git a/net/dsa/tag_yt921x.c b/net/dsa/tag_yt921x.c new file mode 100644 index 000000000000..c8d34193159f --- /dev/null +++ b/net/dsa/tag_yt921x.c @@ -0,0 +1,138 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Motorcomm YT921x Switch Extended CPU Port Tagging + * + * Copyright (c) 2025 David Yang + * + * +----+----+-------+-----+----+--------- + * | DA | SA | TagET | Tag | ET | Payload ... + * +----+----+-------+-----+----+--------- + * 6 6 2 6 2 N + * + * Tag Ethertype: CPU_TAG_TPID_TPID (default: ETH_P_YT921X =3D 0x9988) + * * Hardcoded for the moment, but still configurable. Discuss it if the= re + * are conflicts somewhere and/or you want to change it for some reaso= n. + * Tag: + * 2: VLAN Tag + * 2: Rx Port + * 15b: Rx Port Valid + * 14b-11b: Rx Port + * 10b-0b: Cmd? + * 2: Tx Port(s) + * 15b: Tx Port(s) Valid + * 10b-0b: Tx Port(s) Mask + */ + +#include + +#include "tag.h" + +#define YT921X_NAME "yt921x" + +#define YT921X_TAG_LEN 8 + +#define YT921X_TAG_PORT_EN BIT(15) +#define YT921X_TAG_RX_PORT_M GENMASK(14, 11) +#define YT921X_TAG_RX_CMD_M GENMASK(10, 0) +#define YT921X_TAG_RX_CMD(x) FIELD_PREP(YT921X_TAG_RX_CMD_M, (x)) +#define YT921X_TAG_RX_CMD_FORWARDED 0x80 +#define YT921X_TAG_RX_CMD_UNK_UCAST 0xb2 +#define YT921X_TAG_RX_CMD_UNK_MCAST 0xb4 +#define YT921X_TAG_TX_PORTS_M GENMASK(10, 0) +#define YT921X_TAG_TX_PORTn(port) BIT(port) + +static struct sk_buff * +yt921x_tag_xmit(struct sk_buff *skb, struct net_device *netdev) +{ + struct dsa_port *dp =3D dsa_user_to_port(netdev); + unsigned int port =3D dp->index; + __be16 *tag; + u16 tx; + + skb_push(skb, YT921X_TAG_LEN); + dsa_alloc_etype_header(skb, YT921X_TAG_LEN); + + tag =3D dsa_etype_header_pos_tx(skb); + + tag[0] =3D htons(ETH_P_YT921X); + /* VLAN tag unrelated when TX */ + tag[1] =3D 0; + tag[2] =3D 0; + tx =3D YT921X_TAG_PORT_EN | YT921X_TAG_TX_PORTn(port); + tag[3] =3D htons(tx); + + return skb; +} + +static struct sk_buff * +yt921x_tag_rcv(struct sk_buff *skb, struct net_device *netdev) +{ + unsigned int port; + __be16 *tag; + u16 cmd; + u16 rx; + + if (unlikely(!pskb_may_pull(skb, YT921X_TAG_LEN))) + return NULL; + + tag =3D dsa_etype_header_pos_rx(skb); + + if (unlikely(tag[0] !=3D htons(ETH_P_YT921X))) { + dev_warn_ratelimited(&netdev->dev, + "Unexpected EtherType 0x%04x\n", + ntohs(tag[0])); + return NULL; + } + + /* Locate which port this is coming from */ + rx =3D ntohs(tag[2]); + if (unlikely((rx & YT921X_TAG_PORT_EN) =3D=3D 0)) { + dev_warn_ratelimited(&netdev->dev, + "Unexpected rx tag 0x%04x\n", rx); + return NULL; + } + + port =3D FIELD_GET(YT921X_TAG_RX_PORT_M, rx); + skb->dev =3D dsa_conduit_find_user(netdev, 0, port); + if (unlikely(!skb->dev)) { + dev_warn_ratelimited(&netdev->dev, + "Couldn't decode source port %u\n", port); + return NULL; + } + + cmd =3D FIELD_GET(YT921X_TAG_RX_CMD_M, rx); + switch (cmd) { + case YT921X_TAG_RX_CMD_FORWARDED: + /* Already forwarded by hardware */ + dsa_default_offload_fwd_mark(skb); + break; + case YT921X_TAG_RX_CMD_UNK_UCAST: + case YT921X_TAG_RX_CMD_UNK_MCAST: + /* Should be forwarded by software */ + break; + default: + dev_warn_ratelimited(&netdev->dev, + "Unexpected rx cmd 0x%02x\n", cmd); + break; + } + + /* Remove YT921x tag and update checksum */ + skb_pull_rcsum(skb, YT921X_TAG_LEN); + dsa_strip_etype_header(skb, YT921X_TAG_LEN); + + return skb; +} + +static const struct dsa_device_ops yt921x_netdev_ops =3D { + .name =3D YT921X_NAME, + .proto =3D DSA_TAG_PROTO_YT921X, + .xmit =3D yt921x_tag_xmit, + .rcv =3D yt921x_tag_rcv, + .needed_headroom =3D YT921X_TAG_LEN, +}; + +MODULE_DESCRIPTION("DSA tag driver for Motorcomm YT921x switches"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_YT921X, YT921X_NAME); + +module_dsa_tag_driver(yt921x_netdev_ops); --=20 2.50.1