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

Commit 43c44a9f authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller
Browse files

net: dsa: make the STP state function return void 



The DSA layer doesn't care about the return code of the port_stp_update
routine, so make it void in the layer and the DSA drivers.

Replace the useless dsa_slave_stp_update function with a
dsa_slave_stp_state function used to reply to the switchdev
SWITCHDEV_ATTR_ID_PORT_STP_STATE attribute.

In the meantime, rename port_stp_update to port_stp_state_set to
explicit the state change.

Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f453939c

Documentation/networking/dsa/dsa.txt

+1 −1
Original line number Diff line number Diff line
@@ -533,7 +533,7 @@ Bridge layer 
  out at the switch hardware for the switch to (re) learn MAC addresses behind

  this port.



- port_stp_update: bridge layer function invoked when a given switch port STP

- port_stp_state_set: bridge layer function invoked when a given switch port STP

  state is computed by the bridge layer and should be propagated to switch

  hardware to forward/block/learn traffic. The switch driver is responsible for

  computing a STP state change based on current and asked parameters and perform

drivers/net/dsa/bcm_sf2.c

+6 −10
Original line number Diff line number Diff line
@@ -545,12 +545,11 @@ static void bcm_sf2_sw_br_leave(struct dsa_switch *ds, int port) 
	priv->port_sts[port].bridge_dev = NULL;

}



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

static void bcm_sf2_sw_br_set_stp_state(struct dsa_switch *ds, int port,

					u8 state)

{

	struct bcm_sf2_priv *priv = ds_to_priv(ds);

	u8 hw_state, cur_hw_state;

	int ret = 0;

	u32 reg;



	reg = core_readl(priv, CORE_G_PCTL_PORT(port));
@@ -574,7 +573,7 @@ static int bcm_sf2_sw_br_set_stp_state(struct dsa_switch *ds, int port, 
		break;

	default:

		pr_err("%s: invalid STP state: %d\n", __func__, state);

		return -EINVAL;

		return;

	}



	/* Fast-age ARL entries if we are moving a port from Learning or
@@ -584,10 +583,9 @@ static int bcm_sf2_sw_br_set_stp_state(struct dsa_switch *ds, int port, 
	if (cur_hw_state != hw_state) {

		if (cur_hw_state >= G_MISTP_LEARN_STATE &&

		    hw_state <= G_MISTP_LISTEN_STATE) {

			ret = bcm_sf2_sw_fast_age_port(ds, port);

			if (ret) {

			if (bcm_sf2_sw_fast_age_port(ds, port)) {

				pr_err("%s: fast-ageing failed\n", __func__);

				return ret;

				return;

			}

		}

	}
@@ -596,8 +594,6 @@ static int bcm_sf2_sw_br_set_stp_state(struct dsa_switch *ds, int port, 
	reg &= ~(G_MISTP_STATE_MASK << G_MISTP_STATE_SHIFT);

	reg |= hw_state;

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



	return 0;

}



/* Address Resolution Logic routines */
@@ -1387,7 +1383,7 @@ static struct dsa_switch_driver bcm_sf2_switch_driver = { 
	.set_eee		= bcm_sf2_sw_set_eee,

	.port_bridge_join	= bcm_sf2_sw_br_join,

	.port_bridge_leave	= bcm_sf2_sw_br_leave,

	.port_stp_update	= bcm_sf2_sw_br_set_stp_state,

	.port_stp_state_set	= bcm_sf2_sw_br_set_stp_state,

	.port_fdb_prepare	= bcm_sf2_sw_fdb_prepare,

	.port_fdb_add		= bcm_sf2_sw_fdb_add,

	.port_fdb_del		= bcm_sf2_sw_fdb_del,

drivers/net/dsa/mv88e6171.c

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ struct dsa_switch_driver mv88e6171_switch_driver = { 
	.get_regs		= mv88e6xxx_get_regs,

	.port_bridge_join	= mv88e6xxx_port_bridge_join,

	.port_bridge_leave	= mv88e6xxx_port_bridge_leave,

	.port_stp_update        = mv88e6xxx_port_stp_update,

	.port_stp_state_set	= mv88e6xxx_port_stp_state_set,

	.port_vlan_filtering	= mv88e6xxx_port_vlan_filtering,

	.port_vlan_prepare	= mv88e6xxx_port_vlan_prepare,

	.port_vlan_add		= mv88e6xxx_port_vlan_add,

drivers/net/dsa/mv88e6352.c

+1 −1
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ struct dsa_switch_driver mv88e6352_switch_driver = { 
	.get_regs		= mv88e6xxx_get_regs,

	.port_bridge_join	= mv88e6xxx_port_bridge_join,

	.port_bridge_leave	= mv88e6xxx_port_bridge_leave,

	.port_stp_update	= mv88e6xxx_port_stp_update,

	.port_stp_state_set	= mv88e6xxx_port_stp_state_set,

	.port_vlan_filtering	= mv88e6xxx_port_vlan_filtering,

	.port_vlan_prepare	= mv88e6xxx_port_vlan_prepare,

	.port_vlan_add		= mv88e6xxx_port_vlan_add,

drivers/net/dsa/mv88e6xxx.c

+2 −4
Original line number Diff line number Diff line
@@ -1193,7 +1193,7 @@ static int _mv88e6xxx_port_based_vlan_map(struct dsa_switch *ds, int port) 
	return _mv88e6xxx_reg_write(ds, REG_PORT(port), PORT_BASE_VLAN, reg);

}



int mv88e6xxx_port_stp_update(struct dsa_switch *ds, int port, u8 state)

void mv88e6xxx_port_stp_state_set(struct dsa_switch *ds, int port, u8 state)

{

	struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);

	int stp_state;
@@ -1215,14 +1215,12 @@ int mv88e6xxx_port_stp_update(struct dsa_switch *ds, int port, u8 state) 
		break;

	}



	/* mv88e6xxx_port_stp_update may be called with softirqs disabled,

	/* mv88e6xxx_port_stp_state_set may be called with softirqs disabled,

	 * so we can not update the port state directly but need to schedule it.

	 */

	ps->ports[port].state = stp_state;

	set_bit(port, ps->port_state_update_mask);

	schedule_work(&ps->bridge_work);



	return 0;

}



static int _mv88e6xxx_port_pvid(struct dsa_switch *ds, int port, u16 *new,