From nobody Sun Feb 8 21:46:41 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