From nobody Tue Dec 2 00:25:17 2025 Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) (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 CDCE62DC338 for ; Tue, 25 Nov 2025 07:52:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764057133; cv=none; b=rETnM8BpIOm4QkhoKF5DaElPQHdVimkvNUPsPxY8sjb9kQBIxyvE/E1JcqyYIp+Tihha+LkNnH7AGZeQZDv84s48QpkdCmkadp2du54H7Vd1gbaFDgOe4b8aTEW0gP5zvg+8xYy1qT1WBemQL/qMUJMo67LX4/Gu17hL7OjH1TQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764057133; c=relaxed/simple; bh=2IDfTgVRfPVoxOoroR4XS8Qg2cGhPJ/8dpwLu49CnJk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pv+kCQWvVd+Zj/FVBIINRdzIF3TdL93hzS60LOOn3o1LEzsvs1SF0UZIM2ndMrIo/zTBYnpFgR8hj9lWfpUF0fO0pPIOauP+PJ7UkcTh5UDmVaH+IUdtr2pHGLkV9DMQBoFh9xF/wY4oPhXvumQm2GAKM2ThP8KM91HPjecHCfw= 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=HMjOlD5l; arc=none smtp.client-ip=209.85.218.41 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="HMjOlD5l" Received: by mail-ej1-f41.google.com with SMTP id a640c23a62f3a-b735ce67d1dso806086366b.3 for ; Mon, 24 Nov 2025 23:52:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764057130; x=1764661930; 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=HYHFwdbxRLbygb/fCHFJ4ddI34Qtby7k1kfsMle3SjE=; b=HMjOlD5liIIhpq1k6sAlAjUt07FJxtc1fMQ4s5Cc+yeZkvgr3GAstxp9flCSJGMvP3 3RMxhgc/cYXCQFRVFuZHXc2wSmZjjEvPvOAYc5Gbb3rWKf7CGat6nOyjoV01xPu/XF4t wocjlP8lEQcC7u/dpJI8LAO64/takx4w/1mgr21mCpMvb4A3KZSOzZMY9ZMsYzk7UmjY 8kscpyhvEdohOfOlEtvqLGZYljxgL3nr62g/EVZOxJJm8+7QyljReW4BVqhKXqtRRKx/ giFmWVuQKNABXGNBs7fKDzTcyCWTZouN4cgJcpU5KukuRLxlE16wrkM8//J+8GjZR3Lc RX/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764057130; x=1764661930; 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=HYHFwdbxRLbygb/fCHFJ4ddI34Qtby7k1kfsMle3SjE=; b=smSz0xKA85QtwLzwSVkyVgDdnqRvOhbOB+zkbxBAGVk8yFCljyELViEo1HL0uLw2NG 3gUaVUxxabF4TAdx8ya5dUBIeklgH3B6t5xUadCt8ijX6HD5Fk5sykjhqZEt5uKfcF2U iQeaAcC/b4OMo7u621twdz2R9dW29qFIlSVP1O6nxeBZ7GQxHQ7ljhOPW7WcJQhyt+VR 1g7KDdRhYXxcNZVIY4rc9MLQNml8jcCvPeoGNXjtYM/NwlI7UDlihNNUYFc7mW7WVxvG 6tK8aLpqyyF/BxRBIIhfYstYfTGjqcr4YtY1tI4E4eSzRgfey9oWXIRGtuDD/ScyCVDa ZuJA== X-Forwarded-Encrypted: i=1; AJvYcCUK4ID48Vu4hyU2CkiIE/rLgPGO5TpBcEA7qX4ZiJV9TtlBHNkS4lEhuU+TctBPX6WOb1FYt9V1Gt5tbqI=@vger.kernel.org X-Gm-Message-State: AOJu0YxUNcCmMES5fsmB84azfKJxpqlyirmyRYKRUE63e5Zrjgl/Zfoh h9iKpf624CQOAb6YDToTW7Gf3+3xJzf0WqfieSYH8eSvYVKUI2UJNSqhK9X/Xww/ X-Gm-Gg: ASbGncuZGAPhQ2caJagdYJyJ8d+nt7Y1K9jPIAUcgeBBaI4fqGW4+hfUfpWLuPCovpI ufws2w4dz1t8Pg8tpavp+u7fdhHUFLh880dvWPe3K1278gCPK+GfPpfaiOGy7q1pKwk+dRoCRwv bIA2yMW7bSmO02G5bgsKYO2AUbE4d+gBE0E91f3kdA6pyViylnV9wNWI3NqWWXIwlbu2z7Pr9OR IVpnRspyze1RUpIzZhl5VMtCQl3XhJ96dUMBKESakOrOG2B6pjGk4Lsk/XoDO8YblBFtKfr1s9a 9tr+ImqFWTSo/9zZ+oaTqlm26h3GDl7VMGKWon0PtvV2oVUrmYnE/k6YtaQQ03GRicaFrFgnI+b 0oqR7kZRgLUePDlT9OLVOjw+VOE9Nbj/aiehiT4O9paVz9ploTiqFDYoE1PPLv3q5r3i2xc1wOI ygAKvuonPtzSKy+DvZBd7JLCWPKaExEXaHQgDX2u2Nl61cShFpiJQb3xi3G5VhumVojmA= X-Google-Smtp-Source: AGHT+IFdle32TRioESDmWF/xcaCqK6QYh9FTiqmxWzVBB3FON2HCO36Ge3caO0vVpXHNG1vPejD/rw== X-Received: by 2002:a17:907:97d1:b0:b76:4010:a890 with SMTP id a640c23a62f3a-b76c550b652mr177846666b.31.1764057129980; Mon, 24 Nov 2025 23:52:09 -0800 (PST) Received: from localhost (dslb-002-205-018-238.002.205.pools.vodafone-ip.de. [2.205.18.238]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b7654cdd5ebsm1533132266b.14.2025.11.24.23.52.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Nov 2025 23:52:09 -0800 (PST) From: Jonas Gorski To: Florian Fainelli , Andrew Lunn , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Cc: Florian Fainelli , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 7/7] net: dsa: b53: allow VID 0 for BCM5325/65 Date: Tue, 25 Nov 2025 08:51:50 +0100 Message-ID: <20251125075150.13879-8-jonas.gorski@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251125075150.13879-1-jonas.gorski@gmail.com> References: <20251125075150.13879-1-jonas.gorski@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" Now that writing ARL entries works properly, we can actually use VID 0 as the default untagged VLAN for BCM5325 and BCM5365 as well, so use 0 as default PVID always. Signed-off-by: Jonas Gorski Tested-by: =C3=81lvaro Fern=C3=A1ndez Rojas --- drivers/net/dsa/b53/b53_common.c | 49 +++++++++++--------------------- 1 file changed, 17 insertions(+), 32 deletions(-) diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_com= mon.c index ac995f36ed95..4eff64204897 100644 --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c @@ -870,14 +870,6 @@ static void b53_enable_stp(struct b53_device *dev) b53_write8(dev, B53_MGMT_PAGE, B53_GLOBAL_CONFIG, gc); } =20 -static u16 b53_default_pvid(struct b53_device *dev) -{ - if (is5325(dev) || is5365(dev)) - return 1; - else - return 0; -} - static bool b53_vlan_port_needs_forced_tagged(struct dsa_switch *ds, int p= ort) { struct b53_device *dev =3D ds->priv; @@ -906,14 +898,12 @@ int b53_configure_vlan(struct dsa_switch *ds) struct b53_device *dev =3D ds->priv; struct b53_vlan vl =3D { 0 }; struct b53_vlan *v; - int i, def_vid; u16 vid; - - def_vid =3D b53_default_pvid(dev); + int i; =20 /* clear all vlan entries */ if (is5325(dev) || is5365(dev)) { - for (i =3D def_vid; i < dev->num_vlans; i++) + for (i =3D 0; i < dev->num_vlans; i++) b53_set_vlan_entry(dev, i, &vl); } else { b53_do_vlan_op(dev, VTA_CMD_CLEAR); @@ -927,7 +917,7 @@ int b53_configure_vlan(struct dsa_switch *ds) * entry. Do this only when the tagging protocol is not * DSA_TAG_PROTO_NONE */ - v =3D &dev->vlans[def_vid]; + v =3D &dev->vlans[0]; b53_for_each_port(dev, i) { if (!b53_vlan_port_may_join_untagged(ds, i)) continue; @@ -935,16 +925,15 @@ int b53_configure_vlan(struct dsa_switch *ds) vl.members |=3D BIT(i); if (!b53_vlan_port_needs_forced_tagged(ds, i)) vl.untag =3D vl.members; - b53_write16(dev, B53_VLAN_PAGE, B53_VLAN_PORT_DEF_TAG(i), - def_vid); + b53_write16(dev, B53_VLAN_PAGE, B53_VLAN_PORT_DEF_TAG(i), 0); } - b53_set_vlan_entry(dev, def_vid, &vl); + b53_set_vlan_entry(dev, 0, &vl); =20 if (dev->vlan_filtering) { /* Upon initial call we have not set-up any VLANs, but upon * system resume, we need to restore all VLAN entries. */ - for (vid =3D def_vid + 1; vid < dev->num_vlans; vid++) { + for (vid =3D 1; vid < dev->num_vlans; vid++) { v =3D &dev->vlans[vid]; =20 if (!v->members) @@ -1280,7 +1269,6 @@ static int b53_setup(struct dsa_switch *ds) struct b53_device *dev =3D ds->priv; struct b53_vlan *vl; unsigned int port; - u16 pvid; int ret; =20 /* Request bridge PVID untagged when DSA_TAG_PROTO_NONE is set @@ -1310,8 +1298,7 @@ static int b53_setup(struct dsa_switch *ds) } =20 /* setup default vlan for filtering mode */ - pvid =3D b53_default_pvid(dev); - vl =3D &dev->vlans[pvid]; + vl =3D &dev->vlans[0]; b53_for_each_port(dev, port) { vl->members |=3D BIT(port); if (!b53_vlan_port_needs_forced_tagged(ds, port)) @@ -1740,7 +1727,7 @@ int b53_vlan_add(struct dsa_switch *ds, int port, if (pvid) new_pvid =3D vlan->vid; else if (!pvid && vlan->vid =3D=3D old_pvid) - new_pvid =3D b53_default_pvid(dev); + new_pvid =3D 0; else new_pvid =3D old_pvid; dev->ports[port].pvid =3D new_pvid; @@ -1790,7 +1777,7 @@ int b53_vlan_del(struct dsa_switch *ds, int port, vl->members &=3D ~BIT(port); =20 if (pvid =3D=3D vlan->vid) - pvid =3D b53_default_pvid(dev); + pvid =3D 0; dev->ports[port].pvid =3D pvid; =20 if (untagged && !b53_vlan_port_needs_forced_tagged(ds, port)) @@ -2269,7 +2256,7 @@ int b53_br_join(struct dsa_switch *ds, int port, stru= ct dsa_bridge bridge, struct b53_device *dev =3D ds->priv; struct b53_vlan *vl; s8 cpu_port =3D dsa_to_port(ds, port)->cpu_dp->index; - u16 pvlan, reg, pvid; + u16 pvlan, reg; unsigned int i; =20 /* On 7278, port 7 which connects to the ASP should only receive @@ -2278,8 +2265,7 @@ int b53_br_join(struct dsa_switch *ds, int port, stru= ct dsa_bridge bridge, if (dev->chip_id =3D=3D BCM7278_DEVICE_ID && port =3D=3D 7) return -EINVAL; =20 - pvid =3D b53_default_pvid(dev); - vl =3D &dev->vlans[pvid]; + vl =3D &dev->vlans[0]; =20 if (dev->vlan_filtering) { /* Make this port leave the all VLANs join since we will have @@ -2295,9 +2281,9 @@ int b53_br_join(struct dsa_switch *ds, int port, stru= ct dsa_bridge bridge, reg); } =20 - b53_get_vlan_entry(dev, pvid, vl); + b53_get_vlan_entry(dev, 0, vl); vl->members &=3D ~BIT(port); - b53_set_vlan_entry(dev, pvid, vl); + b53_set_vlan_entry(dev, 0, vl); } =20 b53_read16(dev, B53_PVLAN_PAGE, B53_PVLAN_PORT_MASK(port), &pvlan); @@ -2336,7 +2322,7 @@ void b53_br_leave(struct dsa_switch *ds, int port, st= ruct dsa_bridge bridge) struct b53_vlan *vl; s8 cpu_port =3D dsa_to_port(ds, port)->cpu_dp->index; unsigned int i; - u16 pvlan, reg, pvid; + u16 pvlan, reg; =20 b53_read16(dev, B53_PVLAN_PAGE, B53_PVLAN_PORT_MASK(port), &pvlan); =20 @@ -2361,8 +2347,7 @@ void b53_br_leave(struct dsa_switch *ds, int port, st= ruct dsa_bridge bridge) b53_write16(dev, B53_PVLAN_PAGE, B53_PVLAN_PORT_MASK(port), pvlan); dev->ports[port].vlan_ctl_mask =3D pvlan; =20 - pvid =3D b53_default_pvid(dev); - vl =3D &dev->vlans[pvid]; + vl =3D &dev->vlans[0]; =20 if (dev->vlan_filtering) { /* Make this port join all VLANs without VLAN entries */ @@ -2374,9 +2359,9 @@ void b53_br_leave(struct dsa_switch *ds, int port, st= ruct dsa_bridge bridge) b53_write16(dev, B53_VLAN_PAGE, B53_JOIN_ALL_VLAN_EN, reg); } =20 - b53_get_vlan_entry(dev, pvid, vl); + b53_get_vlan_entry(dev, 0, vl); vl->members |=3D BIT(port); - b53_set_vlan_entry(dev, pvid, vl); + b53_set_vlan_entry(dev, 0, vl); } } EXPORT_SYMBOL(b53_br_leave); --=20 2.43.0