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

Commit 08a01261 authored May 09, 2016 by Vivien Didelot Committed by David S. Miller May 09, 2016

net: dsa: mv88e6xxx: factorize global setup



Every driver is calling mv88e6xxx_setup_global after
mv88e6xxx_setup_common. Call the former in the latter.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 552238b5

drivers/net/dsa/mv88e6123.c

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -58,10 +58,6 @@ static int mv88e6123_setup_global(struct dsa_switch *ds)
	int ret;		int ret;
	u32 reg;		u32 reg;

	ret = mv88e6xxx_setup_global(ds);
	if (ret)
	return ret;

	/* Disable the PHY polling unit (since there won't be any		/* Disable the PHY polling unit (since there won't be any
	* external PHYs to poll), don't discard packets with		* external PHYs to poll), don't discard packets with
	* excessive collisions, and mask all interrupt sources.		* excessive collisions, and mask all interrupt sources.

drivers/net/dsa/mv88e6131.c

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -65,10 +65,6 @@ static int mv88e6131_setup_global(struct dsa_switch *ds)
	int ret;		int ret;
	u32 reg;		u32 reg;

	ret = mv88e6xxx_setup_global(ds);
	if (ret)
	return ret;

	/* Enable the PHY polling unit, don't discard packets with		/* Enable the PHY polling unit, don't discard packets with
	* excessive collisions, use a weighted fair queueing scheme		* excessive collisions, use a weighted fair queueing scheme
	* to arbitrate between packet queues, set the maximum frame		* to arbitrate between packet queues, set the maximum frame

drivers/net/dsa/mv88e6171.c

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -65,10 +65,6 @@ static int mv88e6171_setup_global(struct dsa_switch *ds)
	int ret;		int ret;
	u32 reg;		u32 reg;

	ret = mv88e6xxx_setup_global(ds);
	if (ret)
	return ret;

	/* Discard packets with excessive collisions, mask all		/* Discard packets with excessive collisions, mask all
	* interrupt sources, enable PPU.		* interrupt sources, enable PPU.
	*/		*/

drivers/net/dsa/mv88e6352.c

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -84,10 +84,6 @@ static int mv88e6352_setup_global(struct dsa_switch *ds)
	int ret;		int ret;
	u32 reg;		u32 reg;

	ret = mv88e6xxx_setup_global(ds);
	if (ret)
	return ret;

	/* Discard packets with excessive collisions,		/* Discard packets with excessive collisions,
	* mask all interrupt sources, enable PPU (bit 14, undocumented).		* mask all interrupt sources, enable PPU (bit 14, undocumented).
	*/		*/

drivers/net/dsa/mv88e6xxx.c

+56 −53

Original line number	Original line	Diff line number	Diff line
	@@ -2920,36 +2920,11 @@ int mv88e6xxx_setup_ports(struct dsa_switch *ds)
	return 0;		return 0;
	}		}

	int mv88e6xxx_setup_common(struct mv88e6xxx_priv_state *ps)		static int mv88e6xxx_setup_global(struct mv88e6xxx_priv_state *ps)
	{		{
	int err;		int err;

	mutex_init(&ps->smi_mutex);

	INIT_WORK(&ps->bridge_work, mv88e6xxx_bridge_work);

	if (mv88e6xxx_has(ps, MV88E6XXX_FLAG_EEPROM))
	mutex_init(&ps->eeprom_mutex);

	if (mv88e6xxx_has(ps, MV88E6XXX_FLAG_PPU))
	mv88e6xxx_ppu_state_init(ps);

	mutex_lock(&ps->smi_mutex);

	err = mv88e6xxx_switch_reset(ps);

	mutex_unlock(&ps->smi_mutex);

	return err;
	}

	int mv88e6xxx_setup_global(struct dsa_switch *ds)
	{
	struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
	int err;
	int i;		int i;

	mutex_lock(&ps->smi_mutex);
	/* Set the default address aging time to 5 minutes, and		/* Set the default address aging time to 5 minutes, and
	* enable address learn messages to be sent to all message		* enable address learn messages to be sent to all message
	* ports.		* ports.
	@@ -2957,45 +2932,45 @@ int mv88e6xxx_setup_global(struct dsa_switch *ds)
	err = _mv88e6xxx_reg_write(ps, REG_GLOBAL, GLOBAL_ATU_CONTROL,		err = _mv88e6xxx_reg_write(ps, REG_GLOBAL, GLOBAL_ATU_CONTROL,
	0x0140 \| GLOBAL_ATU_CONTROL_LEARN2ALL);		0x0140 \| GLOBAL_ATU_CONTROL_LEARN2ALL);
	if (err)		if (err)
	goto unlock;		return err;

	/* Configure the IP ToS mapping registers. */		/* Configure the IP ToS mapping registers. */
	err = _mv88e6xxx_reg_write(ps, REG_GLOBAL, GLOBAL_IP_PRI_0, 0x0000);		err = _mv88e6xxx_reg_write(ps, REG_GLOBAL, GLOBAL_IP_PRI_0, 0x0000);
	if (err)		if (err)
	goto unlock;		return err;
	err = _mv88e6xxx_reg_write(ps, REG_GLOBAL, GLOBAL_IP_PRI_1, 0x0000);		err = _mv88e6xxx_reg_write(ps, REG_GLOBAL, GLOBAL_IP_PRI_1, 0x0000);
	if (err)		if (err)
	goto unlock;		return err;
	err = _mv88e6xxx_reg_write(ps, REG_GLOBAL, GLOBAL_IP_PRI_2, 0x5555);		err = _mv88e6xxx_reg_write(ps, REG_GLOBAL, GLOBAL_IP_PRI_2, 0x5555);
	if (err)		if (err)
	goto unlock;		return err;
	err = _mv88e6xxx_reg_write(ps, REG_GLOBAL, GLOBAL_IP_PRI_3, 0x5555);		err = _mv88e6xxx_reg_write(ps, REG_GLOBAL, GLOBAL_IP_PRI_3, 0x5555);
	if (err)		if (err)
	goto unlock;		return err;
	err = _mv88e6xxx_reg_write(ps, REG_GLOBAL, GLOBAL_IP_PRI_4, 0xaaaa);		err = _mv88e6xxx_reg_write(ps, REG_GLOBAL, GLOBAL_IP_PRI_4, 0xaaaa);
	if (err)		if (err)
	goto unlock;		return err;
	err = _mv88e6xxx_reg_write(ps, REG_GLOBAL, GLOBAL_IP_PRI_5, 0xaaaa);		err = _mv88e6xxx_reg_write(ps, REG_GLOBAL, GLOBAL_IP_PRI_5, 0xaaaa);
	if (err)		if (err)
	goto unlock;		return err;
	err = _mv88e6xxx_reg_write(ps, REG_GLOBAL, GLOBAL_IP_PRI_6, 0xffff);		err = _mv88e6xxx_reg_write(ps, REG_GLOBAL, GLOBAL_IP_PRI_6, 0xffff);
	if (err)		if (err)
	goto unlock;		return err;
	err = _mv88e6xxx_reg_write(ps, REG_GLOBAL, GLOBAL_IP_PRI_7, 0xffff);		err = _mv88e6xxx_reg_write(ps, REG_GLOBAL, GLOBAL_IP_PRI_7, 0xffff);
	if (err)		if (err)
	goto unlock;		return err;

	/* Configure the IEEE 802.1p priority mapping register. */		/* Configure the IEEE 802.1p priority mapping register. */
	err = _mv88e6xxx_reg_write(ps, REG_GLOBAL, GLOBAL_IEEE_PRI, 0xfa41);		err = _mv88e6xxx_reg_write(ps, REG_GLOBAL, GLOBAL_IEEE_PRI, 0xfa41);
	if (err)		if (err)
	goto unlock;		return err;

	/* Send all frames with destination addresses matching		/* Send all frames with destination addresses matching
	* 01:80:c2:00:00:0x to the CPU port.		* 01:80:c2:00:00:0x to the CPU port.
	*/		*/
	err = _mv88e6xxx_reg_write(ps, REG_GLOBAL2, GLOBAL2_MGMT_EN_0X, 0xffff);		err = _mv88e6xxx_reg_write(ps, REG_GLOBAL2, GLOBAL2_MGMT_EN_0X, 0xffff);
	if (err)		if (err)
	goto unlock;		return err;

	/* Ignore removed tag data on doubly tagged packets, disable		/* Ignore removed tag data on doubly tagged packets, disable
	* flow control messages, force flow control priority to the		* flow control messages, force flow control priority to the
	@@ -3006,15 +2981,15 @@ int mv88e6xxx_setup_global(struct dsa_switch *ds)
	0x7 \| GLOBAL2_SWITCH_MGMT_RSVD2CPU \| 0x70 \|		0x7 \| GLOBAL2_SWITCH_MGMT_RSVD2CPU \| 0x70 \|
	GLOBAL2_SWITCH_MGMT_FORCE_FLOW_CTRL_PRI);		GLOBAL2_SWITCH_MGMT_FORCE_FLOW_CTRL_PRI);
	if (err)		if (err)
	goto unlock;		return err;

	/* Program the DSA routing table. */		/* Program the DSA routing table. */
	for (i = 0; i < 32; i++) {		for (i = 0; i < 32; i++) {
	int nexthop = 0x1f;		int nexthop = 0x1f;

	if (ds->pd->rtable &&		if (ps->ds->pd->rtable &&
	i != ds->index && i < ds->dst->pd->nr_chips)		i != ps->ds->index && i < ps->ds->dst->pd->nr_chips)
	nexthop = ds->pd->rtable[i] & 0x1f;		nexthop = ps->ds->pd->rtable[i] & 0x1f;

	err = _mv88e6xxx_reg_write(		err = _mv88e6xxx_reg_write(
	ps, REG_GLOBAL2,		ps, REG_GLOBAL2,
	@@ -3022,7 +2997,7 @@ int mv88e6xxx_setup_global(struct dsa_switch *ds)
	GLOBAL2_DEVICE_MAPPING_UPDATE \|		GLOBAL2_DEVICE_MAPPING_UPDATE \|
	(i << GLOBAL2_DEVICE_MAPPING_TARGET_SHIFT) \| nexthop);		(i << GLOBAL2_DEVICE_MAPPING_TARGET_SHIFT) \| nexthop);
	if (err)		if (err)
	goto unlock;		return err;
	}		}

	/* Clear all trunk masks. */		/* Clear all trunk masks. */
	@@ -3032,7 +3007,7 @@ int mv88e6xxx_setup_global(struct dsa_switch *ds)
	(i << GLOBAL2_TRUNK_MASK_NUM_SHIFT) \|		(i << GLOBAL2_TRUNK_MASK_NUM_SHIFT) \|
	((1 << ps->info->num_ports) - 1));		((1 << ps->info->num_ports) - 1));
	if (err)		if (err)
	goto unlock;		return err;
	}		}

	/* Clear all trunk mappings. */		/* Clear all trunk mappings. */
	@@ -3043,7 +3018,7 @@ int mv88e6xxx_setup_global(struct dsa_switch *ds)
	GLOBAL2_TRUNK_MAPPING_UPDATE \|		GLOBAL2_TRUNK_MAPPING_UPDATE \|
	(i << GLOBAL2_TRUNK_MAPPING_ID_SHIFT));		(i << GLOBAL2_TRUNK_MAPPING_ID_SHIFT));
	if (err)		if (err)
	goto unlock;		return err;
	}		}

	if (mv88e6xxx_6352_family(ps) \|\| mv88e6xxx_6351_family(ps) \|\|		if (mv88e6xxx_6352_family(ps) \|\| mv88e6xxx_6351_family(ps) \|\|
	@@ -3055,7 +3030,7 @@ int mv88e6xxx_setup_global(struct dsa_switch *ds)
	err = _mv88e6xxx_reg_write(ps, REG_GLOBAL2,		err = _mv88e6xxx_reg_write(ps, REG_GLOBAL2,
	GLOBAL2_MGMT_EN_2X, 0xffff);		GLOBAL2_MGMT_EN_2X, 0xffff);
	if (err)		if (err)
	goto unlock;		return err;

	/* Initialise cross-chip port VLAN table to reset		/* Initialise cross-chip port VLAN table to reset
	* defaults.		* defaults.
	@@ -3063,7 +3038,7 @@ int mv88e6xxx_setup_global(struct dsa_switch *ds)
	err = _mv88e6xxx_reg_write(ps, REG_GLOBAL2,		err = _mv88e6xxx_reg_write(ps, REG_GLOBAL2,
	GLOBAL2_PVT_ADDR, 0x9000);		GLOBAL2_PVT_ADDR, 0x9000);
	if (err)		if (err)
	goto unlock;		return err;

	/* Clear the priority override table. */		/* Clear the priority override table. */
	for (i = 0; i < 16; i++) {		for (i = 0; i < 16; i++) {
	@@ -3071,7 +3046,7 @@ int mv88e6xxx_setup_global(struct dsa_switch *ds)
	GLOBAL2_PRIO_OVERRIDE,		GLOBAL2_PRIO_OVERRIDE,
	0x8000 \| (i << 8));		0x8000 \| (i << 8));
	if (err)		if (err)
	goto unlock;		return err;
	}		}
	}		}

	@@ -3088,7 +3063,7 @@ int mv88e6xxx_setup_global(struct dsa_switch *ds)
	GLOBAL2_INGRESS_OP,		GLOBAL2_INGRESS_OP,
	0x9000 \| (i << 8));		0x9000 \| (i << 8));
	if (err)		if (err)
	goto unlock;		return err;
	}		}
	}		}

	@@ -3096,20 +3071,48 @@ int mv88e6xxx_setup_global(struct dsa_switch *ds)
	err = _mv88e6xxx_reg_write(ps, REG_GLOBAL, GLOBAL_STATS_OP,		err = _mv88e6xxx_reg_write(ps, REG_GLOBAL, GLOBAL_STATS_OP,
	GLOBAL_STATS_OP_FLUSH_ALL);		GLOBAL_STATS_OP_FLUSH_ALL);
	if (err)		if (err)
	goto unlock;		return err;

	/* Wait for the flush to complete. */		/* Wait for the flush to complete. */
	err = _mv88e6xxx_stats_wait(ps);		err = _mv88e6xxx_stats_wait(ps);
	if (err < 0)		if (err)
	goto unlock;		return err;

	/* Clear all ATU entries */		/* Clear all ATU entries */
	err = _mv88e6xxx_atu_flush(ps, 0, true);		err = _mv88e6xxx_atu_flush(ps, 0, true);
	if (err < 0)		if (err)
	goto unlock;		return err;

	/* Clear all the VTU and STU entries */		/* Clear all the VTU and STU entries */
	err = _mv88e6xxx_vtu_stu_flush(ps);		err = _mv88e6xxx_vtu_stu_flush(ps);
			if (err < 0)
			return err;

			return err;
			}

			int mv88e6xxx_setup_common(struct mv88e6xxx_priv_state *ps)
			{
			int err;

			mutex_init(&ps->smi_mutex);

			INIT_WORK(&ps->bridge_work, mv88e6xxx_bridge_work);

			if (mv88e6xxx_has(ps, MV88E6XXX_FLAG_EEPROM))
			mutex_init(&ps->eeprom_mutex);

			if (mv88e6xxx_has(ps, MV88E6XXX_FLAG_PPU))
			mv88e6xxx_ppu_state_init(ps);

			mutex_lock(&ps->smi_mutex);

			err = mv88e6xxx_switch_reset(ps);
			if (err)
			goto unlock;

			err = mv88e6xxx_setup_global(ps);

	unlock:		unlock:
	mutex_unlock(&ps->smi_mutex);		mutex_unlock(&ps->smi_mutex);