From nobody Mon Feb 9 13:02:02 2026 Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5943B2DCF6B for ; Tue, 27 Jan 2026 02:09:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769479753; cv=none; b=VKKKhGocdQRqbyU+iCmIxNhzcOq8Rma9vdYXgV9M0ir6OLOqUuTBxgBe+JKGoe/X1RLHQKLy2zjEiglKy6q9Rawh1ljFtigV+BbHPKRrk74EfDwfPOVNmyMWvFJ1AxfOtRPyCihrvysso+VKtQChsgi18NJbdWtLQDHAlJgMsFc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769479753; c=relaxed/simple; bh=iZJach6s8qYLr3vpM42GbXz2jpGMsX7usKV8PgWY/7M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tmqdRRC1pvNFYrwRJIvf6GjZXni4+ToK9IXk0LchHGZxI7/1VQcr2G6WJS5GtmJoE1qo1XFrdT0qT6fRHM5faZ3kxt4ezBwE0oVCA1NLBvA2PN8wmXiEU4YI3pkIzzeehuOIDbxcu2qu2AKIQa1uDbSTMk9JeJ9L+fDmt35PyYU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=aPgzfR7e; arc=none smtp.client-ip=209.85.216.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="aPgzfR7e" Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-34ab8e0df53so4465599a91.3 for ; Mon, 26 Jan 2026 18:09:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769479752; x=1770084552; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hLHzhuxm7a5X2Q49ADNkLZ5qYk8a4yH9AKsfa8IpJ8M=; b=aPgzfR7etoqO6siifkL6SREkmrVLaou22/8GOv2L2agU19xWCC/tyS3e6nsLN7rDWI ZDGM/sP8qIg5J3OT3dPYucGRtZXZKhBFneGpRAezp8KkVABThCybqWv/GBzmD2Gex3zb EOSOHD3ECaScqZwFO2dIG8TYq8EJaHAeTiyssHdfFCroz53zjjBMksbPUeDT8HJUCEd1 N9RywXRAa5vxT0YMv1c2gasd5G+Vm++OceCkOcMVwd16+7Vta5Lt6EWLCHAn0ykuJ5PL jc4yZbKXs9VynAkD+MvYB7kYHbUJQEOSWIRsnMzzrQy74xP5HLmiShn/8zaOJsSN/r2f rBIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769479752; x=1770084552; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=hLHzhuxm7a5X2Q49ADNkLZ5qYk8a4yH9AKsfa8IpJ8M=; b=GSWdYMvpZKopARybZ5STf/Mgu+Bqez+ppz8SA1350YXXAQrpNlKbcWMrnCghuH5M/f /H/V+1ZjOqLeR2YxIPLorUdTRl1orONkD9z5vRoo7ZE6Irfy4x4A+Iubf14dG/jPXDsG CAJEy63gCFx7QFvr5NcBy1hUSPUNScjQY9CikrDQbjn2frOhMJlnBzJG45/+G1ZFf2Or jNbDF1y0pT4Y670/SDvT+8L0+Dgy1Tg5FumGAU/vg+0Ci5tFrH8AmJRi2TrUz5/hLx36 bsPGFZ4suXqNkPCrXhP50bNMUbZcVO6bcfytX5CTulvkF3AfwBfrnPJz3r8Ho2GlXbJF UEBQ== X-Forwarded-Encrypted: i=1; AJvYcCXwRuH+rOBE+q+LML0z2izSRlv1ytMZQnuQeYbVTj4Jl8jGYZEE0yWsc7wDJHDl51Y7uUuZEfsxz0OXP48=@vger.kernel.org X-Gm-Message-State: AOJu0YywXqB00MJ7NQuMEubJEYuWwaO80aLSOq0nlFHOho79bubYbTpM yx3z42ndmRwRcdcuKj0p4GuVEQ5Lfay+spELR9tmeyP7dDF7fmAdcCSo X-Gm-Gg: AZuq6aLkAjsslfm5OfsuBzks6yJXHVLq/5NG3FAJUAt2D7rcd4ABPe94ZGOmkLg/IZQ JVRspPfhoqTTadLUe9kdtLa21W7A/mYIZ9jpkM4OPCjM80/jCTriUDN10QaLw4U2WxYM5OFvdqK r5aZyLrCwNoxeSBH/g6bmD0pk9yLFwDMyrBSpCZUTSy7MFnczjwO17THlOsLKBVwrboxGgMyMIQ gNP4uv2EEg+RB0t6QCjxY0dG8T+ahPQg+i+E2gvsv5pvEbaJV/RGLd+ribEP3a0GqdUem/EVXFs 7x5gBWoQwfxttRLMVKUFKiAsbMTSzYvoZ2kmqX3EOZy+e2g4TOoOy2TMM46Mi+vQinv7uI4ELFl aIL0EpP0kQpOX0mlOD0uj/7sTOaOqukKJNwNPzqBZCDf7klggeL13vXzvkQkMtV/NIR6lSNoxsQ ABKNhBGiPeB7vlN6WcW2IbdFYN7mVbtg7QuYmBzfDzgJPNG6PXHJkmNCjMOL7IrMz+ X-Received: by 2002:a17:90a:c2cb:b0:352:e796:bb65 with SMTP id 98e67ed59e1d1-353fedae2efmr251228a91.31.1769479751674; Mon, 26 Jan 2026 18:09:11 -0800 (PST) Received: from d.home.mmyangfl.tk ([2001:19f0:8001:1644:5400:5ff:fe3e:12b1]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-353f613fc36sm693540a91.10.2026.01.26.18.09.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jan 2026 18:09:11 -0800 (PST) From: David Yang To: netdev@vger.kernel.org Cc: David Yang , Andrew Lunn , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Russell King , linux-kernel@vger.kernel.org Subject: [PATCH net-next v4 2/4] net: dsa: yt921x: Refactor VLAN awareness setting Date: Tue, 27 Jan 2026 10:07:59 +0800 Message-ID: <20260127020847.1482724-3-mmyangfl@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260127020847.1482724-1-mmyangfl@gmail.com> References: <20260127020847.1482724-1-mmyangfl@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Create a helper function to centralize the logic for enabling and disabling VLAN awareness on a port. Signed-off-by: David Yang --- drivers/net/dsa/yt921x.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/drivers/net/dsa/yt921x.c b/drivers/net/dsa/yt921x.c index a4b346ddf8dd..880e3b5966f8 100644 --- a/drivers/net/dsa/yt921x.c +++ b/drivers/net/dsa/yt921x.c @@ -1768,6 +1768,18 @@ yt921x_dsa_port_mdb_add(struct dsa_switch *ds, int p= ort, return res; } =20 +static int +yt921x_port_set_vlan_aware(struct yt921x_priv *priv, int port, bool vlan_a= ware) +{ + u32 ctrl; + + if (!vlan_aware) + ctrl =3D 0; + else + ctrl =3D YT921X_PORT_IGR_TPIDn_CTAG(0); + return yt921x_reg_write(priv, YT921X_PORTn_IGR_TPID(port), ctrl); +} + static int yt921x_port_set_pvid(struct yt921x_priv *priv, int port, u16 vid) { @@ -1818,13 +1830,7 @@ yt921x_vlan_filtering(struct yt921x_priv *priv, int = port, bool vlan_filtering) return res; =20 /* Turn on / off VLAN awareness */ - mask =3D YT921X_PORT_IGR_TPIDn_CTAG_M; - if (!vlan_filtering) - ctrl =3D 0; - else - ctrl =3D YT921X_PORT_IGR_TPIDn_CTAG(0); - res =3D yt921x_reg_update_bits(priv, YT921X_PORTn_IGR_TPID(port), - mask, ctrl); + res =3D yt921x_port_set_vlan_aware(priv, port, vlan_filtering); if (res) return res; =20 @@ -2021,8 +2027,7 @@ static int yt921x_userport_standalone(struct yt921x_p= riv *priv, int port) return res; =20 /* Turn off VLAN awareness */ - mask =3D YT921X_PORT_IGR_TPIDn_CTAG_M; - res =3D yt921x_reg_clear_bits(priv, YT921X_PORTn_IGR_TPID(port), mask); + res =3D yt921x_port_set_vlan_aware(priv, port, false); if (res) return res; =20 --=20 2.51.0