Commit 5fc0f212 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: dsa: bcm_sf2: Fix IMP setup for port different than 8 



Since it became possible for the DSA core to use a CPU port different
than 8, our bcm_sf2_imp_setup() function was broken because it assumes
that registers are applicable to port 8. In particular, the port's MAC
is going to stay disabled, so make sure we clear the RX_DIS and TX_DIS
bits if we are not configured for port 8.

Fixes: 9f91484f ("net: dsa: make "label" property optional for dsa2")
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9d68db50

drivers/net/dsa/bcm_sf2.c

+21 −15
Original line number Diff line number Diff line
@@ -37,22 +37,11 @@ static void bcm_sf2_imp_setup(struct dsa_switch *ds, int port) 
	unsigned int i;

	u32 reg, offset;



	if (priv->type == BCM7445_DEVICE_ID)

		offset = CORE_STS_OVERRIDE_IMP;

	else

		offset = CORE_STS_OVERRIDE_IMP2;



	/* Enable the port memories */

	reg = core_readl(priv, CORE_MEM_PSM_VDD_CTRL);

	reg &= ~P_TXQ_PSM_VDD(port);

	core_writel(priv, reg, CORE_MEM_PSM_VDD_CTRL);



	/* Enable Broadcast, Multicast, Unicast forwarding to IMP port */

	reg = core_readl(priv, CORE_IMP_CTL);

	reg |= (RX_BCST_EN | RX_MCST_EN | RX_UCST_EN);

	reg &= ~(RX_DIS | TX_DIS);

	core_writel(priv, reg, CORE_IMP_CTL);



	/* Enable forwarding */

	core_writel(priv, SW_FWDG_EN, CORE_SWMODE);
@@ -71,10 +60,27 @@ static void bcm_sf2_imp_setup(struct dsa_switch *ds, int port) 


	b53_brcm_hdr_setup(ds, port);



	if (port == 8) {

		if (priv->type == BCM7445_DEVICE_ID)

			offset = CORE_STS_OVERRIDE_IMP;

		else

			offset = CORE_STS_OVERRIDE_IMP2;



		/* Force link status for IMP port */

		reg = core_readl(priv, offset);

		reg |= (MII_SW_OR | LINK_STS);

		core_writel(priv, reg, offset);



		/* Enable Broadcast, Multicast, Unicast forwarding to IMP port */

		reg = core_readl(priv, CORE_IMP_CTL);

		reg |= (RX_BCST_EN | RX_MCST_EN | RX_UCST_EN);

		reg &= ~(RX_DIS | TX_DIS);

		core_writel(priv, reg, CORE_IMP_CTL);

	} else {

		reg = core_readl(priv, CORE_G_PCTL_PORT(port));

		reg &= ~(RX_DIS | TX_DIS);

		core_writel(priv, reg, CORE_G_PCTL_PORT(port));

	}

}



static void bcm_sf2_gphy_enable_set(struct dsa_switch *ds, bool enable)

CRA Git | Maintained and supported by SUSTech CRA and CCSE