Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

net: dsa: bcm_sf2: Move code enabling Broadcom tags 



In preparation for enabling Broadcom tags on different ports based on
configuration information, dedicate a function that is responsible for
enabling Broadcom tags for a given port and update the IMP port setup to
call it.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0fe99338

drivers/net/dsa/bcm_sf2.c

+34 −27
Original line number Diff line number Diff line
@@ -61,34 +61,9 @@ static void bcm_sf2_imp_vlan_setup(struct dsa_switch *ds, int cpu_port) 
	}

}



static void bcm_sf2_imp_setup(struct dsa_switch *ds, int port)

static void bcm_sf2_brcm_hdr_setup(struct bcm_sf2_priv *priv, int port)

{

	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);

	u32 reg, val, 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);



	/* Enable IMP port in dumb mode */

	reg = core_readl(priv, CORE_SWITCH_CTRL);

	reg |= MII_DUMB_FWDG_EN;

	core_writel(priv, reg, CORE_SWITCH_CTRL);

	u32 reg, val;



	/* Resolve which bit controls the Broadcom tag */

	switch (port) {
@@ -124,6 +99,38 @@ static void bcm_sf2_imp_setup(struct dsa_switch *ds, int port) 
	reg = core_readl(priv, CORE_BRCM_HDR_TX_DIS);

	reg &= ~(1 << port);

	core_writel(priv, reg, CORE_BRCM_HDR_TX_DIS);

}



static void bcm_sf2_imp_setup(struct dsa_switch *ds, int port)

{

	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);

	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);



	/* Enable IMP port in dumb mode */

	reg = core_readl(priv, CORE_SWITCH_CTRL);

	reg |= MII_DUMB_FWDG_EN;

	core_writel(priv, reg, CORE_SWITCH_CTRL);



	bcm_sf2_brcm_hdr_setup(priv, port);



	/* Force link status for IMP port */

	reg = core_readl(priv, offset);