From nobody Sat Feb 7 18:28:49 2026 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (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 AE8A033B6CE for ; Wed, 28 Jan 2026 21:52:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769637139; cv=none; b=uTDrjZZiJbp0KxV1McQqTgho5N4nnoulh6o/v+b2zIVNCdFM5bhJChd1URxXaPdldJe/2geCW4ockpy1E+TrnpByMIBI1kszUVil91Xx5ZJ1PvTOptrjHfwqrJZUt+xEp7/iy9okpndB1wfrTOUc5iL+hPUQGCCJdrndOriUXn4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769637139; c=relaxed/simple; bh=0t0dl3v9CeZspqERK8OCxRJsZj/7BPyDqzX+ailEm5Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nd8pAuXDuqTCwxyCAUeJ14bKrhIx7jitWGZth5fDBizGGx7HZHL9N6lufwCEuDKi2e5ZbpvBTFEU9yeqbDgsty8TxOPQFe2voCxFbH06NVQpwcyPmaFKRiTMDi3mg4phJYmv8EjXlkY3s1DkdN/jKgihanemKs7zw3oLus9Pbj4= 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=HgMgVKRg; arc=none smtp.client-ip=209.85.214.174 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="HgMgVKRg" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-29f2676bb21so2171605ad.0 for ; Wed, 28 Jan 2026 13:52:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769637137; x=1770241937; 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=HgMgVKRg/uobXisMNwVvZ/2CZHeAGS05BpCAalSW3gyNa6eBSBkY50hX8nY1KcIS31 9GHWpj1AmG8nSv1vMvSkOyJ7082V8TrE6CTRPzRBqTRfz3NDzQU+jHs0hS4J0DM06GLl KnUNetnS8p1qaIEtOSBfhQVULuinE2QP/RnqmGke8ivIhDNfluTpxsZe4ASsVhKpequD V3Yma48iBtJHJaf3wdbqd+AuZvmMD4P5b0fjoawJN8fqE8/OHOLdtVA055ZVRUnEN244 2zfoFptmSze3UlGYj3mYOODqpv6SRJYYyUZaGdPrtc0dprswmqx0cPRho7qjjO4z6kHg yqBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769637137; x=1770241937; 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=duzGJR6LWItt3yiZNS0C+z2oLScqay7VZ2+hkGYIMuevTOupexgsgYOUqXKsbH6L+l wzdCBJVgdg8fKoQp2ZZjlEeb3RQ3NKfwMqfG7ZzzAn5aVl1vVU9lOVrSdeGCi3CTtV2J XWioYgI71fS1Xh61MX99M70zlqtNMOvjOJ4wo1JQCCQGGK93O12xcw+w+O8UiryfK4pG 16hw4ifutuhK56iHNInymzpwUANlID9uW6uVRBFXJVh2j2aZnwcysM/HiFFto9i4s4F1 gNRM2+HWAqgOE/dkoedHMozB/kttzbH46YeXfjb9RF/whMMqqeuaqGRKOtCnkZt4SwOP NpWg== X-Forwarded-Encrypted: i=1; AJvYcCVDKhafgUTqC4A92W3uUv1Tcjyja8oOfBzOYt3INWIGyxLziUAjH3Z4c8uQw6dtlQ7ZuMSiuV1SWusRgx8=@vger.kernel.org X-Gm-Message-State: AOJu0YwNk64UwlaWSY0m8mzZTnWNR242QZTuKdEhZry1xTLai6IHu95O tqbFwHlftQn8s7PYqQj9D3bPhFswUzv/5MtNjaRrKbIh7jdxE0VzVstnDJViD+vC X-Gm-Gg: AZuq6aJonpN7BkUvLIBpy5zsaypznWBhfWqKm78bSDMh4cIgYHyrwn6mZ4W80tP/t2D m4++AXTxX5baaLMnafi6hYMd5ORYWOXdE/B9a6AI7GzfRb0Q7GtKk0mFvgwEAfexAV0gE9jeMsx LUXrGLRB0PupdWRhEZ/9u95cSa+juGOTiVtt+/9Npe2l11LrJ+9AzjSP7ZinVfM8KnqnSoEbcQt 2Icq1mTJ9dNUpoX7wmr+nOzSWNhgAWRsyWekWfsvzFQmV2MPozDJ+koiO7jy+rT+hWdyYjJCh9K pSxnwOANQ/9EXhsb4qEGO1qYvTfKX71SOLq5uQ/vhB4frUqIiYRTPi2GXq8U91RGF7dtjIA4fQ7 DkDIxcQxe4FE2Tjq6BNnXRz3V/KZtnOfY/sCbupHNF1S6tLLtr0kyR2oC6PfNVzlBEheZNRygFq TNrLNQ1vt58sGpRXUFEDnvd6hD8WbC/lCQshg= X-Received: by 2002:a17:902:ef52:b0:2a7:d7b8:7672 with SMTP id d9443c01a7336-2a870d4d015mr63211595ad.4.1769637137074; Wed, 28 Jan 2026 13:52:17 -0800 (PST) Received: from d.home.mmyangfl.tk ([2a09:bac1:7680:d30::4:384]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a88b6e4317sm31576155ad.85.2026.01.28.13.52.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jan 2026 13:52:16 -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 v5 1/4] net: dsa: tag_yt921x: fix priority support Date: Thu, 29 Jan 2026 05:51:53 +0800 Message-ID: <20260128215202.2244266-2-mmyangfl@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260128215202.2244266-1-mmyangfl@gmail.com> References: <20260128215202.2244266-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 18:28:49 2026 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (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 CE4A433C19C for ; Wed, 28 Jan 2026 21:52:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769637142; cv=none; b=FCN1ZA62YXijT1qOq0qmVDyOYzOSitw5geRY0KGUrPN3VLSqPyiaZsamFANLbxMk2I59+ixMKLoLo1wFU2iSo1jrIJ39j9kD5/NHxqfH5KWgE/gWR5mcu6FZiO9gIzaDL849BKjYTrX5imhxjtjyFReh5ju3iZKB+G5L1Q16/J8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769637142; c=relaxed/simple; bh=WIqyFR60WtQvFjGxnMQyotcdEzYgUqTwZe+r3///1LY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Wn2wq0C7+rr4O/odgtfi45pHPOG14zVrWJkOKpIAotSXQcezfDyOPdSaqq2vSkqqMR3ZRcY0VqkKkMaNSr9pXnEU6fXHoU4F4pRdUv0YwdihFacVkzTbAFUmYbDGLpoEF2EALmZqFhT53sZPUMbWIY5QWiotV6F6aORERa439Rk= 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=kcbGtuUP; arc=none smtp.client-ip=209.85.214.174 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="kcbGtuUP" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2a07fac8aa1so1666885ad.1 for ; Wed, 28 Jan 2026 13:52:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769637140; x=1770241940; 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=KMbe85OGEE7zlHitn1goifPts6HC3d5wce34lH15J58=; b=kcbGtuUPWwYezukvZUuZW2C59amJ8sE/yRCt5nvymKBN4VmWW1yAh3WBZ9IgdVXf9B 3Y47Ex4Nn2diXaRvcFbg+EuXCO/JryD03SiozPjekuTdcbfwBN6pKeb7Lc6b8G9okvW3 /LNdE6ceE4dwFbWJigYYn5b8e1rydNYd7/sTk1mQpmDBkJYticwoWUoJVtDsdmHCqujG s63Z8WG8tTu45aaR1tRPTOhXg6fyobM/Nz2ZcYOSQmIccKr8N9zBWYP4tM3ZGl1EYppr cAJsaFTC/RejaJ1AAS4cJQkP2AV0LpJCtaO64q16Z6rl0drR84VIGqa8A4xDdk0qkNUC W5CA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769637140; x=1770241940; 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=KMbe85OGEE7zlHitn1goifPts6HC3d5wce34lH15J58=; b=ViLVkHMkANPYrBshL7UBIpyOO+96gmhNJot4bA2P1MPTF4/8YplngP0WoVnB5oXDjO 3Kyv2Gi7vSg63uK7F1GBNEs58ccgC+lupnWYmpWmIBs9jcKzaPYBJZbBSTlOOeG3KqLc EjAIaT+iDBkvZPf8OQwyJCqb629wSxC+xOLYGKmPwO+XygNJ9I8cTr2ZibdzSpQ23aYu kEo2PIHXyCsil5QRlAzwCQVR/7xL4dAQbQW1zTaF4rSbzhO6fthAsKtg3O9BQvlSpQtP Qtk28qUupkGh75W+rysh/7OX3QojAmFPDg50Muv8bCGoN+PP/7bYGoWnQVUjcEIvK3OS T1ZQ== X-Forwarded-Encrypted: i=1; AJvYcCVY/9qFuBTgg23WZJDIQOjtJzTfae3v842oP0WCV5apEvNj9j38CJ9Dtnp0AMe9O+gXVi8UNP0Ce1exIlE=@vger.kernel.org X-Gm-Message-State: AOJu0YzgziYg7stVYYzyseKTZro5x1l7Fbv8Whqr/nLYvhfHCiO0duFb ojMEk1l+xsA2cRGd69WII6iz8sWq3wwZytO7MWUZ4Ec+f4U26Go6pL80 X-Gm-Gg: AZuq6aLssFelFVsfm/8HFjMykBsWBEVVmM/5dHLrIXULRTnxorAPHKMpfFDAQNN2KQN z3SBUCuRUkD2LX4PgV3vxuseocqDq3NgQ6mJTCFvwlMLy/FPCqBL9uzK7Dk8H7LRbwBeBDX395J ZtFHSO+4htWcqPMkxm1mIpV1kKKYUMWlOdrkDQ52wR4ahdksboAOQxA1r2i1kukJN4FZI0nJ1UR f8P8xY8scN3kEEN83h8400Kj6taBrFNvBfWhi02oby+7LTfutaPscdPGTK/V8vJ/qdQd0wqAXkp 8ZmUsNVwnCPbQ4cNqPHjI4EzzMzI+G34VxBnlgU8jHz4RKPTKLrApTW6LzWgeLho5ZPAb3Ueg9V PoKHA0F/pYJFBzR7GZpk2CFnqzEQ8kRiOCUQRORdfr3xq+h1D2Ngb3B/JR+SKMKba4aFCTwGmge XhxGBzbGQh48r+FD5rXvSdkUabkFxjpevZnVI= X-Received: by 2002:a17:902:d4c8:b0:2a7:d5c0:c659 with SMTP id d9443c01a7336-2a870d40ab5mr65015505ad.5.1769637140072; Wed, 28 Jan 2026 13:52:20 -0800 (PST) Received: from d.home.mmyangfl.tk ([2a09:bac1:7680:d30::4:384]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a88b6e4317sm31576155ad.85.2026.01.28.13.52.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jan 2026 13:52: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 v5 2/4] net: dsa: yt921x: Refactor VLAN awareness setting Date: Thu, 29 Jan 2026 05:51:54 +0800 Message-ID: <20260128215202.2244266-3-mmyangfl@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260128215202.2244266-1-mmyangfl@gmail.com> References: <20260128215202.2244266-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 | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/drivers/net/dsa/yt921x.c b/drivers/net/dsa/yt921x.c index a4b346ddf8dd..ef9048b904ab 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_vlan_aware_set(struct yt921x_priv *priv, int port, bool vlan_aware) +{ + 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) { @@ -1817,14 +1829,7 @@ yt921x_vlan_filtering(struct yt921x_priv *priv, int = port, bool vlan_filtering) if (res) 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_vlan_aware_set(priv, port, vlan_filtering); if (res) return res; =20 @@ -2021,8 +2026,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_vlan_aware_set(priv, port, false); if (res) return res; =20 --=20 2.51.0 From nobody Sat Feb 7 18:28:49 2026 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (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 DDED116DC28 for ; Wed, 28 Jan 2026 21:52:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769637145; cv=none; b=opu6uKqwEg2LsPIm+53Tprgt39siiO6Xf7wnbUzo8vuA3bZCMpHiR057iqyNgqTJPGAr1JyGieaXFnrIRxiXjzTEFem970pi9FLsg+PmCv8E39gsa8iAWOpmv5lF8FS6cm271aP6EvLoK4EkDOu/jsdaoxpK+U1VhEn/Jlq4lGk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769637145; c=relaxed/simple; bh=oaKYUxuLnfKa0XbLlzcnsjYgUmDbWBbOM8jS1Hbn1Rk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=vAEYTkAg15x6qna8yfNENWisCZuCvrDxgW4a5Nw5tL+pC3Le5aJ3yyF3KUYTLvkXbCGIhHX8myBr7021HG7sS1dOffWwftSRpBKmysq2CKBpFC7MSrC+QO6R8lDXVpkXAMLV99gfXRvys8EMVe32wlvXBwECn6d/pXdDZ9CXJDI= 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=MVkFyuH/; arc=none smtp.client-ip=209.85.214.181 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="MVkFyuH/" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-2a09a3bd9c5so1640125ad.3 for ; Wed, 28 Jan 2026 13:52:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769637143; x=1770241943; 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=bMTrzu5hSLCA2plrTyP1x2jCu/VUChRHqXUHm8mbcHo=; b=MVkFyuH/zOaievfsNA32xi60ptuqBiptsSY2FXnaoNTLWJeNJU8vWwSpl+in/Qx05a id51BYW9ehSUM3E+6Ml9iuPuAMzxLmsEfHvPCf5zDeb2m7KDlAbe0D6ee7TCVajU9MRr S5bjG/mRRige4pN5hQd9nEd9dWaqnNuoquSewfjt7td4dLttQz3+LeJTw+LfRx2028Zx XTgCMvk187DNQXlOxsmSfbLRymNlA0Oji6H/MVFMbjkAm3VOMmvSa4t0+BoVPEJ1ln5C gtvdBSu+OhxLD8vnDx7WZ1vQRGKZe3UjdSYRjqm2nx6bE2liQ2eDWc04tf44LFHwLbmf fwWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769637143; x=1770241943; 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=bMTrzu5hSLCA2plrTyP1x2jCu/VUChRHqXUHm8mbcHo=; b=O1zVdaF6PqNzLSYrmCQjZxzhEsxEORxA9QwOJ1Rdor/TLLJOd4Jsza+A3DZ1u93HXT HzLi2+tjPRATd5MRxnuaaq94MxapWK+IwSgSG/Flqf/k9tjYK62PdoAWJmQGtk5FvvDI vjv5bAADCnGny8LIt+95nDYYHceFz3vgdePhBhINAe5DKrIaAVUpXPk+8hVp83fr7P5b PtLy0RVM2fpIMUnGjDLgG8QEIAslrtvoyJAkYVUrISVd1ykhWZH3EvY7AZIpvsmjJhLg pGKKULBAFwb1CANBRsfketM+j+vLWaGcUdMYuoWlLnGqB3d/WV1w8FNgRfIO//G/yIS6 rnSQ== X-Forwarded-Encrypted: i=1; AJvYcCX4q2qNFrUfnTmNuj3ZWqhuLfgqcPU76PHr6gOX6L3HGj/uPwT7LgxJznPLYnGni6BvG6vmbMVgdp4Fa9A=@vger.kernel.org X-Gm-Message-State: AOJu0YxxpCIA83kRiow42pGRHNZUrLVnYs5igO11ljR4QEgXtydqzvH2 PkXbIKij4kh//WIZbKEtefXZ/DHMlAjC9YAcyxid4+SoPk6D7+3PNI1x X-Gm-Gg: AZuq6aLSYTWX10pIDGp2uSm4MhT39srjxfU/iRPztcp5nBb1qtX5jES2NRfA72yf5BQ LuOul0aZstGa2E7E4zEOEecOgQiRefxoEih3HRfIvW4k2QXVwf4+bDNR17j4pU73sa9RCvdA8KC f7judySlaVq/IAOURLwMvGFMPUOfwDhhzNQVwwcCXftG5K0+3fvUXyvC1ASh+LvbBE88OCk6ESZ Q54KrTS/OT52PUpZsaVHfP4J4wWLCzED4qUlaaO9AAKhUbO2GP+rsAvtGgry+kew+ph/nqCTcd5 en7A9oHFopVelnDAD7w05Aqb6wfxY4L8uuKJdyxSx5/tvPOBuqdLWtW5/DiIjiiUljTcRM1NUUU gJLLqVRJo43bBNQpJQ1omBj9mr4HGcre1dL2AXXlv53gg6UcUijJ3Yq/1+GEElFiof4So/gbqD0 m1pjuJ4kDHL88u7aJyCp3t5w6AKMTkhfeynPU= X-Received: by 2002:a17:902:d511:b0:2a0:8358:88f8 with SMTP id d9443c01a7336-2a870d721cdmr63618915ad.22.1769637143057; Wed, 28 Jan 2026 13:52:23 -0800 (PST) Received: from d.home.mmyangfl.tk ([2a09:bac1:7680:d30::4:384]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a88b6e4317sm31576155ad.85.2026.01.28.13.52.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jan 2026 13:52:22 -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 v5 3/4] net: dsa: yt921x: Refactor yt921x_chip_setup() Date: Thu, 29 Jan 2026 05:51:55 +0800 Message-ID: <20260128215202.2244266-4-mmyangfl@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260128215202.2244266-1-mmyangfl@gmail.com> References: <20260128215202.2244266-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 ef9048b904ab..31ed21acb5df 100644 --- a/drivers/net/dsa/yt921x.c +++ b/drivers/net/dsa/yt921x.c @@ -2902,7 +2902,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; @@ -2920,16 +2920,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); @@ -2982,6 +2972,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 18:28:49 2026 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (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 2997433C19F for ; Wed, 28 Jan 2026 21:52:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769637154; cv=none; b=rObJictkrN6wxF9V9ghgDcEVhVe7Xnqig732/ifaXidhQiyh+vNwHQuFlAhWsvuTlllFGOpnTB7w1org/KSK55RB5tMlgoVlJRYNpZ44wrPSbhfsbH/b8W+YiLgyhTXcFbCGFp8n8dcFQW7uQkvUUL7ae/EVb3GAsRjXl+HYfFk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769637154; c=relaxed/simple; bh=HT0g2IazaDjwv6M8sj+yW+oteXi2KMV2O20fYCaLzk4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HUnqw7lkvAH3dLskuzy5ieOu4CfCicxAuTQJcag2jJH9kC6bz/x9aV3ZGpD+pMeMvyizzTV9TOt1xAv+ujKHej1W00pGvbAkzOJ16Dh24L2IyZdv2X9APeCWnnqvnQDAqygSIWvK8+cseKJGx1jEADdWzZaCM13saM7bLrDjJgk= 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=hHq6cb35; arc=none smtp.client-ip=209.85.214.174 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="hHq6cb35" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2a7a23f5915so1707975ad.2 for ; Wed, 28 Jan 2026 13:52:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769637146; x=1770241946; 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=nNKPmf0FOKAOML402kt3V9Mb7Qan6gayNvL2AmC5jBo=; b=hHq6cb357k1/AE0bs84+ostv6nltMNwp8nGrIRtcm/esCRW1Snip5ef9EDTvjebMM1 nT18JTbmvwDzMQG2FV9CbfO4AZNDhx8bjkUQAV2UHAYg7XGLZDzNoKr4PFd2Hk2uU/c+ 71Y3xMYY2wkeX/RMLoG5o8NZOOZ7XixC6G6HGDz0L2nmxEG6+AqyRy4wHdtNN1poQGd1 bSkIM44G1svZ8zlQh+m8NH/A0VeImAhP9pJIdUNXk5h4ZtFAL4LG+QGH2olvoNkP9Ll4 TEOHyn8eJAqipJHg6t4i14r+ECBSFUc9+w5GyCW6Joy2ejo6sjPqi8DkimG/k8JnDfws g2LQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769637146; x=1770241946; 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=nNKPmf0FOKAOML402kt3V9Mb7Qan6gayNvL2AmC5jBo=; b=Fyj92I/pTF1NwtyWbDWfqOsbD5512FoeHa0U9zhSX1PYSDRXXxOGnGOLozbCNkK2JN ixvAW8jVVWL4+M34E2d5HgVOIjXtA+z14QEdFPc23h2W+9JMj4tK2rR7lpHnwI7NLQ0i 2eKqhnEjLYn9iJvemFIQB/2rfLGJ/6bSKzuyAJ6/ITDky0iJmZF9hwjL0PblV+3driaf NQvkUcgx8K7cIqBn47bKkIXZzD82Fa3Z0+/t8Em7s1zQIX8sqzll8PCGBqnkl46X7PR9 Pe7VuDtCTpZbnZfSmgLRYr3Am4xoDxycWnFRkWpDPo/nQ4BEKOrOgDxB3rTnAl2M1Bt7 ySOw== X-Forwarded-Encrypted: i=1; AJvYcCXj8Wdxq4S7nAKrXgIyq2LGastHCmjyja/OZwkJ28hbDbsDmGNrI2ApM3njHDvvUn+rj7qTGHwkKwQiahU=@vger.kernel.org X-Gm-Message-State: AOJu0YyMF3yk86sWxEWtnI80VSsAUHp8/hLC5pHwMcYF2MfEHaNyZ2jr R093VT9N3Kyt4VAu8q1xMyDMLOuTwR1XcwjOgYGplMiKD3Z4SWrOPm1p X-Gm-Gg: AZuq6aKWJ/8ESiyXzeYinX62tNwXO2KF+obg1TBTbnHkHsEwfTcT7dJ/tVLfjS4brLo r2eYpzTjdP0wqz0aenzH5LH7qmLS3Vg6j2nY5cGB3b/e3YZMU2/JUOOn69jHiWZphPEbIkSSE23 66+Df92O5S4I5Sh7qRv72e3PAyOSbBvm/iDI+RaISMy+N7VrzM+XCeY8LW4zS52h8iUa4nNFSmI rqL/PtI26v5/E7G2Jg4b0e0JQ/zCfNlU4IXGyw8D8jDxvY5hRNH36G+laEyFccdbu/v6oNHqD9X gfFou2P0X/J+LJX+AWBvZwikYDnFmfgKOxQ24eJ+CT8kJPyT25JHu98GHAxNgcqCHECgtXmiW+R k7hfkwyDbCwg1nBNzciuUaxfa3NFX9AVIF97TDoVQtDF/x/w9bp1zUswwsGdWqJ2JhDaAqdukEO 2KdJIeVR3qDdoaFB1SYoB83XKPBzBO+qI7dl4= X-Received: by 2002:a17:902:d4c2:b0:298:4ee2:19f3 with SMTP id d9443c01a7336-2a870def8a4mr63753645ad.49.1769637146078; Wed, 28 Jan 2026 13:52:26 -0800 (PST) Received: from d.home.mmyangfl.tk ([2a09:bac1:7680:d30::4:384]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a88b6e4317sm31576155ad.85.2026.01.28.13.52.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jan 2026 13:52:25 -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 v5 4/4] net: dsa: yt921x: Add DCB/QoS support Date: Thu, 29 Jan 2026 05:51:56 +0800 Message-ID: <20260128215202.2244266-5-mmyangfl@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260128215202.2244266-1-mmyangfl@gmail.com> References: <20260128215202.2244266-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 | 253 ++++++++++++++++++++++++++++++++++++++- drivers/net/dsa/yt921x.h | 55 +++++++-- 3 files changed, 298 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 31ed21acb5df..112c2a237d9c 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_vlan_aware_set(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); @@ -2395,6 +2402,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; @@ -2720,6 +2843,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 @@ -2763,6 +2893,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; @@ -2975,6 +3165,47 @@ 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; + + /* 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; + } + + /* 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) + /* "Red" almost means drop, so it's not that + * useful. Note that tc police does not support + * Three-Color very well + */ + ctrl |=3D YT921X_IPM_COLOR_YELLOW; + + 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; + } + } + + return 0; +} + static int yt921x_chip_setup(struct yt921x_priv *priv) { u32 ctrl; @@ -2989,6 +3220,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); @@ -3104,10 +3341,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, }; @@ -3174,6 +3424,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