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

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

net: dsa: b53: Export b53_imp_vlan_setup() 



bcm_sf2 and b53 do exactly the same thing, so share that piece.

Reviewed-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f43a2dbe

drivers/net/dsa/b53/b53_common.c

+2 −1
Original line number Diff line number Diff line
@@ -484,7 +484,7 @@ static int b53_fast_age_vlan(struct b53_device *dev, u16 vid) 
	return b53_flush_arl(dev, FAST_AGE_VLAN);

}



static void b53_imp_vlan_setup(struct dsa_switch *ds, int cpu_port)

void b53_imp_vlan_setup(struct dsa_switch *ds, int cpu_port)

{

	struct b53_device *dev = ds->priv;

	unsigned int i;
@@ -500,6 +500,7 @@ static void b53_imp_vlan_setup(struct dsa_switch *ds, int cpu_port) 
		b53_write16(dev, B53_PVLAN_PAGE, B53_PVLAN_PORT_MASK(i), pvlan);

	}

}

EXPORT_SYMBOL(b53_imp_vlan_setup);



static int b53_enable_port(struct dsa_switch *ds, int port,

			   struct phy_device *phy)

drivers/net/dsa/b53/b53_priv.h

+1 −0
Original line number Diff line number Diff line
@@ -284,6 +284,7 @@ static inline int b53_switch_get_reset_gpio(struct b53_device *dev) 
#endif



/* Exported functions towards other drivers */

void b53_imp_vlan_setup(struct dsa_switch *ds, int cpu_port);

void b53_get_strings(struct dsa_switch *ds, int port, uint8_t *data);

void b53_get_ethtool_stats(struct dsa_switch *ds, int port, uint64_t *data);

int b53_get_sset_count(struct dsa_switch *ds);

drivers/net/dsa/bcm_sf2.c

+1 −22
Original line number Diff line number Diff line
@@ -40,27 +40,6 @@ static enum dsa_tag_protocol bcm_sf2_sw_get_tag_protocol(struct dsa_switch *ds) 
	return DSA_TAG_PROTO_BRCM;

}



static void bcm_sf2_imp_vlan_setup(struct dsa_switch *ds, int cpu_port)

{

	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);

	unsigned int i;

	u32 reg;



	/* Enable the IMP Port to be in the same VLAN as the other ports

	 * on a per-port basis such that we only have Port i and IMP in

	 * the same VLAN.

	 */

	for (i = 0; i < priv->hw_params.num_ports; i++) {

		if (!((1 << i) & ds->enabled_port_mask))

			continue;



		reg = core_readl(priv, CORE_PORT_VLAN_CTL_PORT(i));

		reg |= (1 << cpu_port);

		core_writel(priv, reg, CORE_PORT_VLAN_CTL_PORT(i));

	}

}





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

{

	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);
@@ -240,7 +219,7 @@ static int bcm_sf2_port_setup(struct dsa_switch *ds, int port, 
	reg |= priv->dev->ports[port].vlan_ctl_mask;

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



	bcm_sf2_imp_vlan_setup(ds, cpu_port);

	b53_imp_vlan_setup(ds, cpu_port);



	/* If EEE was enabled, restore it */

	if (priv->dev->ports[port].eee.eee_enabled)