Commit 86b9ea64 authored by Martin Schiller's avatar Martin Schiller Committed by Jakub Kicinski
Browse files

net: dsa: lantiq_gswip: do also enable or disable cpu port 



Before commit 74be4bab ("net: dsa: do not enable or disable non user
ports"), gswip_port_enable/disable() were also executed for the cpu port
in gswip_setup() which disabled the cpu port during initialization.

Let's restore this by removing the dsa_is_user_port checks. Also, let's
clean up the gswip_port_enable() function so that we only have to check
for the cpu port once. The operation reordering done here is safe.

Signed-off-by: default avatarMartin Schiller <ms@dev.tdt.de>
Acked-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Reviewed-by: default avatarVladimir Oltean <olteanv@gmail.com>
Link: https://lore.kernel.org/r/20240611135434.3180973-7-ms@dev.tdt.de


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent f5ebf9ab

drivers/net/dsa/lantiq_gswip.c

+8 −16
Original line number Diff line number Diff line
@@ -695,13 +695,18 @@ static int gswip_port_enable(struct dsa_switch *ds, int port, 
	struct gswip_priv *priv = ds->priv;

	int err;



	if (!dsa_is_user_port(ds, port))

		return 0;



	if (!dsa_is_cpu_port(ds, port)) {

		u32 mdio_phy = 0;



		err = gswip_add_single_port_br(priv, port, true);

		if (err)

			return err;



		if (phydev)

			mdio_phy = phydev->mdio.addr & GSWIP_MDIO_PHY_ADDR_MASK;



		gswip_mdio_mask(priv, GSWIP_MDIO_PHY_ADDR_MASK, mdio_phy,

				GSWIP_MDIO_PHYp(port));

	}



	/* RMON Counter Enable for port */
@@ -714,16 +719,6 @@ static int gswip_port_enable(struct dsa_switch *ds, int port, 
	gswip_switch_mask(priv, 0, GSWIP_SDMA_PCTRL_EN,

			  GSWIP_SDMA_PCTRLp(port));



	if (!dsa_is_cpu_port(ds, port)) {

		u32 mdio_phy = 0;



		if (phydev)

			mdio_phy = phydev->mdio.addr & GSWIP_MDIO_PHY_ADDR_MASK;



		gswip_mdio_mask(priv, GSWIP_MDIO_PHY_ADDR_MASK, mdio_phy,

				GSWIP_MDIO_PHYp(port));

	}



	return 0;

}
@@ -731,9 +726,6 @@ static void gswip_port_disable(struct dsa_switch *ds, int port) 
{

	struct gswip_priv *priv = ds->priv;



	if (!dsa_is_user_port(ds, port))

		return;



	gswip_switch_mask(priv, GSWIP_FDMA_PCTRL_EN, 0,

			  GSWIP_FDMA_PCTRLp(port));

	gswip_switch_mask(priv, GSWIP_SDMA_PCTRL_EN, 0,