From nobody Sat Feb 7 12:19:19 2026 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) (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 6DEB91F5858 for ; Tue, 27 Jan 2026 02:09:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769479749; cv=none; b=WMwqM6PUuAppY9rdsAuF1Bf9ErifA7/qTAjFY+iRph4kDiacF/u1DVRStRwah7pH1sQONWaHOTWowu0j31Ova96E5wRb0lLtkl8vcTtM02/8qLoI1+nwfQMLCkbS1pWOfilYbcSvVR2aBeEhm46ABcyec5781MRoqdNsxoirQEA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769479749; c=relaxed/simple; bh=0t0dl3v9CeZspqERK8OCxRJsZj/7BPyDqzX+ailEm5Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cQARsGrqVU3jJD5IG8uh0hMsYEV5i1uVL7HQqXWK1gW4tM7f/x8TrFC4Z12SZljQvCc1Rj8I1xYqVwv0H+gp2beU5tJL9HQ6nQdULDzOEwh1Y4uNoi12h5dk0pPIV7lYJXHTC/2YMNA1GBJRVwM5W2QCCua3d0U1T0Hq50vgWPU= 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=LcRrFefQ; arc=none smtp.client-ip=209.85.216.48 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="LcRrFefQ" Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-34f634dbfd6so4243529a91.2 for ; Mon, 26 Jan 2026 18:09:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769479748; x=1770084548; 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=vpCifLiPOJS30ldSXwTRHj3fHBDp1Tvh3VJtIU/qW+o=; b=LcRrFefQStG0Dqq5FNAOBKmuT9u7G7fxmSpbJ6h0YLWJXpsV9rTXcKex5GAGCEXWne YOyQsshvq7pH7+eILpismXTIt655nm5Uavx2g4itGwG1QrP6npDNQpLqXw7Ee4lRu7cI wbKO2dQGsdnqOgq8I6CXGncWFq4GnhrhAxFNpiXTzULbz4821U9VTKB3xD6Wr+zqixTc 4W5U8qdjdc0srU1OapECy1iHSjNtAw3kvYPUaHAObgtMuT6PZaizpG7Q3jv1tPF0UejN xkDsPD59c6mAgCA3d18OT4q7qUd4qmxMg0m0xCpcwUiFRMx5f85LoUxVNMx6g2U6Zz+U yL4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769479748; x=1770084548; 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; bh=vpCifLiPOJS30ldSXwTRHj3fHBDp1Tvh3VJtIU/qW+o=; b=EFvVM2rFR23oHlHHenesA6F+haTPNLFjjnNqQM7jSUvwVOPr/oAO2ObW73yOL2bd4l ZZcEZyw2Pz2xNlhpD1DOKDQWuwxHCMCWMk6AcGGhQqGdpDmckivbGUwcz/mWImIZvB0u Xeax8pO2xzyLaFiWhr6WfUz/pzCMI9SIl55U94bHJxtcdKQM4ys3YM4rAv2UVWXZJx4I oDCSpmJNYpwwPyIIuQ8WqNMW77GFIcwxsT2f1Odc24tF7jhpp7M1WBf0RzcN2yUnEuB8 pSRC7FO0YrdZO1pxtwxdL9TUe23oreZEwIUsLBT7BsRxS4wqT45+mTt7pkwCKzF8dTih J//Q== X-Forwarded-Encrypted: i=1; AJvYcCXM8/7qhTsZYGeFTjTaUScdLK9lBs4d1Xs4KsFLCSpEUH/aG5syzaU4uVQmGSDxXrJ7gQy7wy9jvjCKQjY=@vger.kernel.org X-Gm-Message-State: AOJu0Yy9NMezmNpQ2Z4M5sQPVXyVD/minwW55TnawILZBebHAZRmohfU wloyNykWqQP2XtQIjtXVFGZ9iaJS6tW9EBwccdH28pGcgPkkdKYqy2jW X-Gm-Gg: AZuq6aIWkpgM1pD6usRRj9ci8FicCex5c+EsD+4T2BPmPSkiyN7opSwb75/MtnvgUk/ P9RTXI4e3rJ0n9rvI4W81mGETj3xoZwPmGjcktZibDImT1rQOQebrNbnxNnOv3YGdxfDfTfyaUs i8322SQXPVGgeUD/GhRVBUHu1hf9yrehWJsT8W5ZdqDsRnRQqJtTxXwsZNdZGNPcPcFONoYZ7wU L/YZnR7Ju3EpJVMtlq4ceVvVSQ5n0y/IbB7oesn/lpIunmE1+D78vu9yvNhAvgdyGmHdB0ButSt z/7HC1WsmFAk8Jhi2RPDiOci/q6IIOCt8BhmwCl9GrxFPQJnMdruXrPgsBQcc2OzbAX4vvsYk3e /UDtn5rswQRy2tyTKq+zH6EGTQts0XDqpHjTtdeaBjs462OEHHrNkjYa3zPyykII8oC0azkBMBJ mBi8xz2pjI5BqyoGRbwDQmlj7UR4QHeKwKt00mSSlKtVKMeZtSCncPkw== X-Received: by 2002:a17:90b:560f:b0:347:5ddd:b2d1 with SMTP id 98e67ed59e1d1-353feda7677mr276391a91.27.1769479747594; Mon, 26 Jan 2026 18:09:07 -0800 (PST) Received: from d.home.mmyangfl.tk ([2001:19f0:8001:1644:5400:5ff:fe3e:12b1]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-353f613fc36sm693540a91.10.2026.01.26.18.09.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jan 2026 18:09:07 -0800 (PST) From: David Yang To: netdev@vger.kernel.org Cc: David Yang , Andrew Lunn , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Russell King , linux-kernel@vger.kernel.org Subject: [PATCH net-next v4 1/4] net: dsa: tag_yt921x: fix priority support Date: Tue, 27 Jan 2026 10:07:58 +0800 Message-ID: <20260127020847.1482724-2-mmyangfl@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260127020847.1482724-1-mmyangfl@gmail.com> References: <20260127020847.1482724-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" Packet priority is part of the rx tag. It defaults to 0, but adding DCB support to the switch driver will break the tag driver by setting it to non-zero. Signed-off-by: David Yang --- net/dsa/tag_yt921x.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/net/dsa/tag_yt921x.c b/net/dsa/tag_yt921x.c index 6bbfd42dc5df..b93715a057c7 100644 --- a/net/dsa/tag_yt921x.c +++ b/net/dsa/tag_yt921x.c @@ -17,7 +17,8 @@ * 2: Rx Port * 15b: Rx Port Valid * 14b-11b: Rx Port - * 10b-0b: Cmd? + * 10b-8b: Priority + * 7b-0b: Cmd * 2: Tx Port(s) * 15b: Tx Port(s) Valid * 10b-0b: Tx Port(s) Mask @@ -33,7 +34,8 @@ =20 #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_PRIO_M GENMASK(10, 8) +#define YT921X_TAG_RX_CMD_M GENMASK(7, 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 @@ -98,6 +100,8 @@ yt921x_tag_rcv(struct sk_buff *skb, struct net_device *n= etdev) return NULL; } =20 + skb->priority =3D FIELD_GET(YT921X_TAG_RX_PRIO_M, rx); + cmd =3D FIELD_GET(YT921X_TAG_RX_CMD_M, rx); switch (cmd) { case YT921X_TAG_RX_CMD_FORWARDED: --=20 2.51.0 From nobody Sat Feb 7 12:19:19 2026 Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) (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 5943B2DCF6B for ; Tue, 27 Jan 2026 02:09:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769479753; cv=none; b=VKKKhGocdQRqbyU+iCmIxNhzcOq8Rma9vdYXgV9M0ir6OLOqUuTBxgBe+JKGoe/X1RLHQKLy2zjEiglKy6q9Rawh1ljFtigV+BbHPKRrk74EfDwfPOVNmyMWvFJ1AxfOtRPyCihrvysso+VKtQChsgi18NJbdWtLQDHAlJgMsFc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769479753; c=relaxed/simple; bh=iZJach6s8qYLr3vpM42GbXz2jpGMsX7usKV8PgWY/7M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tmqdRRC1pvNFYrwRJIvf6GjZXni4+ToK9IXk0LchHGZxI7/1VQcr2G6WJS5GtmJoE1qo1XFrdT0qT6fRHM5faZ3kxt4ezBwE0oVCA1NLBvA2PN8wmXiEU4YI3pkIzzeehuOIDbxcu2qu2AKIQa1uDbSTMk9JeJ9L+fDmt35PyYU= 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=aPgzfR7e; arc=none smtp.client-ip=209.85.216.53 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="aPgzfR7e" Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-34ab8e0df53so4465599a91.3 for ; Mon, 26 Jan 2026 18:09:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769479752; x=1770084552; 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=hLHzhuxm7a5X2Q49ADNkLZ5qYk8a4yH9AKsfa8IpJ8M=; b=aPgzfR7etoqO6siifkL6SREkmrVLaou22/8GOv2L2agU19xWCC/tyS3e6nsLN7rDWI ZDGM/sP8qIg5J3OT3dPYucGRtZXZKhBFneGpRAezp8KkVABThCybqWv/GBzmD2Gex3zb EOSOHD3ECaScqZwFO2dIG8TYq8EJaHAeTiyssHdfFCroz53zjjBMksbPUeDT8HJUCEd1 N9RywXRAa5vxT0YMv1c2gasd5G+Vm++OceCkOcMVwd16+7Vta5Lt6EWLCHAn0ykuJ5PL jc4yZbKXs9VynAkD+MvYB7kYHbUJQEOSWIRsnMzzrQy74xP5HLmiShn/8zaOJsSN/r2f rBIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769479752; x=1770084552; 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; bh=hLHzhuxm7a5X2Q49ADNkLZ5qYk8a4yH9AKsfa8IpJ8M=; b=GSWdYMvpZKopARybZ5STf/Mgu+Bqez+ppz8SA1350YXXAQrpNlKbcWMrnCghuH5M/f /H/V+1ZjOqLeR2YxIPLorUdTRl1orONkD9z5vRoo7ZE6Irfy4x4A+Iubf14dG/jPXDsG CAJEy63gCFx7QFvr5NcBy1hUSPUNScjQY9CikrDQbjn2frOhMJlnBzJG45/+G1ZFf2Or jNbDF1y0pT4Y670/SDvT+8L0+Dgy1Tg5FumGAU/vg+0Ci5tFrH8AmJRi2TrUz5/hLx36 bsPGFZ4suXqNkPCrXhP50bNMUbZcVO6bcfytX5CTulvkF3AfwBfrnPJz3r8Ho2GlXbJF UEBQ== X-Forwarded-Encrypted: i=1; AJvYcCXwRuH+rOBE+q+LML0z2izSRlv1ytMZQnuQeYbVTj4Jl8jGYZEE0yWsc7wDJHDl51Y7uUuZEfsxz0OXP48=@vger.kernel.org X-Gm-Message-State: AOJu0YywXqB00MJ7NQuMEubJEYuWwaO80aLSOq0nlFHOho79bubYbTpM yx3z42ndmRwRcdcuKj0p4GuVEQ5Lfay+spELR9tmeyP7dDF7fmAdcCSo X-Gm-Gg: AZuq6aLkAjsslfm5OfsuBzks6yJXHVLq/5NG3FAJUAt2D7rcd4ABPe94ZGOmkLg/IZQ JVRspPfhoqTTadLUe9kdtLa21W7A/mYIZ9jpkM4OPCjM80/jCTriUDN10QaLw4U2WxYM5OFvdqK r5aZyLrCwNoxeSBH/g6bmD0pk9yLFwDMyrBSpCZUTSy7MFnczjwO17THlOsLKBVwrboxGgMyMIQ gNP4uv2EEg+RB0t6QCjxY0dG8T+ahPQg+i+E2gvsv5pvEbaJV/RGLd+ribEP3a0GqdUem/EVXFs 7x5gBWoQwfxttRLMVKUFKiAsbMTSzYvoZ2kmqX3EOZy+e2g4TOoOy2TMM46Mi+vQinv7uI4ELFl aIL0EpP0kQpOX0mlOD0uj/7sTOaOqukKJNwNPzqBZCDf7klggeL13vXzvkQkMtV/NIR6lSNoxsQ ABKNhBGiPeB7vlN6WcW2IbdFYN7mVbtg7QuYmBzfDzgJPNG6PXHJkmNCjMOL7IrMz+ X-Received: by 2002:a17:90a:c2cb:b0:352:e796:bb65 with SMTP id 98e67ed59e1d1-353fedae2efmr251228a91.31.1769479751674; Mon, 26 Jan 2026 18:09:11 -0800 (PST) Received: from d.home.mmyangfl.tk ([2001:19f0:8001:1644:5400:5ff:fe3e:12b1]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-353f613fc36sm693540a91.10.2026.01.26.18.09.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jan 2026 18:09:11 -0800 (PST) From: David Yang To: netdev@vger.kernel.org Cc: David Yang , Andrew Lunn , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Russell King , linux-kernel@vger.kernel.org Subject: [PATCH net-next v4 2/4] net: dsa: yt921x: Refactor VLAN awareness setting Date: Tue, 27 Jan 2026 10:07:59 +0800 Message-ID: <20260127020847.1482724-3-mmyangfl@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260127020847.1482724-1-mmyangfl@gmail.com> References: <20260127020847.1482724-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" Create a helper function to centralize the logic for enabling and disabling VLAN awareness on a port. Signed-off-by: David Yang --- drivers/net/dsa/yt921x.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/drivers/net/dsa/yt921x.c b/drivers/net/dsa/yt921x.c index a4b346ddf8dd..880e3b5966f8 100644 --- a/drivers/net/dsa/yt921x.c +++ b/drivers/net/dsa/yt921x.c @@ -1768,6 +1768,18 @@ yt921x_dsa_port_mdb_add(struct dsa_switch *ds, int p= ort, return res; } =20 +static int +yt921x_port_set_vlan_aware(struct yt921x_priv *priv, int port, bool vlan_a= ware) +{ + u32 ctrl; + + if (!vlan_aware) + ctrl =3D 0; + else + ctrl =3D YT921X_PORT_IGR_TPIDn_CTAG(0); + return yt921x_reg_write(priv, YT921X_PORTn_IGR_TPID(port), ctrl); +} + static int yt921x_port_set_pvid(struct yt921x_priv *priv, int port, u16 vid) { @@ -1818,13 +1830,7 @@ yt921x_vlan_filtering(struct yt921x_priv *priv, int = port, bool vlan_filtering) return res; =20 /* Turn on / off VLAN awareness */ - mask =3D YT921X_PORT_IGR_TPIDn_CTAG_M; - if (!vlan_filtering) - ctrl =3D 0; - else - ctrl =3D YT921X_PORT_IGR_TPIDn_CTAG(0); - res =3D yt921x_reg_update_bits(priv, YT921X_PORTn_IGR_TPID(port), - mask, ctrl); + res =3D yt921x_port_set_vlan_aware(priv, port, vlan_filtering); if (res) return res; =20 @@ -2021,8 +2027,7 @@ static int yt921x_userport_standalone(struct yt921x_p= riv *priv, int port) return res; =20 /* Turn off VLAN awareness */ - mask =3D YT921X_PORT_IGR_TPIDn_CTAG_M; - res =3D yt921x_reg_clear_bits(priv, YT921X_PORTn_IGR_TPID(port), mask); + res =3D yt921x_port_set_vlan_aware(priv, port, false); if (res) return res; =20 --=20 2.51.0 From nobody Sat Feb 7 12:19:19 2026 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) (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 98BB62C08D5 for ; Tue, 27 Jan 2026 02:09:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769479757; cv=none; b=GGJvx+IeFm+ehk1EkpbOOHwT5dUNY2/dY/PcGGnWi7RaXodZVmggNPxiaKp3niH9DnpLhk+Es1MsJ/9EnGixnCyry9CD4mDieY9Br9xOJig/i6sgiexB+eqKv1CujzyXd/hURxJMWQDyE/RZYnvg3+7XAoAoqO73qEJ3g4sKLAU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769479757; c=relaxed/simple; bh=MBs1LMoPjEjYdhkq4Ew/Rs+s+0tFbyUFwqgDEo7mlcQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WQYy9omUHWXEEx+2hUUhvzHkl8PKNRTqFVuXCc4WhGEYqrsqCyYUbjTZ72BrAFWAKwVb4nQj/bjiW9b63XcE7bcKnsX7bVu35D54mdiD/nzwcVKDaW0VTXJ3rQ84C8+Ej+O453gyz1wqwq8bqi22pqFxyQu+UvJRWqk+7jTkUkk= 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=mOYJxOhF; arc=none smtp.client-ip=209.85.210.182 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="mOYJxOhF" Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-81f4c0e2b42so2592478b3a.1 for ; Mon, 26 Jan 2026 18:09:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769479756; x=1770084556; 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=AB/9v+5HeIAl6n8QhVl8YEDoGPmeGe9LLib+gDQtwSk=; b=mOYJxOhFQukMIfQCtHXRUZzvjtCVg3mTjLxOVwu07sdwNhKeTQZiCfI4qVCYeSQt7P FRduQLHceAshXZRuxy/MmgJGI2zkiwjUBm1uGU2U6Pdcsee8y3sn2KuRcdRD5DbgizvE 3gs1wPRfxHAmfbYHaa3ScoMV5DNDQX0L1+6oSfiiZo8jsCISvlOhMts5TRsHu/3yZtCB oLClP3tconKyB7tf7RZxcnafwdMa8KPJ6TKOuWzqj4cYmzgGg8GOQk4rqEDdxIQbapmg meD1zQ+/dmZQO8XMHx/M27KRIte5xDsspDfiCkS8b8CbloL9hB44piL0nDLCvBKdh2w8 YibQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769479756; x=1770084556; 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; bh=AB/9v+5HeIAl6n8QhVl8YEDoGPmeGe9LLib+gDQtwSk=; b=Dt925fWZBama3qQ/wVeeAoLPliWJClPZMdhO0gxL8iBzgqphcJ9PcPT6jcNgof5xP3 4CEd5RmTkSIJ48vb68M3S9ae7Rb0HJ7iG7LjpKzSrQaLO+AEbfziGQlBjJ/5qJdU7HSI SOKcXQGktVGDBGMpmkeJfSKi6NpoE6fCpMNRt+W1gXyF4Le2smzmjVTLVTwcVaK8DeRp 0HYc0LJdcueyGNAB05KSAtp9Niwm6jLv8y38BiDBbm6Zw6h/8tOTZnHIdqr9Y/VrDK8j CzEDpCT4hx39X+rQlj8+vYNPGQO6Cjap5LqOyE9IgKZH3AAAM1mnOnbeTL8I3U1o1503 6+gA== X-Forwarded-Encrypted: i=1; AJvYcCWggMHbWFezIwUB11kgoP5DAMSKiX5TExpG9KvK1HzHwYXUsXfBw2Byim6IHBDaYRT/lE19SW3Py/hpEl4=@vger.kernel.org X-Gm-Message-State: AOJu0YxoNFRNCAasdHWP1kp0YoyMfX9D57ZdNdOX2iGDFbMYaiUtovJm wuvgkywjBRtjVOGwkWfi4P0HR8QFHEWvP8+kK9or0TBAmCkcv8Ucg4Bg X-Gm-Gg: AZuq6aKbfp3QhCgNBhLuIOiQQs8l+OIf/pcasfT3GZ2A8dBcrImc6vGkCvGv/ZYD+Gw iJbGtvgdzyfvOzLtxHbu7QGuD1Ao2zM6oBhRB1rzqZkrnyG4usDiqA9cMgGOGlmbDespk1Z8ZDp tASf1jd2PmLe+4vtp0EfFhFFwOBh4Y7Ui3tZFS3RwP+HIRBsGOuvaO9jhIgEppC89BmGPwS09zp RmYgZ06ZPt8CojgBOOvccfre4l8eIn5VopkYGtMebNqNL7kUGEaZTIB4wPdwMfg8UbKlo4aL0gJ dJl6cr/Lr/STgGNdY7ttakAkPonEtA4lFFZIah5JJwRt2Rq0EvthZjCMVyXDlFSikMtZQxz+RWJ gGtbkccUdgnFDWVjuz9F1ZZUO/8zjG1Nknk8jf92+Y2ZL2l/1z/mk5ouIWCjHnO6p/3Iz0qz4Gc aGnE6atJFxNWmlQgaCFftBwasMU+eHmSLbFWP+yXF9BQ0fekzTak45GA== X-Received: by 2002:a17:90a:d448:b0:341:134:a962 with SMTP id 98e67ed59e1d1-353fed88d1bmr221870a91.28.1769479755915; Mon, 26 Jan 2026 18:09:15 -0800 (PST) Received: from d.home.mmyangfl.tk ([2001:19f0:8001:1644:5400:5ff:fe3e:12b1]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-353f613fc36sm693540a91.10.2026.01.26.18.09.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jan 2026 18:09:15 -0800 (PST) From: David Yang To: netdev@vger.kernel.org Cc: David Yang , Andrew Lunn , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Russell King , linux-kernel@vger.kernel.org Subject: [PATCH net-next v4 3/4] net: dsa: yt921x: Refactor yt921x_chip_setup() Date: Tue, 27 Jan 2026 10:08:00 +0800 Message-ID: <20260127020847.1482724-4-mmyangfl@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260127020847.1482724-1-mmyangfl@gmail.com> References: <20260127020847.1482724-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" yt921x_chip_setup() is already pretty long, and is going to become longer. Split it into parts. Signed-off-by: David Yang --- drivers/net/dsa/yt921x.c | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/drivers/net/dsa/yt921x.c b/drivers/net/dsa/yt921x.c index 880e3b5966f8..9ac0e4e236c6 100644 --- a/drivers/net/dsa/yt921x.c +++ b/drivers/net/dsa/yt921x.c @@ -2903,7 +2903,7 @@ static int yt921x_chip_reset(struct yt921x_priv *priv) return 0; } =20 -static int yt921x_chip_setup(struct yt921x_priv *priv) +static int yt921x_chip_setup_dsa(struct yt921x_priv *priv) { struct dsa_switch *ds =3D &priv->ds; unsigned long cpu_ports_mask; @@ -2921,16 +2921,6 @@ static int yt921x_chip_setup(struct yt921x_priv *pri= v) if (res) return res; =20 - /* Enable and clear MIB */ - res =3D yt921x_reg_set_bits(priv, YT921X_FUNC, YT921X_FUNC_MIB); - if (res) - return res; - - ctrl =3D YT921X_MIB_CTRL_CLEAN | YT921X_MIB_CTRL_ALL_PORT; - res =3D yt921x_reg_write(priv, YT921X_MIB_CTRL, ctrl); - if (res) - return res; - /* Setup software switch */ ctrl =3D YT921X_CPU_COPY_TO_EXT_CPU; res =3D yt921x_reg_write(priv, YT921X_CPU_COPY, ctrl); @@ -2983,6 +2973,29 @@ static int yt921x_chip_setup(struct yt921x_priv *pri= v) if (res) return res; =20 + return 0; +} + +static int yt921x_chip_setup(struct yt921x_priv *priv) +{ + u32 ctrl; + int res; + + ctrl =3D YT921X_FUNC_MIB; + res =3D yt921x_reg_set_bits(priv, YT921X_FUNC, ctrl); + if (res) + return res; + + res =3D yt921x_chip_setup_dsa(priv); + if (res) + return res; + + /* Clear MIB */ + ctrl =3D YT921X_MIB_CTRL_CLEAN | YT921X_MIB_CTRL_ALL_PORT; + res =3D yt921x_reg_write(priv, YT921X_MIB_CTRL, ctrl); + if (res) + return res; + /* Miscellaneous */ res =3D yt921x_reg_set_bits(priv, YT921X_SENSOR, YT921X_SENSOR_TEMP); if (res) --=20 2.51.0 From nobody Sat Feb 7 12:19:19 2026 Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) (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 C5EC82E62CE for ; Tue, 27 Jan 2026 02:09:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769479764; cv=none; b=OwErqIkh+2X/dSVHmA5chLEOIgaMbI7BKOQP0DzwpZqHFF7ce58vcWUOxqM0sMy5dWrqhH1QaVcWVCD8gmjSOohbbGeIkDJQLmUmdeDlBgfgLPjW5xZugi9ik0kA3abBLpKv4NqXPjguXCebiCYyzc/CXxOcuwL5aC75T0/GkW8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769479764; c=relaxed/simple; bh=Bm9bRj8OGkXsxjvRTdCkznjsqkzjmpFFXIjUXWcI7O8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bi+QrP91ccRjzq9PT2Rs0psD9c/cfbf5L0/2Hz5HD2Hn3QSdMd9ufZHnz6ySZxYyorex/Klltd8fRf8tz9VJAZ0ASeKttAG1EMsdtI8SbbGyt2taBQWrpBkCIYUozrmJjRRYSY+2qC+9wfbSNZuHt8+1hmgdzj9eXos13Td9/ek= 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=X0aajvd3; arc=none smtp.client-ip=209.85.215.180 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="X0aajvd3" Received: by mail-pg1-f180.google.com with SMTP id 41be03b00d2f7-c0ec27cad8cso1958445a12.1 for ; Mon, 26 Jan 2026 18:09:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769479760; x=1770084560; 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=cfXyKfcUXIm04kvDDBIE4tsKOMPf0rdN8lz9+k00dGo=; b=X0aajvd3NBpFwgGY4qe7x9y765hOYL6YT9pjr2RUWb244w74/rltKbumsayfQkrZ+1 uzVMT56+PJ8gcRcMsyWPuHqjZpslH5x05n/pCWJYq32HxvSXVHOEb+wZBa+LoXB1711G mWsZiFZXTQeS4zrAFou3BXaptRbS2QB0lazYXX/iCMqFrqcpfZUeeN5BRhGWcF4pqT9+ kkTDHDLb8RD7NcLw/1qluyT/uzT06qFI7EYnFx+65Ba1KXwufC0SvUr8N7Vm+PZzR5+C XGPriypRv4uyXjrtCcKyCw2ZEaqYA9X9v4qErDp0yU24ddReWPkesJOvB+zc8F2CfNm0 0f6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769479760; x=1770084560; 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; bh=cfXyKfcUXIm04kvDDBIE4tsKOMPf0rdN8lz9+k00dGo=; b=QxrBc3VQJ/ctsdCV3w/yCRSyJi1TFZYtT8PYxehPB3GWPGdHuwK27NskfOgI3e9GF3 vjsDWSz3kszcjLDUAg5Na3dAaAJLiOHdf5/nDzbeC6Nd0cle7Tjmy60pV3zzxd53ed6q fmTidH3GAU91TDWXPjD/SDw+Yp4dBVzeJ/gg/Laaam75+4TtrDc0qkzWMpaZyduhRoBY Pu6trJaPuig+tOnB3M0IWJM+qo3rdQDENvKzIYe4YdtSczjyzRVnjtVITBWgWS1Hz7Tm VpHwVMkYrt6uN0mcdbb3m79EJXNrY7hqd144unmfzAe+cPu7ftVzQ4wP4ftq1B9RDRNp PHMQ== X-Forwarded-Encrypted: i=1; AJvYcCVFeuSa/0SxuyeGvI7WY8DA3+FNhhPcnLvJgedIQZbY5bkQV/goSoEUsxxrzEgwxUA7JzxBRCoEciPjCU4=@vger.kernel.org X-Gm-Message-State: AOJu0YzropdMURhzNZ8x4ZoG/byYQEZfM+KZbBsIjw8hui7w4+yQP5ZS MVSma9o+Uuyf43nLKkzZ0DMuioIISirv1aFKJ5Ii75T1rp48TGrhIHLO X-Gm-Gg: AZuq6aLV1XHGsBggz8pWm0yhtgBTUg1RiO0zjX8BoS78RdBqzKrX6ayev2XRuM3/sa1 Kvh9v4BoOhuel7q0YYZ6YLaIB+I1uXqakhmdU8vrqHVkEnHpegfqGuX3FIyp5m20nxulvn35Xq1 ecsc2xrfi5DFhloTar26bpQ6Lt2ZPQwgHoW/KQCSkdBCg9EI3+4dsEqlu3q2JSTsz8atd/DFgYa yX/JwCNq4CC7J/yH+8ThRjbJnP+kvXvsuf/zhnFTcaC4BJA4euveF+QYzpPeJ9Omtjx+QFj2SaQ FnhxzyoojaTJWFyX8P/+OW21TfCDU7OJFsF80XWnmJc/bXCvJfLIMfFy3aFyhOmmphBfpQTkPK/ 3Di+W4wWrcZbXK87Mw5QGab4geBxvcAbkxddbY1gJnM8DaAZ2SfcuEBbYqSHMBaJWUbimarMULi jYyZq2VawOQ46oOoYQZTah/BGT7FDysxgEZgehYuQ23kak0bMeOqRsm3zHYCOIzwqm X-Received: by 2002:a17:90b:57d0:b0:34c:3501:d11c with SMTP id 98e67ed59e1d1-353feda5540mr250569a91.37.1769479760153; Mon, 26 Jan 2026 18:09:20 -0800 (PST) Received: from d.home.mmyangfl.tk ([2001:19f0:8001:1644:5400:5ff:fe3e:12b1]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-353f613fc36sm693540a91.10.2026.01.26.18.09.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jan 2026 18:09:19 -0800 (PST) From: David Yang To: netdev@vger.kernel.org Cc: David Yang , Andrew Lunn , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Russell King , linux-kernel@vger.kernel.org Subject: [PATCH net-next v4 4/4] net: dsa: yt921x: Add DCB/QoS support Date: Tue, 27 Jan 2026 10:08:01 +0800 Message-ID: <20260127020847.1482724-5-mmyangfl@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260127020847.1482724-1-mmyangfl@gmail.com> References: <20260127020847.1482724-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" Set up global DSCP/PCP priority mappings and add related DCB methods. Signed-off-by: David Yang --- drivers/net/dsa/Kconfig | 1 + drivers/net/dsa/yt921x.c | 249 ++++++++++++++++++++++++++++++++++++++- drivers/net/dsa/yt921x.h | 55 +++++++-- 3 files changed, 294 insertions(+), 11 deletions(-) diff --git a/drivers/net/dsa/Kconfig b/drivers/net/dsa/Kconfig index 7eb301fd987d..24c37cbf70d7 100644 --- a/drivers/net/dsa/Kconfig +++ b/drivers/net/dsa/Kconfig @@ -158,6 +158,7 @@ config NET_DSA_VITESSE_VSC73XX_PLATFORM config NET_DSA_YT921X tristate "Motorcomm YT9215 ethernet switch chip support" select NET_DSA_TAG_YT921X + select NET_IEEE8021Q_HELPERS if DCB help This enables support for the Motorcomm YT9215 ethernet switch chip. diff --git a/drivers/net/dsa/yt921x.c b/drivers/net/dsa/yt921x.c index 9ac0e4e236c6..0383cc28ac67 100644 --- a/drivers/net/dsa/yt921x.c +++ b/drivers/net/dsa/yt921x.c @@ -8,6 +8,7 @@ * Copyright (c) 2025 David Yang */ =20 +#include #include #include #include @@ -18,8 +19,11 @@ #include #include #include +#include =20 #include +#include +#include =20 #include "yt921x.h" =20 @@ -1773,8 +1777,11 @@ yt921x_port_set_vlan_aware(struct yt921x_priv *priv,= int port, bool vlan_aware) { u32 ctrl; =20 + /* Abuse SVLAN for PCP parsing without polluting the FDB - it just works + * despite YT921X_VLAN_CTRL_SVLAN_EN never being set + */ if (!vlan_aware) - ctrl =3D 0; + ctrl =3D YT921X_PORT_IGR_TPIDn_STAG(0); else ctrl =3D YT921X_PORT_IGR_TPIDn_CTAG(0); return yt921x_reg_write(priv, YT921X_PORTn_IGR_TPID(port), ctrl); @@ -2396,6 +2403,122 @@ yt921x_dsa_port_stp_state_set(struct dsa_switch *ds= , int port, u8 state) port, res); } =20 +static int __maybe_unused +yt921x_dsa_port_get_default_prio(struct dsa_switch *ds, int port) +{ + struct yt921x_priv *priv =3D to_yt921x_priv(ds); + u32 val; + int res; + + mutex_lock(&priv->reg_lock); + res =3D yt921x_reg_read(priv, YT921X_PORTn_QOS(port), &val); + mutex_unlock(&priv->reg_lock); + + if (res) + return res; + + return FIELD_GET(YT921X_PORT_QOS_PRIO_M, val); +} + +static int __maybe_unused +yt921x_dsa_port_set_default_prio(struct dsa_switch *ds, int port, u8 prio) +{ + struct yt921x_priv *priv =3D to_yt921x_priv(ds); + u32 mask; + u32 ctrl; + int res; + + if (prio >=3D YT921X_PRIO_NUM) + return -EINVAL; + + mutex_lock(&priv->reg_lock); + mask =3D YT921X_PORT_QOS_PRIO_M | YT921X_PORT_QOS_PRIO_EN; + ctrl =3D YT921X_PORT_QOS_PRIO(prio) | YT921X_PORT_QOS_PRIO_EN; + res =3D yt921x_reg_update_bits(priv, YT921X_PORTn_QOS(port), mask, ctrl); + mutex_unlock(&priv->reg_lock); + + return res; +} + +static int __maybe_unused appprios_cmp(const void *a, const void *b) +{ + return ((const u8 *)b)[1] - ((const u8 *)a)[1]; +} + +static int __maybe_unused +yt921x_dsa_port_get_apptrust(struct dsa_switch *ds, int port, u8 *sel, + int *nselp) +{ + struct yt921x_priv *priv =3D to_yt921x_priv(ds); + u8 appprios[2][2] =3D {}; + int nsel; + u32 val; + int res; + + mutex_lock(&priv->reg_lock); + res =3D yt921x_reg_read(priv, YT921X_PORTn_PRIO_ORD(port), &val); + mutex_unlock(&priv->reg_lock); + + if (res) + return res; + + appprios[0][0] =3D IEEE_8021QAZ_APP_SEL_DSCP; + appprios[0][1] =3D (val >> (3 * YT921X_APP_SEL_DSCP)) & 7; + appprios[1][0] =3D DCB_APP_SEL_PCP; + appprios[1][1] =3D (val >> (3 * YT921X_APP_SEL_CVLAN_PCP)) & 7; + sort(appprios, ARRAY_SIZE(appprios), sizeof(appprios[0]), appprios_cmp, + NULL); + + nsel =3D 0; + for (int i =3D 0; i < ARRAY_SIZE(appprios) && appprios[i][1]; i++) { + sel[nsel] =3D appprios[i][0]; + nsel++; + } + *nselp =3D nsel; + + return 0; +} + +static int __maybe_unused +yt921x_dsa_port_set_apptrust(struct dsa_switch *ds, int port, const u8 *se= l, + int nsel) +{ + struct yt921x_priv *priv =3D to_yt921x_priv(ds); + struct device *dev =3D to_device(priv); + u32 ctrl; + int res; + + if (nsel > YT921X_APP_SEL_NUM) + return -EINVAL; + + ctrl =3D 0; + for (int i =3D 0; i < nsel; i++) { + switch (sel[i]) { + case IEEE_8021QAZ_APP_SEL_DSCP: + ctrl |=3D YT921X_PORT_PRIO_ORD_APPm(YT921X_APP_SEL_DSCP, + 7 - i); + break; + case DCB_APP_SEL_PCP: + ctrl |=3D YT921X_PORT_PRIO_ORD_APPm(YT921X_APP_SEL_CVLAN_PCP, + 7 - i); + ctrl |=3D YT921X_PORT_PRIO_ORD_APPm(YT921X_APP_SEL_SVLAN_PCP, + 7 - i); + break; + default: + dev_err(dev, + "Invalid apptrust selector (at %d-th). Supported: dscp, pcp\n", + i + 1); + return -EOPNOTSUPP; + } + } + + mutex_lock(&priv->reg_lock); + res =3D yt921x_reg_write(priv, YT921X_PORTn_PRIO_ORD(port), ctrl); + mutex_unlock(&priv->reg_lock); + + return res; +} + static int yt921x_port_down(struct yt921x_priv *priv, int port) { u32 mask; @@ -2721,6 +2844,13 @@ static int yt921x_port_setup(struct yt921x_priv *pri= v, int port) if (res) return res; =20 + /* Clear prio order (even if DCB is not enabled) to avoid unsolicited + * priorities + */ + res =3D yt921x_reg_write(priv, YT921X_PORTn_PRIO_ORD(port), 0); + if (res) + return res; + if (dsa_is_cpu_port(ds, port)) { /* Egress of CPU port is supposed to be completely controlled * via tagging, so set to oneway isolated (drop all packets @@ -2764,6 +2894,66 @@ static int yt921x_dsa_port_setup(struct dsa_switch *= ds, int port) return res; } =20 +/* Not "port" - DSCP mapping is global */ +static int __maybe_unused +yt921x_dsa_port_get_dscp_prio(struct dsa_switch *ds, int port, u8 dscp) +{ + struct yt921x_priv *priv =3D to_yt921x_priv(ds); + u32 val; + int res; + + mutex_lock(&priv->reg_lock); + res =3D yt921x_reg_read(priv, YT921X_IPM_DSCPn(dscp), &val); + mutex_unlock(&priv->reg_lock); + + if (res) + return res; + + return FIELD_GET(YT921X_IPM_PRIO_M, val); +} + +static int __maybe_unused +yt921x_dsa_port_del_dscp_prio(struct dsa_switch *ds, int port, u8 dscp, u8= prio) +{ + struct yt921x_priv *priv =3D to_yt921x_priv(ds); + u32 val; + int res; + + mutex_lock(&priv->reg_lock); + /* During a "dcb app replace" command, the new app table entry will be + * added first, then the old one will be deleted. But the hardware only + * supports one QoS class per DSCP value (duh), so if we blindly delete + * the app table entry for this DSCP value, we end up deleting the + * entry with the new priority. Avoid that by checking whether user + * space wants to delete the priority which is currently configured, or + * something else which is no longer current. + */ + res =3D yt921x_reg_read(priv, YT921X_IPM_DSCPn(dscp), &val); + if (!res && FIELD_GET(YT921X_IPM_PRIO_M, val) =3D=3D prio) + res =3D yt921x_reg_write(priv, YT921X_IPM_DSCPn(dscp), + YT921X_IPM_PRIO(IEEE8021Q_TT_BK)); + mutex_unlock(&priv->reg_lock); + + return res; +} + +static int __maybe_unused +yt921x_dsa_port_add_dscp_prio(struct dsa_switch *ds, int port, u8 dscp, u8= prio) +{ + struct yt921x_priv *priv =3D to_yt921x_priv(ds); + int res; + + if (prio >=3D YT921X_PRIO_NUM) + return -EINVAL; + + mutex_lock(&priv->reg_lock); + res =3D yt921x_reg_write(priv, YT921X_IPM_DSCPn(dscp), + YT921X_IPM_PRIO(prio)); + mutex_unlock(&priv->reg_lock); + + return res; +} + static int yt921x_edata_wait(struct yt921x_priv *priv, u32 *valp) { u32 val =3D YT921X_EDATA_DATA_IDLE; @@ -2976,6 +3166,43 @@ static int yt921x_chip_setup_dsa(struct yt921x_priv = *priv) return 0; } =20 +static int __maybe_unused yt921x_chip_setup_qos(struct yt921x_priv *priv) +{ + u32 ctrl; + int res; + + /* 802.1Q QoS to internal priorities */ + for (u8 pcp =3D 0; pcp < 8; pcp++) + for (u8 dei =3D 0; dei < 2; dei++) { + ctrl =3D YT921X_IPM_PRIO(pcp); + if (dei) + ctrl |=3D YT921X_IPM_COLOR_RED; + + for (u8 svlan =3D 0; svlan < 2; svlan++) { + u32 reg =3D YT921X_IPM_PCPn(svlan, dei, pcp); + + res =3D yt921x_reg_write(priv, reg, ctrl); + if (res) + return res; + } + } + + /* DSCP to internal priorities */ + for (u8 dscp =3D 0; dscp < DSCP_MAX; dscp++) { + int prio =3D ietf_dscp_to_ieee8021q_tt(dscp); + + if (prio < 0) + return prio; + + res =3D yt921x_reg_write(priv, YT921X_IPM_DSCPn(dscp), + YT921X_IPM_PRIO(prio)); + if (res) + return res; + } + + return 0; +} + static int yt921x_chip_setup(struct yt921x_priv *priv) { u32 ctrl; @@ -2990,6 +3217,12 @@ static int yt921x_chip_setup(struct yt921x_priv *pri= v) if (res) return res; =20 +#if IS_ENABLED(CONFIG_DCB) + res =3D yt921x_chip_setup_qos(priv); + if (res) + return res; +#endif + /* Clear MIB */ ctrl =3D YT921X_MIB_CTRL_CLEAN | YT921X_MIB_CTRL_ALL_PORT; res =3D yt921x_reg_write(priv, YT921X_MIB_CTRL, ctrl); @@ -3105,10 +3338,23 @@ static const struct dsa_switch_ops yt921x_dsa_switc= h_ops =3D { .port_mst_state_set =3D yt921x_dsa_port_mst_state_set, .vlan_msti_set =3D yt921x_dsa_vlan_msti_set, .port_stp_state_set =3D yt921x_dsa_port_stp_state_set, +#if IS_ENABLED(CONFIG_DCB) + /* dcb */ + .port_get_default_prio =3D yt921x_dsa_port_get_default_prio, + .port_set_default_prio =3D yt921x_dsa_port_set_default_prio, + .port_get_apptrust =3D yt921x_dsa_port_get_apptrust, + .port_set_apptrust =3D yt921x_dsa_port_set_apptrust, +#endif /* port */ .get_tag_protocol =3D yt921x_dsa_get_tag_protocol, .phylink_get_caps =3D yt921x_dsa_phylink_get_caps, .port_setup =3D yt921x_dsa_port_setup, +#if IS_ENABLED(CONFIG_DCB) + /* dscp */ + .port_get_dscp_prio =3D yt921x_dsa_port_get_dscp_prio, + .port_del_dscp_prio =3D yt921x_dsa_port_del_dscp_prio, + .port_add_dscp_prio =3D yt921x_dsa_port_add_dscp_prio, +#endif /* chip */ .setup =3D yt921x_dsa_setup, }; @@ -3175,6 +3421,7 @@ static int yt921x_mdio_probe(struct mdio_device *mdio= dev) ds =3D &priv->ds; ds->dev =3D dev; ds->assisted_learning_on_cpu_port =3D true; + ds->dscp_prio_mapping_is_global =3D true; ds->priv =3D priv; ds->ops =3D &yt921x_dsa_switch_ops; ds->ageing_time_min =3D 1 * 5000; diff --git a/drivers/net/dsa/yt921x.h b/drivers/net/dsa/yt921x.h index bacd4ccaa8e5..3f129b8d403f 100644 --- a/drivers/net/dsa/yt921x.h +++ b/drivers/net/dsa/yt921x.h @@ -269,6 +269,38 @@ #define YT921X_TPID_EGRn(x) (0x100300 + 4 * (x)) /* [0, 3] */ #define YT921X_TPID_EGR_TPID_M GENMASK(15, 0) =20 +#define YT921X_IPM_DSCPn(n) (0x180000 + 4 * (n)) /* Internal Priority Map= */ +#define YT921X_IPM_PCPn(map, dei, pcp) (0x180100 + 4 * (16 * (map) + 8 * (= dei) + (pcp))) +#define YT921X_IPM_PRIO_M GENMASK(4, 2) +#define YT921X_IPM_PRIO(x) FIELD_PREP(YT921X_IPM_PRIO_M, (x)) +#define YT921X_IPM_COLOR_M GENMASK(1, 0) +#define YT921X_IPM_COLOR(x) FIELD_PREP(YT921X_IPM_COLOR_M, (x)) +#define YT921X_IPM_COLOR_GREEN YT921X_IPM_COLOR(0) +#define YT921X_IPM_COLOR_YELLOW YT921X_IPM_COLOR(1) +#define YT921X_IPM_COLOR_RED YT921X_IPM_COLOR(2) +#define YT921X_PORTn_QOS(port) (0x180180 + 4 * (port)) +#define YT921X_PORT_QOS_CVLAN_PRIO_MAP_ID BIT(5) +#define YT921X_PORT_QOS_SVLAN_PRIO_MAP_ID BIT(4) +#define YT921X_PORT_QOS_PRIO_M GENMASK(3, 1) +#define YT921X_PORT_QOS_PRIO(x) FIELD_PREP(YT921X_PORT_QOS_PRIO_M, (x)) +#define YT921X_PORT_QOS_PRIO_EN BIT(0) +#define YT921X_PORTn_PRIO_ORD(port) (0x180200 + 4 * (port)) +#define YT921X_PORT_PRIO_ORD_APPm_M(m) GENMASK(3 * (m) + 2, 3 * (m)) +#define YT921X_PORT_PRIO_ORD_APPm(m, x) ((x) << (3 * (m))) /* 0: disabl= ed, except PORT_QOS_PRIO */ + +enum yt921x_app_selector { + YT921X_APP_SEL_MAC_SA, + YT921X_APP_SEL_MAC_DA, + YT921X_APP_SEL_VID, + YT921X_APP_SEL_ACL, + YT921X_APP_SEL_DSCP, + YT921X_APP_SEL_CVLAN_PCP, + YT921X_APP_SEL_SVLAN_PCP, + /* The physical port, i.e. YT921X_PORT_QOS_PRIO */ + YT921X_APP_SEL_PORT, + YT921X_APP_SEL_NUM +}; + #define YT921X_VLAN_IGR_FILTER 0x180280 #define YT921X_VLAN_IGR_FILTER_PORTn_BYPASS_IGMP(port) BIT((port) + 11) #define YT921X_VLAN_IGR_FILTER_PORTn(port) BIT(port) @@ -337,7 +369,7 @@ #define YT921X_FDB_OUT0 0x1804b0 #define YT921X_FDB_IO0_ADDR_HI4_M GENMASK(31, 0) #define YT921X_FDB_OUT1 0x1804b4 -#define YT921X_FDB_IO1_EGR_INT_PRI_EN BIT(31) +#define YT921X_FDB_IO1_EGR_PRIO_EN BIT(31) #define YT921X_FDB_IO1_STATUS_M GENMASK(30, 28) #define YT921X_FDB_IO1_STATUS(x) FIELD_PREP(YT921X_FDB_IO1_STATUS_M, (= x)) #define YT921X_FDB_IO1_STATUS_INVALID YT921X_FDB_IO1_STATUS(0) @@ -356,9 +388,9 @@ #define YT921X_FDB_IO2_EGR_PORTS(x) FIELD_PREP(YT921X_FDB_IO2_EGR_PORT= S_M, (x)) #define YT921X_FDB_IO2_EGR_DROP BIT(17) #define YT921X_FDB_IO2_COPY_TO_CPU BIT(16) -#define YT921X_FDB_IO2_IGR_INT_PRI_EN BIT(15) -#define YT921X_FDB_IO2_INT_PRI_M GENMASK(14, 12) -#define YT921X_FDB_IO2_INT_PRI(x) FIELD_PREP(YT921X_FDB_IO2_INT_PRI_M,= (x)) +#define YT921X_FDB_IO2_IGR_PRIO_EN BIT(15) +#define YT921X_FDB_IO2_PRIO_M GENMASK(14, 12) +#define YT921X_FDB_IO2_PRIO(x) FIELD_PREP(YT921X_FDB_IO2_PRIO_M, (x)) #define YT921X_FDB_IO2_NEW_VID_M GENMASK(11, 0) #define YT921X_FDB_IO2_NEW_VID(x) FIELD_PREP(YT921X_FDB_IO2_NEW_VID_M,= (x)) #define YT921X_FILTER_UNK_UCAST 0x180508 @@ -406,8 +438,9 @@ #define YT921X_VLAN_CTRL_FID_M GENMASK_ULL(34, 23) #define YT921X_VLAN_CTRL_FID(x) FIELD_PREP(YT921X_VLAN_CTRL_FID_M, (x)) #define YT921X_VLAN_CTRL_LEARN_DIS BIT_ULL(22) -#define YT921X_VLAN_CTRL_INT_PRI_EN BIT_ULL(21) -#define YT921X_VLAN_CTRL_INT_PRI_M GENMASK_ULL(20, 18) +#define YT921X_VLAN_CTRL_PRIO_EN BIT_ULL(21) +#define YT921X_VLAN_CTRL_PRIO_M GENMASK_ULL(20, 18) +#define YT921X_VLAN_CTRL_PRIO(x) FIELD_PREP(YT921X_VLAN_CTRL_PRIO_M, (= x)) #define YT921X_VLAN_CTRL_PORTS_M GENMASK_ULL(17, 7) #define YT921X_VLAN_CTRL_PORTS(x) FIELD_PREP(YT921X_VLAN_CTRL_PORTS_M,= (x)) #define YT921X_VLAN_CTRL_PORTn(port) BIT_ULL((port) + 7) @@ -433,14 +466,14 @@ #define YT921X_LAG_HASH_SRC_PORT BIT(0) =20 #define YT921X_PORTn_VLAN_CTRL(port) (0x230010 + 4 * (port)) -#define YT921X_PORT_VLAN_CTRL_SVLAN_PRI_EN BIT(31) -#define YT921X_PORT_VLAN_CTRL_CVLAN_PRI_EN BIT(30) +#define YT921X_PORT_VLAN_CTRL_SVLAN_PRIO_EN BIT(31) +#define YT921X_PORT_VLAN_CTRL_CVLAN_PRIO_EN BIT(30) #define YT921X_PORT_VLAN_CTRL_SVID_M GENMASK(29, 18) #define YT921X_PORT_VLAN_CTRL_SVID(x) FIELD_PREP(YT921X_PORT_VLAN_CTRL= _SVID_M, (x)) #define YT921X_PORT_VLAN_CTRL_CVID_M GENMASK(17, 6) #define YT921X_PORT_VLAN_CTRL_CVID(x) FIELD_PREP(YT921X_PORT_VLAN_CTRL= _CVID_M, (x)) -#define YT921X_PORT_VLAN_CTRL_SVLAN_PRI_M GENMASK(5, 3) -#define YT921X_PORT_VLAN_CTRL_CVLAN_PRI_M GENMASK(2, 0) +#define YT921X_PORT_VLAN_CTRL_SVLAN_PRIO_M GENMASK(5, 3) +#define YT921X_PORT_VLAN_CTRL_CVLAN_PRIO_M GENMASK(2, 0) #define YT921X_PORTn_VLAN_CTRL1(port) (0x230080 + 4 * (port)) #define YT921X_PORT_VLAN_CTRL1_VLAN_RANGE_EN BIT(8) #define YT921X_PORT_VLAN_CTRL1_VLAN_RANGE_PROFILE_ID_M GENMASK(7, 4) @@ -478,6 +511,8 @@ enum yt921x_fdb_entry_status { #define YT921X_LAG_NUM 2 #define YT921X_LAG_PORT_NUM 4 =20 +#define YT921X_PRIO_NUM 8 + #define YT9215_MAJOR 0x9002 #define YT9218_MAJOR 0x9001 =20 --=20 2.51.0