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

Commit 1270080b authored by Florian Fainelli's avatar Florian Fainelli Committed by Greg Kroah-Hartman
Browse files

net: dsa: b53: Support setting learning on port 



commit f9b3827ee66cfcf297d0acd6ecf33653a5f297ef upstream.

Add support for being able to set the learning attribute on port, and
make sure that the standalone ports start up with learning disabled.

We can remove the code in bcm_sf2 that configured the ports learning
attribute because we want the standalone ports to have learning disabled
by default and port 7 cannot be bridged, so its learning attribute will
not change past its initial configuration.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarVladimir Oltean <olteanv@gmail.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cfbfa9c7

drivers/net/dsa/b53/b53_common.c

+19 −0
Original line number Diff line number Diff line
@@ -507,12 +507,27 @@ void b53_imp_vlan_setup(struct dsa_switch *ds, int cpu_port) 
}

EXPORT_SYMBOL(b53_imp_vlan_setup);



static void b53_port_set_learning(struct b53_device *dev, int port,

				  bool learning)

{

	u16 reg;



	b53_read16(dev, B53_CTRL_PAGE, B53_DIS_LEARNING, &reg);

	if (learning)

		reg &= ~BIT(port);

	else

		reg |= BIT(port);

	b53_write16(dev, B53_CTRL_PAGE, B53_DIS_LEARNING, reg);

}



int b53_enable_port(struct dsa_switch *ds, int port, struct phy_device *phy)

{

	struct b53_device *dev = ds->priv;

	unsigned int cpu_port = ds->ports[port].cpu_dp->index;

	u16 pvlan;



	b53_port_set_learning(dev, port, false);



	/* Clear the Rx and Tx disable bits and set to no spanning tree */

	b53_write8(dev, B53_CTRL_PAGE, B53_PORT_CTRL(port), 0);
@@ -620,6 +635,7 @@ static void b53_enable_cpu_port(struct b53_device *dev, int port) 
	b53_write8(dev, B53_CTRL_PAGE, B53_PORT_CTRL(port), port_ctrl);



	b53_brcm_hdr_setup(dev->ds, port);

	b53_port_set_learning(dev, port, false);

}



static void b53_enable_mib(struct b53_device *dev)
@@ -1517,6 +1533,8 @@ int b53_br_join(struct dsa_switch *ds, int port, struct net_device *br) 
	b53_write16(dev, B53_PVLAN_PAGE, B53_PVLAN_PORT_MASK(port), pvlan);

	dev->ports[port].vlan_ctl_mask = pvlan;



	b53_port_set_learning(dev, port, true);



	return 0;

}

EXPORT_SYMBOL(b53_br_join);
@@ -1564,6 +1582,7 @@ void b53_br_leave(struct dsa_switch *ds, int port, struct net_device *br) 
		vl->untag |= BIT(port) | BIT(cpu_port);

		b53_set_vlan_entry(dev, pvid, vl);

	}

	b53_port_set_learning(dev, port, false);

}

EXPORT_SYMBOL(b53_br_leave);

drivers/net/dsa/b53/b53_regs.h

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ 
#define B53_UC_FLOOD_MASK		0x32

#define B53_MC_FLOOD_MASK		0x34

#define B53_IPMC_FLOOD_MASK		0x36

#define B53_DIS_LEARNING		0x3c



/*

 * Override Ports 0-7 State on devices with xMII interfaces (8 bit)

drivers/net/dsa/bcm_sf2.c

+0 −5
Original line number Diff line number Diff line
@@ -173,11 +173,6 @@ static int bcm_sf2_port_setup(struct dsa_switch *ds, int port, 
	reg &= ~P_TXQ_PSM_VDD(port);

	core_writel(priv, reg, CORE_MEM_PSM_VDD_CTRL);



	/* Enable learning */

	reg = core_readl(priv, CORE_DIS_LEARN);

	reg &= ~BIT(port);

	core_writel(priv, reg, CORE_DIS_LEARN);



	/* Enable Broadcom tags for that port if requested */

	if (priv->brcm_tag_mask & BIT(port))

		b53_brcm_hdr_setup(ds, port);