From nobody Mon Feb 9 02:31:37 2026 Received: from pidgin.makrotopia.org (pidgin.makrotopia.org [185.142.180.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AFC0B19F48D; Wed, 15 Oct 2025 22:32:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.142.180.65 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760567545; cv=none; b=WVfXZj+l8BPFVx8wa9560Z1NhiWpgpDBDH6LTPeKZxKNYTLcobGS0IGwp6L7oQKXobjzGuA3J81EV8ATOcbH4uB40WrY+Z6s4m8ZEEeI7RUOKreS3MOowYeajBY1TevMjUHbrCJkiQ1aKZCrx+l5D0xFxjMgM5Xjls1wN9uItS0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760567545; c=relaxed/simple; bh=U9blwsk4OVt9UrRakM3tsBcbBMnypAVW5Y1XkJY1u5k=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=OHzA5/xYfWJ/p1hD4BElxf3qnd3/Rs6ALAnRqSlPkGBEda+dV3+Ky4t7vIoaBqAi4I98fmV4bOmVuDby8Qu0sNV+oFNJaX2T8A9sqg8PAX/heqWrRrmsfIud9Py3LxrgRI/cCxiqWlgIZgvEV1M8aaKizrRW8vjeAIBnfkzD9mk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=makrotopia.org; spf=pass smtp.mailfrom=makrotopia.org; arc=none smtp.client-ip=185.142.180.65 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=makrotopia.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=makrotopia.org Received: from local by pidgin.makrotopia.org with esmtpsa (TLS1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.98.2) (envelope-from ) id 1v9A2c-000000006Ub-3iD1; Wed, 15 Oct 2025 22:32:18 +0000 Date: Wed, 15 Oct 2025 23:32:15 +0100 From: Daniel Golle To: Hauke Mehrtens , Andrew Lunn , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Andreas Schirm , Lukas Stockmann , Alexander Sverdlin , Peter Christen , Avinash Jayaraman , Bing tao Xu , Liang Xu , Juraj Povazanec , "Fanni (Fang-Yi) Chan" , "Benny (Ying-Tsan) Weng" , "Livia M. Rosu" , John Crispin Subject: [PATCH net-next 02/11] net: dsa: lantiq_gswip: define VLAN ID 0 constant Message-ID: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Vladimir Oltean This patch adds an explicit definition for VID 0 to the Lantiq GSWIP DSA driver, clarifying its special meaning. Signed-off-by: Vladimir Oltean Signed-off-by: Daniel Golle --- drivers/net/dsa/lantiq/lantiq_gswip.c | 12 +++++++----- drivers/net/dsa/lantiq/lantiq_gswip.h | 2 ++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/net/dsa/lantiq/lantiq_gswip.c b/drivers/net/dsa/lantiq= /lantiq_gswip.c index 91755a5972fa..9526317443a1 100644 --- a/drivers/net/dsa/lantiq/lantiq_gswip.c +++ b/drivers/net/dsa/lantiq/lantiq_gswip.c @@ -432,7 +432,7 @@ static int gswip_add_single_port_br(struct gswip_priv *= priv, int port, bool add) =20 vlan_active.index =3D port + 1; vlan_active.table =3D GSWIP_TABLE_ACTIVE_VLAN; - vlan_active.key[0] =3D 0; /* vid */ + vlan_active.key[0] =3D GSWIP_VLAN_UNAWARE_PVID; vlan_active.val[0] =3D port + 1 /* fid */; vlan_active.valid =3D add; err =3D gswip_pce_table_entry_write(priv, &vlan_active); @@ -446,7 +446,7 @@ static int gswip_add_single_port_br(struct gswip_priv *= priv, int port, bool add) =20 vlan_mapping.index =3D port + 1; vlan_mapping.table =3D GSWIP_TABLE_VLAN_MAPPING; - vlan_mapping.val[0] =3D 0 /* vid */; + vlan_mapping.val[0] =3D GSWIP_VLAN_UNAWARE_PVID; vlan_mapping.val[1] =3D BIT(port) | dsa_cpu_ports(priv->ds); vlan_mapping.val[2] =3D 0; err =3D gswip_pce_table_entry_write(priv, &vlan_mapping); @@ -772,7 +772,8 @@ static int gswip_vlan_add_unaware(struct gswip_priv *pr= iv, * entry in a free slot and prepare the VLAN mapping table entry. */ if (idx =3D=3D -1) { - idx =3D gswip_vlan_active_create(priv, bridge, -1, 0); + idx =3D gswip_vlan_active_create(priv, bridge, -1, + GSWIP_VLAN_UNAWARE_PVID); if (idx < 0) return idx; active_vlan_created =3D true; @@ -780,7 +781,7 @@ static int gswip_vlan_add_unaware(struct gswip_priv *pr= iv, vlan_mapping.index =3D idx; vlan_mapping.table =3D GSWIP_TABLE_VLAN_MAPPING; /* VLAN ID byte, maps to the VLAN ID of vlan active table */ - vlan_mapping.val[0] =3D 0; + vlan_mapping.val[0] =3D GSWIP_VLAN_UNAWARE_PVID; } else { /* Read the existing VLAN mapping entry from the switch */ vlan_mapping.index =3D idx; @@ -977,7 +978,8 @@ static void gswip_port_bridge_leave(struct dsa_switch *= ds, int port, * specific bridges. No bridge is configured here. */ if (!br_vlan_enabled(br)) - gswip_vlan_remove(priv, br, port, 0, true, false); + gswip_vlan_remove(priv, br, port, GSWIP_VLAN_UNAWARE_PVID, true, + false); } =20 static int gswip_port_vlan_prepare(struct dsa_switch *ds, int port, diff --git a/drivers/net/dsa/lantiq/lantiq_gswip.h b/drivers/net/dsa/lantiq= /lantiq_gswip.h index 2df9c8e8cfd0..6aae1ff2f130 100644 --- a/drivers/net/dsa/lantiq/lantiq_gswip.h +++ b/drivers/net/dsa/lantiq/lantiq_gswip.h @@ -222,6 +222,8 @@ */ #define GSWIP_MAX_PACKET_LENGTH 2400 =20 +#define GSWIP_VLAN_UNAWARE_PVID 0 + struct gswip_pce_microcode { u16 val_3; u16 val_2; --=20 2.51.0