From: Daniel Golle Date: Tue, 21 Oct 2025 11:16:30 +0000 (+0100) Subject: net: dsa: lantiq_gswip: clarify GSWIP 2.2 VLAN mode in comment X-Git-Tag: v6.19-rc1~170^2~322^2~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=41b66240e90b0dceb488ce5a4a285a97e6ca63c7;p=thirdparty%2Fkernel%2Flinux.git net: dsa: lantiq_gswip: clarify GSWIP 2.2 VLAN mode in comment The comment above writing the default PVID incorrectly states that "GSWIP 2.2 (GRX300) and later program here the VID directly." The truth is that even GSWIP 2.2 and newer maintain the behavior of GSWIP 2.1 unless the VLANMD bit in PCE Global Control Register 1 is set ("GSWIP2.2 VLAN Mode"). Fix the misleading comment accordingly. Signed-off-by: Daniel Golle Acked-by; Hauke Mehrtens : Acked-by; Hauke Mehrtens : Link: https://patch.msgid.link/018056a575503d9797f3222f71a988e825316be0.1761045000.git.daniel@makrotopia.org Signed-off-by: Jakub Kicinski --- diff --git a/drivers/net/dsa/lantiq/lantiq_gswip.c b/drivers/net/dsa/lantiq/lantiq_gswip.c index 25f6b46957a01..86b410a40d32c 100644 --- a/drivers/net/dsa/lantiq/lantiq_gswip.c +++ b/drivers/net/dsa/lantiq/lantiq_gswip.c @@ -588,7 +588,11 @@ static void gswip_port_commit_pvid(struct gswip_priv *priv, int port) FIELD_PREP(GSWIP_PCE_VCTRL_VINR, vinr), GSWIP_PCE_VCTRL(port)); - /* GSWIP 2.2 (GRX300) and later program here the VID directly. */ + /* Note that in GSWIP 2.2 VLAN mode the VID needs to be programmed + * directly instead of referencing the index in the Active VLAN Tablet. + * However, without the VLANMD bit (9) in PCE_GCTRL_1 (0x457) even + * GSWIP 2.2 and newer hardware maintain the GSWIP 2.1 behavior. + */ gswip_switch_w(priv, idx, GSWIP_PCE_DEFPVID(port)); }