From nobody Sat Feb 7 19:41:06 2026 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.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 6CCF2B672 for ; Sat, 31 Jan 2026 02:19:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769825950; cv=none; b=JJwj3c9Q+YdPJeDKzu6B1TQ5FBvHud0YrCjcplbaWEaP3Vi6v+XH6l7MHaNnLRkzP8xORVeOC2jhRsx9PneqD73nckwI0tUyGYyfvQfY7Nr016a93XtqIdtje222SFbH+bNP9AzDyh5LitJdbewRV2dE7GHDN95xEO9Y17RLKSg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769825950; c=relaxed/simple; bh=TzOfWzliCe0axM6RQiyINNFw11Qb66iXdt5zdFtJKDE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TKqapthoZhoZgzIxNRz2Eylxde8jbZfmRHHdysMvGpLtAbTX3nez0c36/5TGBHkw9vjc1yme2M3dn5GEWR/GbIw5E41PnlAAq19pvReu+Ud16I6XhYzQuU4Zyoi+YsW2HA3dbGnLh5fJ16wYUMkISRux4/hnc8QBHOlJjLWjfrY= 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=NqMPrmBn; arc=none smtp.client-ip=209.85.214.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="NqMPrmBn" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-2a79ded11a2so18805265ad.3 for ; Fri, 30 Jan 2026 18:19:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769825949; x=1770430749; 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=64k7msfv2DdzzY51KUbI/N+/uDxb7L+T9f/o9yyek/4=; b=NqMPrmBntm7Q5i35KaLcKbQ15WPo0EeAFZclWSxCE9X1dibV6lBtDC4JzFeD3SAO1b fXahes3vYpB7XtFjBxP5KPbA8Hblrw2iVxC0Pw7L7EJzlUw49hslgjUprIsd8FCz2/xd CIYZ8RMI6DdDtBdaeUpKct6vtTGqRGUyBdL9xIIjN7n6AdoLrLk9lZSZauPS71/pWSpY B1ZorvYYLF4Lr67GjwObTdNEgN5NSyc5Z4PfjREcQUs6XoaLWjraMfUMAA0OEJDKChkw QslbuvlPDokBCy2jj8sThoj+Axkt1HwOgja18oNQeNzHbJzgOGYHL47ZNU5LAuWG8KFk 75rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769825949; x=1770430749; 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=64k7msfv2DdzzY51KUbI/N+/uDxb7L+T9f/o9yyek/4=; b=s6yt8lRbFeLi0ayYo6neItSSycd5+dMGKBbhbHwsBDjjYgqdNhRrcexgnpyGAr1PKq 6c8U7O+0LEhEh1psFoHMSEyvfRduGv5CWP7NMWkIPsUbHXDxbBT2SQqs/csR8TyGAViR JndwuV601ovLYTk5cI/30YhVW42nSzPJ+nBThGQbR4P+N21wA+OhyR+35qIEThHCQgqu L6p5Rjc4KBioU7PPb/pqop/COo/HFI6M6H+oUN4WJDvcHXmBOjF9i7k2jfpFi5ZWFpdL 9dxGgPtY8i4AmeT/Ox72FjiUDay01/OIIv1JiqtCSBuX1irPLZ6ZyNHyh3UJTuXCbW9P XxoQ== X-Forwarded-Encrypted: i=1; AJvYcCUsVVecUceUBMA6kXr7vKpu+1TTSxvIky8vV9TSwnCmYqGUjonXhvhdEo7Secy54HQ/1gnW9v3xe5e02YM=@vger.kernel.org X-Gm-Message-State: AOJu0YzcstbvTIJWxYDedwQmlKRzLDrMEV2VzqDUl852H1AgsPxg2Rb6 DiPAclE8YoLdwhl8Zd+w5oLvoX4WShnQAuTFwgM3kUh3nGEQvvpGgp+J X-Gm-Gg: AZuq6aIBIXrlqQuNjd8Dc2YI9XV1hoV5eD9pm3TSaTRcj7IZhVsGEprFMqiJGusTBWl DpM1QE0+gjvfRlUwjgFNOJ7c72qFU9x8UsB/1UeojRHePfSMEw6gNd6QjP/i8SsxQYj5DbAcX7K FPB+0rzgcYIkv8kaNG/V+mbPJoz66XRShEoZhKA8Sx1VSdOD3JkMReQ34dopRzpKGdqHZzHpLcG dB0/2Z3gRkgPnzU+Y/CKZopd1cfGkzxaB8lx20Zi+K+L3AkYZVGe9Tu3n7h7K8yKROxW+NasPEN ySo6u8yLIqXdS+EZedCdNDKHMN1Qkp0q7hYX9uj2ygtyyG+PgEjgPASUG41tarwOkK8zfv0iIWc kWMnBKkQqWsLsGQSUY9TjZo4Gyi5Qd8x6dMU2tnzcpnNk8CDRw5HQstYnJTA2t+9ogI6HbncG6W EkFyaH3LQUOe2fVA42rqpiB9zcbqFlXZ8AXQM= X-Received: by 2002:a17:903:124d:b0:297:f8d9:aad7 with SMTP id d9443c01a7336-2a8d99399c3mr43555955ad.50.1769825948748; Fri, 30 Jan 2026 18:19:08 -0800 (PST) Received: from d.home.mmyangfl.tk ([2a09:bac1:7680:d30::4:384]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a88b3eeebcsm83427365ad.10.2026.01.30.18.19.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jan 2026 18:19:08 -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 v6 1/5] net: dsa: tag_yt921x: clarify priority and code fields Date: Sat, 31 Jan 2026 10:18:47 +0800 Message-ID: <20260131021854.3405036-2-mmyangfl@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260131021854.3405036-1-mmyangfl@gmail.com> References: <20260131021854.3405036-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 tag, and the priority and code fields are used by tx and rx. Make revisions to reflect the facts. Signed-off-by: David Yang Reviewed-by: Vladimir Oltean --- net/dsa/tag_yt921x.c | 83 ++++++++++++++++++++++++++++---------------- 1 file changed, 53 insertions(+), 30 deletions(-) diff --git a/net/dsa/tag_yt921x.c b/net/dsa/tag_yt921x.c index 6bbfd42dc5df..098863d491ff 100644 --- a/net/dsa/tag_yt921x.c +++ b/net/dsa/tag_yt921x.c @@ -14,11 +14,14 @@ * are conflicts somewhere and/or you want to change it for some reaso= n. * Tag: * 2: VLAN Tag - * 2: Rx Port + * 2: * 15b: Rx Port Valid * 14b-11b: Rx Port - * 10b-0b: Cmd? - * 2: Tx Port(s) + * 10b-8b: Tx/Rx Priority + * 7b: Tx/Rx Code Valid + * 6b-1b: Tx/Rx Code + * 0b: ? (unset) + * 2: * 15b: Tx Port(s) Valid * 10b-0b: Tx Port(s) Mask */ @@ -33,18 +36,30 @@ =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_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 GENMASK(10, 0) +#define YT921X_TAG_PRIO_M GENMASK(10, 8) +#define YT921X_TAG_PRIO(x) FIELD_PREP(YT921X_TAG_PRIO_M, (x)) +#define YT921X_TAG_CODE_EN BIT(7) +#define YT921X_TAG_CODE_M GENMASK(6, 1) +#define YT921X_TAG_CODE(x) FIELD_PREP(YT921X_TAG_CODE_M, (x)) +#define YT921X_TAG_TX_PORTS_M GENMASK(10, 0) +#define YT921X_TAG_TX_PORTS(x) FIELD_PREP(YT921X_TAG_TX_PORTS_M, (x)) + +/* Incomplete. Some are configurable via RMA_CTRL_CPU_CODE, the meaning of + * others remains unknown. + */ +enum yt921x_tag_code { + YT921X_TAG_CODE_FORWARD =3D 0, + YT921X_TAG_CODE_UNK_UCAST =3D 0x19, + YT921X_TAG_CODE_UNK_MCAST =3D 0x1a, + YT921X_TAG_CODE_PORT_COPY =3D 0x1b, + YT921X_TAG_CODE_FDB_COPY =3D 0x1c, +}; =20 static struct sk_buff * yt921x_tag_xmit(struct sk_buff *skb, struct net_device *netdev) { __be16 *tag; - u16 tx; + u16 ctrl; =20 skb_push(skb, YT921X_TAG_LEN); dsa_alloc_etype_header(skb, YT921X_TAG_LEN); @@ -55,9 +70,9 @@ yt921x_tag_xmit(struct sk_buff *skb, struct net_device *n= etdev) /* VLAN tag unrelated when TX */ tag[1] =3D 0; tag[2] =3D 0; - tx =3D FIELD_PREP(YT921X_TAG_TX_PORTS, dsa_xmit_port_mask(skb, netdev)) | - YT921X_TAG_PORT_EN; - tag[3] =3D htons(tx); + ctrl =3D YT921X_TAG_TX_PORTS(dsa_xmit_port_mask(skb, netdev)) | + YT921X_TAG_PORT_EN; + tag[3] =3D htons(ctrl); =20 return skb; } @@ -67,7 +82,6 @@ yt921x_tag_rcv(struct sk_buff *skb, struct net_device *ne= tdev) { unsigned int port; __be16 *tag; - u16 cmd; u16 rx; =20 if (unlikely(!pskb_may_pull(skb, YT921X_TAG_LEN))) @@ -98,23 +112,32 @@ yt921x_tag_rcv(struct sk_buff *skb, struct net_device = *netdev) return NULL; } =20 - 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: - /* NOTE: hardware doesn't distinguish between TRAP (copy to CPU - * only) and COPY (forward and copy to CPU). In order to perform - * a soft switch, NEVER use COPY action in the switch driver. - */ - break; - default: + if (!(rx & YT921X_TAG_CODE_EN)) { dev_warn_ratelimited(&netdev->dev, - "Unexpected rx cmd 0x%02x\n", cmd); - break; + "Tag code not enabled in rx packet\n"); + } else { + u16 code =3D FIELD_GET(YT921X_TAG_CODE_M, rx); + + switch (code) { + case YT921X_TAG_CODE_FORWARD: + case YT921X_TAG_CODE_PORT_COPY: + case YT921X_TAG_CODE_FDB_COPY: + /* Already forwarded by hardware */ + dsa_default_offload_fwd_mark(skb); + break; + case YT921X_TAG_CODE_UNK_UCAST: + case YT921X_TAG_CODE_UNK_MCAST: + /* NOTE: hardware doesn't distinguish between TRAP (copy + * to CPU only) and COPY (forward and copy to CPU). In + * order to perform a soft switch, NEVER use COPY action + * in the switch driver. + */ + break; + default: + dev_warn_ratelimited(&netdev->dev, + "Unknown code 0x%02x\n", code); + break; + } } =20 /* Remove YT921x tag and update checksum */ --=20 2.51.0 From nobody Sat Feb 7 19:41:06 2026 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (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 BB2502FB983 for ; Sat, 31 Jan 2026 02:19:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769825954; cv=none; b=TiwUeI0WHpjmcGKlYdWVjv8sQPK+fUZt5XAGvnjd2TI9nD4hG2PMhHPlIZAWO9xFeSBP4kJiizY54btwHeV6rwylLPxT1cQ59xMQ/XDAt0EnBShdQW/YM59QUed9ISCtDpKP1q6DWbEUvSsPceSUN7B3oTqczZQvyaePJ5H8NvY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769825954; c=relaxed/simple; bh=weypf9fnJ2Qr538zMjCgLUq0YO0hY7tVVy+hNPngXU4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GLDhJeH4o9YlCNluV1zcQcSkoAtXQ4PG3T4JUT9hVDu624ZtbRinHOwiJfqwEmoUL/XyGqVJIAyGMfNzWz1LGdX8PPOhLC1T8yElRNHUb7w5ZFzfyElSJed5Wp0TCUcJxarlx+7V1mFp+ZDP1LnqO+lp0y/F0wMLQ1XOPZzo670= 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=YU+82ULc; arc=none smtp.client-ip=209.85.214.170 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="YU+82ULc" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-2a0d52768ccso18025255ad.1 for ; Fri, 30 Jan 2026 18:19:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769825953; x=1770430753; 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=TX9NGtQjvL+utqKEIIzvFMcAbIwZFqtQGtspyA4XdaA=; b=YU+82ULcFEBxrNkYeb6WlHyw4XaLn8LT3kGUGoqwmMVHQnDIri/4yHetuOL7avUz6o UXdRDqOuZhcUN7gVYCBvKjDaFwkzN7/fnv8KlW0tOu9M33JrzK4EOWiBTA88hF5Fy4Dc Ui03OlNoKj80HlXYipfaF/Dazp9g0cbQ/bCb4HWHHuLROnMV0kbaXfemIxXL1f8JGZ5a LzVcLkmOVAhTXbS6DfYo+F4VmxYy5o72D/rcT8rFOjt0eZ8knRkclXmp8FgHrDK6cnRM 5ncHKU2tEJdb9hhcdjTBMyYYADcu6Rum7j1w/Lm400dH6zTPJI60nJNyaJUV1gshVBuI 929g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769825953; x=1770430753; 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=TX9NGtQjvL+utqKEIIzvFMcAbIwZFqtQGtspyA4XdaA=; b=liKaEnngm1e/qSnoR5IaQyp1i9eeq0QZqB/i6q9z49CZayy9vN0CwAYwKDd4oaYcDz fMoo8C2p+xZ7ZijR/8tTR5Gw7TnWauvgOMiWENxN8S+K+fQ2+QUITgeWd2Fh090lTyj5 GiQY4f2rphXQ2ma5SBfgTAenCfw6cLuMOsj/Ls0qIDf1bl8Z04JLEZp69ckudlMooR/Z L72LwFBA0XmJeareA9GKiDwogqzLiHz2+mY4XzRaDqdP2FHTM1/I2R7HaAReg6zaD03a s25cExu7R0cC1o0eyg1jDAifGqn4mGWPXSXW6Zca2EUVvaQ+PmgffDLqDLvMkOYuso9w JF4A== X-Forwarded-Encrypted: i=1; AJvYcCWx1UB285W916PXYS/gB+7i4bHaiyCLZAyU/SBRw6pNA7FOGrDxS/be0zVSGGF4d5JxjalsuQahpCdWOAg=@vger.kernel.org X-Gm-Message-State: AOJu0Yy5wjx6MGNPqJZnUkkgJAl2mc1vzcnStU6NCW1vq9MFzzPD46fZ SgYaT9ptqoiskfJgDtqgPOwmXuaJzvoQ+Toj37im8mZrz1wYisnfFs+w X-Gm-Gg: AZuq6aJ+VOIN9Idqbe4kH4eB13XDKNLszjBl7/DEiGW42JJ6TL66RYJ2PVfssJpeURp 941tq1kfTK/yXal7XC9vbRhTMiK1u2/st90AfH2iEE8Pzpesn5h/hES07l7jbtZOPYijXWUEao4 Axwvivmp1zzCmZw1Jj79ongzS8zxiTg1zVGp4GuGYk3BhkTFhbCOiPVdKs/YLHW3gSS2Atoo9z6 IobXN2aVi/Rl1Yy8hgV27SkZA4F140DnicOoxTmL9nWwohT+BiHWKSAwW7kJt/T1K6XRo8WSas0 SP5sdUUsRTi/fO4G3AKoO2QcgUp0/+7fvsIWpD00GKtqSDHwXz8YfWedxevZ6w2OtqtkQlyI5LB 862NnlYszXvU/dhmwpNVuHUL8kOJIEjCfBnKNz0DTNrAfk1gulHuUrDNQX/oCqF6igaJD/MOrOz i42lUP4azhqqTbbYjyd52mxDWQK3/Pl0iQpDU= X-Received: by 2002:a17:903:f06:b0:2a0:b438:fc15 with SMTP id d9443c01a7336-2a8d959c4b1mr39869785ad.11.1769825953099; Fri, 30 Jan 2026 18:19:13 -0800 (PST) Received: from d.home.mmyangfl.tk ([2a09:bac1:7680:d30::4:384]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a88b3eeebcsm83427365ad.10.2026.01.30.18.19.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jan 2026 18:19:12 -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 v6 2/5] net: dsa: tag_yt921x: add priority support Date: Sat, 31 Jan 2026 10:18:48 +0800 Message-ID: <20260131021854.3405036-3-mmyangfl@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260131021854.3405036-1-mmyangfl@gmail.com> References: <20260131021854.3405036-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" Required by DCB/QoS support of the switch driver, since the rx packets will have non-zero priorities. Signed-off-by: David Yang Reviewed-by: Vladimir Oltean --- net/dsa/tag_yt921x.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/net/dsa/tag_yt921x.c b/net/dsa/tag_yt921x.c index 098863d491ff..aefef8c770e3 100644 --- a/net/dsa/tag_yt921x.c +++ b/net/dsa/tag_yt921x.c @@ -69,7 +69,9 @@ yt921x_tag_xmit(struct sk_buff *skb, struct net_device *n= etdev) tag[0] =3D htons(ETH_P_YT921X); /* VLAN tag unrelated when TX */ tag[1] =3D 0; - tag[2] =3D 0; + ctrl =3D YT921X_TAG_CODE(YT921X_TAG_CODE_FORWARD) | YT921X_TAG_CODE_EN | + YT921X_TAG_PRIO(skb->priority); + tag[2] =3D htons(ctrl); ctrl =3D YT921X_TAG_TX_PORTS(dsa_xmit_port_mask(skb, netdev)) | YT921X_TAG_PORT_EN; tag[3] =3D htons(ctrl); @@ -112,6 +114,8 @@ yt921x_tag_rcv(struct sk_buff *skb, struct net_device *= netdev) return NULL; } =20 + skb->priority =3D FIELD_GET(YT921X_TAG_PRIO_M, rx); + if (!(rx & YT921X_TAG_CODE_EN)) { dev_warn_ratelimited(&netdev->dev, "Tag code not enabled in rx packet\n"); --=20 2.51.0 From nobody Sat Feb 7 19:41:06 2026 Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) (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 2506F1EBFF7 for ; Sat, 31 Jan 2026 02:19:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769825960; cv=none; b=dID7kA4em8PWR7MgVPz9XGE791BAsogZTe3uL5qyCTfDIjTU/kJe1v9GBVepA9GsiQh2dVBTHo9qvwFO++TRGjwXlwPuUcQRG90mi2kYxZV/wo6JTej8YJ02AWQWKCfjuePO4+evb3yoJCMNAsNAwVkGPuj+AvbDTnDoLMJcHjE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769825960; c=relaxed/simple; bh=DfgWrEGffh9/+P3GtbIsWglSO7Wu0dHRozZJpQB4z7A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mZwsvMrIeaGUKt8ypeYK8qaIGoQ2nNUOm3LE/+CdpQeTa6Noh283fsPLhn+YwP0KCj/6IV2aAZ1YxG/pO7cpGEqIUfaU7oyMJBbvaJKuUEEmJTL4tHF6xp9N7KKFwuWWeyf2XwYfTfKSodmQCGEBBgM0A4uYbJ/dxBSX1Bdb7kw= 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=GaZlFqll; arc=none smtp.client-ip=209.85.215.176 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="GaZlFqll" Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-c635559e1c3so1127657a12.0 for ; Fri, 30 Jan 2026 18:19:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769825958; x=1770430758; 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=+/I+oT8E/nunUvWBaGvhrVbfUpyTt006WYcjriTKPhY=; b=GaZlFqllJoTTlgmMhdPLg7G/3OIMq/tuR++QDZ9wZ0rq165Ti5/cp6FvfS5BJH33d5 Ya+B+zQRjz1UKF3HS3koMfQh8oV9MAuLswB/6rxC8CdAXFdkQZN2l8vcisBVZSmmSPIF Zpbz+qO4gMiJjMfauixObjogBIgSlxe9r3DOpXdhaHzkWMN5TPIyCDGHtuY+uA12uxTD k84QApkw9L/uWiLzhpR1nIJepbFpUOTrrk1iQTuoGOpmO0d6K6t5iD1aLE0DlKKN8/UA Gh0k1En0ohbxBgP7FLGhQnxhgDQXikrp49EKLecsyCYxBJc5BGNnwl22T96wFDLEcql0 aOCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769825958; x=1770430758; 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=+/I+oT8E/nunUvWBaGvhrVbfUpyTt006WYcjriTKPhY=; b=fdzhwb2mygHOlVzGMHZUqjab8SPiHQvjvLJOh+60Q22+GwnKAm+aimhqwP10/HGwGH hf2sz58JPQ2PyeonzQu+y5MAJJ5rxAz3AR7dl2eZgpHwq8thQ/6twkTn335ws2+51i+a wtTh3ll1ze7Mv4EO4RxjJEYHyLSsTAHzcX/0dOuvOlpgatgmaVC6ZDQXLT7CGvBA302/ ye3NnGsQDm1wHgSzzYAOGXRLFiPH5qW82sx8Vl4iMZqtWKjUoBxLu2IrUyKHwZpKL+Hk S0ueZ5MKNdFoSQvZecFQHZlP3d2eMfLmHt8VFBSNu94/48bWi4V62Gc3ltnhQqZv2JMX zLuw== X-Forwarded-Encrypted: i=1; AJvYcCWMlphVNbj6ID4HnkcpSSqx0guRYHCcdzl8Ix/ZQohUWS40nBYFYR20rfuuPIlqKRwp6SRtkAtjfkL4rgo=@vger.kernel.org X-Gm-Message-State: AOJu0Yyc63GhjBIGyyg+FZHYwaN0zdbMDUOwvPX4NVAk+QfEO4Se5Hd6 oMJ/KKxpN6XTLnn5msg0skFfhnoalSMxYrx3nvr6uSbcoIqXKwteIUj6 X-Gm-Gg: AZuq6aJM6yhi+Ss6z4WvJppNQee6pUi0DVuVUMyAx3Ntax+aS2e1vfxkx/j80WJ1M6N tL6QoWJbiAzqHZfz15YzP9ZaqUZZZpO//Apto8LD18eemkTJOaa41kbl99ph8fkb4ueSke+6Ivu nE8pyNx+DyG8jUZkvzb3AsxPtXaSyh1ATJZ05eAmJD/BsSt+/H94xin2y50LwNJIF5EjtHT3xWe ypgWrxe/NHdr2ZeGJbp/aI9x+ARV5AOgaPSuUqQPiJPEQLk9G7DOTiaH6JFn62Mhs0nss8cVAAt KvdjyTM4DJgh4ngtUZm0AZ/rSCpZg+duTbjbzcNsmRAOqCIMbUPmyUSxAUkY0HanWyXUKdAwdSz aNBRCHzIe+aXiUlgmCRtYI0e7HPD0qu2kfjwCvdeOg9O2rL7iI72lNr4uwKXS3oyj0UHaJKsbJ/ EAXscE3cGKUGXBUu6QU5Y7y4CyEsl07+/nw9k= X-Received: by 2002:a17:903:198e:b0:2a0:d0ae:454d with SMTP id d9443c01a7336-2a8bd4f11a7mr78003725ad.22.1769825958448; Fri, 30 Jan 2026 18:19:18 -0800 (PST) Received: from d.home.mmyangfl.tk ([2a09:bac1:7680:d30::4:384]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a88b3eeebcsm83427365ad.10.2026.01.30.18.19.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jan 2026 18:19:18 -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 v6 3/5] net: dsa: yt921x: Refactor VLAN awareness setting Date: Sat, 31 Jan 2026 10:18:49 +0800 Message-ID: <20260131021854.3405036-4-mmyangfl@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260131021854.3405036-1-mmyangfl@gmail.com> References: <20260131021854.3405036-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 Reviewed-by: Vladimir Oltean --- 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 d82608154c4f..c2998b6ae535 100644 --- a/drivers/net/dsa/yt921x.c +++ b/drivers/net/dsa/yt921x.c @@ -1769,6 +1769,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) { @@ -1818,14 +1830,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 @@ -2022,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_vlan_aware_set(priv, port, false); if (res) return res; =20 --=20 2.51.0 From nobody Sat Feb 7 19:41:06 2026 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.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 4EF743195EA for ; Sat, 31 Jan 2026 02:19:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769825964; cv=none; b=ADFriEp6yg8q1Oo32zhpaqU4vU+gm125V3SzUr+9SMECatun9fOBekou86zXxhJjsfKfSvcRaNBbcC4Pj2L8zzUIVHArJGwDn6mK8UR9dspEv8RbRL5+/qzhKbD3bJbpbWJg6pfWT2kcKvUZflQqFuLOm6YCnJGfAQhV7+1snZc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769825964; c=relaxed/simple; bh=JNfZjVJy3Gbq22U1MyVQxdU67pv8yfXpNgGIJG63XRo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=l8T97eG9OqLujU0JWJCCxMAHI7dR66d/p3TVxtI9+Jt09IZ95flLP4AWC1v3KolXbv7YHLrJoMAB2GIDNFAXdjqaNVWKlzRz9G4uFuH0aPH7jMaOBXyfbEc7MLM1vva2CSRL/G0T42Kz9kEZc8uY2hC+/dbye5kD60M0DtS3zhk= 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=m6aWqjbP; arc=none smtp.client-ip=209.85.214.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="m6aWqjbP" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-2a12ed4d205so16087835ad.0 for ; Fri, 30 Jan 2026 18:19:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769825963; x=1770430763; 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=7pMp86pItBZRraa325LpN+qOAaq2YtbzQhkPFaWHWDc=; b=m6aWqjbPVASqzq2K4e0eO7hOPVUs7bwA5S37T7VXJ5gHJp3FvCaGqC4DJ3Q2KMTPWD kuw3Ixqu7WmcQC9/8b+aQv8jEB+pqSTBOJeb83WHYxx6rLfLHkwIuhdcIM9SjUju2gCP EvxOAuK/G7V6tYf2lgMbjl7vdHbPROgtt10udZqjqyhUvr9/jj8o2zaWHJNlN0f69vmi 31g7hCQiHlVky63lbghf8hANiEN5ypL2QC++hiYK6srXiSwvico5DiECkcLYHr9C3JBA ha3Ii2iaglgV+zjWoPsMnp5gvf7rv+zwiwu8uyGYnJdAVd7/r5pmgVk7KGzXyMDJ1E1I IlSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769825963; x=1770430763; 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=7pMp86pItBZRraa325LpN+qOAaq2YtbzQhkPFaWHWDc=; b=HWLPzgQB1trBMxxF+R2xzxeOs7nyz2eSaBrzXWTd+1GodpYjeB12dUm24uV/bDiibo 1xwGYXVRZc8D3/EYdR9u5EDQUvPt9/osmWxEK6VwXeX6Ea9orG0P30HCRTHwksIbDlqj nnGBjAHjRrFUlWrxeMJzYXc/ljszNjTGWCctoflHTXnFzqlWR85gwJA5tTDcmBiJlCmw k4Cb+GU4YywJZwaNqVQt159ZE1wOJIRWRJ7w8w2xdITMsWzymKgo94O0fOasJOnITkaI Pn6D2TMNOp8JPi6lCQoXRAgAICuaawVhUOQj2MnbFLFJjFaVRuQbmcXcvs3sJhHUmc5I 3q4w== X-Forwarded-Encrypted: i=1; AJvYcCWK11B26Y5zvBRJkpMFO+pXTTWAq0QSpOXFdJwlWZsD5oJuitFqZTqKO91uy2MHg0A44Q4hH5wDJ+dIcaU=@vger.kernel.org X-Gm-Message-State: AOJu0YyC/5qHpDzws04mEMEZNRyAkRc3Sg3Ngkm2tD/lxQzvEjxx3K9I +W4EysO/rCH0TqjhuyjCUQ06+DRp2qEtv+A7OMk+ZgLJO9A8jPPWJeaG X-Gm-Gg: AZuq6aI7Sq5y5adZdxw8HF2Emn9ru1OSt+68MWs333Sn8i9VDUDXv68UUelWKJF0P2y lNV1UMsEHHkmWWPf6WmDVNiHtThmRVj7am2fyFAUMpCzXJIDMWFy199LmJMpon1ELeogcwO/qpX zLUJ91tXaN/USzudk4GGfsit9gayvb7NT8U9FjNgILzsWCIExlrBU+zb7ZllUw+X/q3QGgrZ46G znU5AihAe4FdGT45HYfJcZeu8AhsZVoEL1EUFtRSN/zdsxDomXTI1O1njafSTvUp03/AxvfVQ0S 9/sHetJJT8tNLTK4+1SGHZKdh41Eq/spzrabvbhn/6CCseZIHEi8N8Z7T58SHWQKPqJQZtDY5sK PsX98HbgiDp1D4EcdzlJhoL9OYAtbyu2fZNmlPWcoaLoe6GbU3JZ496oXnYQ/D0L75Yq17aWnk5 hU/NvpDI9OmH3+3vANG2ZG9NpisCfZaN3XIOY= X-Received: by 2002:a17:903:38c8:b0:2a7:b039:4b52 with SMTP id d9443c01a7336-2a8d9591c81mr45042115ad.1.1769825962631; Fri, 30 Jan 2026 18:19:22 -0800 (PST) Received: from d.home.mmyangfl.tk ([2a09:bac1:7680:d30::4:384]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a88b3eeebcsm83427365ad.10.2026.01.30.18.19.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jan 2026 18:19: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 v6 4/5] net: dsa: yt921x: Refactor yt921x_chip_setup() Date: Sat, 31 Jan 2026 10:18:50 +0800 Message-ID: <20260131021854.3405036-5-mmyangfl@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260131021854.3405036-1-mmyangfl@gmail.com> References: <20260131021854.3405036-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 Reviewed-by: Vladimir Oltean --- 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 c2998b6ae535..3128fe97b50f 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 19:41:06 2026 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (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 ED0772DB7AD for ; Sat, 31 Jan 2026 02:19:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769825969; cv=none; b=oU6lwFDEABsIZiWh+gdCOYuXqpU+gO/beXbYz6/6cfNczDy44WpcZJMvepf1zHC8mZlHliXCA8VpzNFtv1giTQgOoSgrKHqaragtM3Gx8qD2IwCSaH5HNcTArHczeubchgwq/BjRYoPWIyNDfgSOtoC2Unxm/c1nfbvqJ7iCCy0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769825969; c=relaxed/simple; bh=sgh7hJVNFhCTfTrRbb4EG9cbyAS1H8ZBeLSD1XNo5Bk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CHClKOfJbwuVq8/putQ+c+Zfa8RX8bRe+lCD8UzcyuekNcFOUcMIY3cyAP9dG6TmtZtYxcG+RXezB9qwy+ArmLkBK8IPJZ95bkfbwiUyS6JqEQkEha2EbfgmdgZeWJU2EMxNxbbryo6Sc73aRPqzsSSkfL/QUEYNtow+AsV0Zt8= 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=XSmLlzge; arc=none smtp.client-ip=209.85.214.170 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="XSmLlzge" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-2a7a23f5915so18043155ad.2 for ; Fri, 30 Jan 2026 18:19:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769825967; x=1770430767; 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=YJxnT9j9UIq74UGQNxKGzKMBh+ob/VDSHrb2m9J27Hg=; b=XSmLlzgeqcYuFjUy5XZOcoa33UgzmnAMyPgKSvcohnn/kpo81CbYh6vIHnBsU/eM21 wxBeU3iJEPrCHoUDrU09m7fGvG/2pdRAvlqSIqsgHGxnsgCTQ2QJ2LixATaSaGrqBsIl ISCngrSUFcy8sdRkpsZuNv+p1+d2lqYmJmzc+/EqLt1IaA7IJLrR1GlhzZTMU3SRktMT bShzynRDXkIoNZsJHcHe2qcl1zXLeaw2KZNNltPZR3qunWz1qz2PxCfGltIlcvSCyBTm t+Ata5gBtgt7nvnavoJr4UQ7BT+QRznYeUi/ESSluuaLJNdrWAnDse6S57sfRuQS6Hee 3khg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769825967; x=1770430767; 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=YJxnT9j9UIq74UGQNxKGzKMBh+ob/VDSHrb2m9J27Hg=; b=nli2uZSTNQtG3uUpKMBwoXbDFOoXkKe6tV0W7e12Ucdc/0ByqxwYVb+9Px4GkGIpgS 07KL45SRJMVFJX46w1Xu003zbInEsmUdHCTtMnWRIP1TP9vNWIsHQeVW2WGSXJskRdOY y0aM59JMhVDshpVme5bXmDdhLLlPMRGrs0Gxsw25KazKfxlBG0f26c/BqFYlk+Z5CSvx wHRErUaufdq/XukUuC7YfyAVYjEmIU553eHuqEVDcN5UVko1Dwsng+0PERjh68pjU+Gx dGxu5iiLA1VrhrUIlA6Xbd/x+9hXAC48GXrrVqXh0nXGD1+nt+aTQm/+wYhyUG1aHfw/ QIuw== X-Forwarded-Encrypted: i=1; AJvYcCUK8KSb3J0Q9JTTXZepVJbr9uBsOsRrc9DKChHnsxgllRuoTLcH+MUwcAhVlBjPzMZggIMO44SPXK5nWHo=@vger.kernel.org X-Gm-Message-State: AOJu0YyonVl0eQY0RXhdbotl7bnHrIlb062H6toEMlDxlNoHvH68W4nU PxT4tog5JhtGvCbe2mWtcuN60/V0tpWBQbuvGqzdcyhMa0dQ7YgcIClR X-Gm-Gg: AZuq6aKjbLxTBxP8FldqsHggYBrh9Ndy6WbbZnT/L6UxcHGOd6HtOkVP6s8uG6895S3 h7t3owFmHZqVFN7l9rvmEph9A8ufos6YP7DZspoLsQeHMEn51E3vu+Eu/ath6FBfMbl4NN8r8vK JsWeHQ93MhJ3Yo4qZb1u+HYkY35K2f+h8oUuUZXEZuOlJ69ccx+sq3TiXexXdTFDbL013ZTWUhk /5uuG/s4ldktiU9v4o26hTewulcCQ1ccJ7gG6kgShECR28Q1GKbU3tVXVJObrsN6H5Mu5+wdzHF ojxfPBPPQG6/VI5hKrEvRcmfkGkfwsCfD7WxI1JsCmWbX1Jgl35SE95hGUt84NAlwFCjPji42gv pTKRCzakzYNx58fDiqlH8XtNIiAgrO1AudpwSh26aMpCghzqqGMqwKWSBZ0N62OSC/5IIho4iYt mQUyNQenShr7JdJbxlJviLGX1K0coNN8jD61M= X-Received: by 2002:a17:903:41d2:b0:2a7:63e4:b1aa with SMTP id d9443c01a7336-2a8d991a634mr56510565ad.35.1769825967283; Fri, 30 Jan 2026 18:19:27 -0800 (PST) Received: from d.home.mmyangfl.tk ([2a09:bac1:7680:d30::4:384]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a88b3eeebcsm83427365ad.10.2026.01.30.18.19.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jan 2026 18:19:26 -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 v6 5/5] net: dsa: yt921x: Add DCB/QoS support Date: Sat, 31 Jan 2026 10:18:51 +0800 Message-ID: <20260131021854.3405036-6-mmyangfl@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260131021854.3405036-1-mmyangfl@gmail.com> References: <20260131021854.3405036-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 Reviewed-by: Vladimir Oltean --- 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 3128fe97b50f..98e8915dd6c2 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 @@ -1774,8 +1778,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); @@ -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,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; @@ -2990,6 +3221,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 +3342,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 +3425,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