From nobody Sun Feb 8 14:10:16 2026 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) (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 C6C79405F7 for ; Sun, 25 Jan 2026 00:14:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769300049; cv=none; b=uH71/Rg/nw8ZZLOQLY8VmWeSd1HDpS1Dvass/3sUr0FNX6QRK/oZVCiL6lEX+I1rOm3AGI1oK9nCChdKO2szhSBG3t6UPh8wzN0LZKJRy0GKxRjkmyQvihN8Ow3cpBycc089Q/j+DAZEXnYbLIuVdNUC4Abs0Zi5Saa2+vCNlDs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769300049; c=relaxed/simple; bh=iZJach6s8qYLr3vpM42GbXz2jpGMsX7usKV8PgWY/7M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sCZTfztQr4yBvdYhEziKDlM/Y2q2HLGyM6o3m6OJSFKihYIV0EJXTR4GiOaoRSuK2juslVgE+6WcwBYbGDbeDjBIQJ2Va5jHYfA4yMlO+eDT47wEd15lOXqzIB4JBCUnRNE+hNhuY28wtvKNh7V0wqS25vCnkU7r24LU8GgiaqA= 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=I1xz5idX; arc=none smtp.client-ip=209.85.210.177 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="I1xz5idX" Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-81db1530173so1745473b3a.1 for ; Sat, 24 Jan 2026 16:14:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769300047; x=1769904847; 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=I1xz5idXT1APTVI8Pzd5IY9kVrQIa/rMj6byotHR9sGlFOjP8kpK/bkxr3zTe2fxBZ h6F0nawGYsVwhZqQIqw5aqUUo6o4ZXlKnHN2TeEetbZEaOrEG66DDTRhkqz53KA4YiNn IDgUQ8uVUFEijITjgB4WGgUbFYO8RCkPrHIKjCt8EuFdkspuTKr5oROKDxr0irw6ZJQu mD+tgVDFksCZ/7Iu+mP4fuibuheuImSNkKj1q+pDMsaUZlpVonkfw9l06/qo2+MP68NL SIY/ntOd7vwWH3Pl3o7hav/QPfxfWWkQTKqwyidYD8loWjJBnUGW8BI86G7mxXJV6XU9 EBsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769300047; x=1769904847; 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=UCh1WYir4tPFkwrRnydK32oStiF4WTx9VSCfsEUh+pADhG4muQDLImhDiXzRGyUfGP AjQuOBdd9is9N15ec+lHucnsCtC2B8AdfCBo65Oqb7msJ9qRxM2EX2ZOnBItwD4CyXby saFOh+2iwOOu7H40XvQina9QAW9t+TdUkVA4OT1UwVYcwTRKCjYVJkJGMPzCg2/cwPEz OCunW/BFESbDMfLqOGKeoyWLb6vYNNijyheUGC2V5mPkftx3//YW2HlnCszXf5FzTJ7p /cnOvtYoej56CFnJe/Mz3IPo5nChIoOZPaedgbyPVgNtjfchQnZlcb5IXO2y1gSfLdlW 8tNw== X-Forwarded-Encrypted: i=1; AJvYcCWP8VAp3O3E8xWGjBXRW6bVyakBZ8e66crSgSBiRrx8CATDcukDQuGJBmjz0lmB/JgD1yIKYo7dGGzbl5Q=@vger.kernel.org X-Gm-Message-State: AOJu0Yw9iAwSse8FZ/oMhIlmeDma8UbehoXyCt4l1RTIbn2UZf18nVLF AXzwjHPldy4b4XXzcQNREBntFWsGgk+dXAsrGyvJMDVpg0es5n7WH1gF X-Gm-Gg: AZuq6aLQ80d0GyPqVMTTTO4q3jExNl4XrecuhMvMsz+/L7Hqp2KUvasOH0DbuFzh9Al +lhbj203KmctEsDHQEUUxDlvVmcTHI7p0LLyJBQ1iK1FxdcfN7NWBSdCPI4yQK5hMk1SE7t5qWx PjM647LqYa9t9QPVBqLs8xdr8nvfpwNpeWUl0wLEbgM4as4Sq7aUmj3AUGNDCiUuapIVGXpn1bE naRXIwWmmfsV8FSp00RtrahYEOtWyPVhNM42QRM5uzCcxe2cTb3Y/CLhdfStgQ373LfHYexY+xR WHMVDFGBdfy4EnJLN0AswjQzHHEx4lcx8sqD5TU8cCFXYO0KSkgR3DMwttEMDG4j4IgB9wpvYWO K9yfvdj87pxqvuTN5l3NXm5/rlhpEqFM877W1ALsNb9V7jDei7UV6ZT4ZH+5Q6nVUqLuBMl1aPN EzBcllPC7erYuEypL55A2jyShNWJtJeaC2vmIBAMEW7Clu3d0XRNpe1g== X-Received: by 2002:a05:6a00:23ca:b0:81e:af19:34b8 with SMTP id d2e1a72fcca58-82341286a05mr171970b3a.43.1769300047047; Sat, 24 Jan 2026 16:14:07 -0800 (PST) Received: from d.home.mmyangfl.tk ([2001:19f0:8001:1644:5400:5ff:fe3e:12b1]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8231873ec59sm5683488b3a.53.2026.01.24.16.14.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Jan 2026 16:14:06 -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 v3 2/3] net: dsa: yt921x: Refactor VLAN awareness setting Date: Sun, 25 Jan 2026 08:13:23 +0800 Message-ID: <20260125001328.3784006-3-mmyangfl@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260125001328.3784006-1-mmyangfl@gmail.com> References: <20260125001328.3784006-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