Commit 41fb0cf1 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by Jakub Kicinski
Browse files

net: dsa: hide dp->bridge_dev and dp->bridge_num in drivers behind helpers 



The location of the bridge device pointer and number is going to change.
It is not going to be kept individually per port, but in a common
structure allocated dynamically and which will have lockdep validation.

Use the helpers to access these elements so that we have a migration
path to the new organization.

Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 36cbf39b

drivers/net/dsa/b53/b53_common.c

+2 −2
Original line number Diff line number Diff line
@@ -1887,7 +1887,7 @@ int b53_br_join(struct dsa_switch *ds, int port, struct net_device *br) 
	b53_read16(dev, B53_PVLAN_PAGE, B53_PVLAN_PORT_MASK(port), &pvlan);



	b53_for_each_port(dev, i) {

		if (dsa_to_port(ds, i)->bridge_dev != br)

		if (dsa_port_bridge_dev_get(dsa_to_port(ds, i)) != br)

			continue;



		/* Add this local port to the remote port VLAN control
@@ -1923,7 +1923,7 @@ void b53_br_leave(struct dsa_switch *ds, int port, struct net_device *br) 


	b53_for_each_port(dev, i) {

		/* Don't touch the remaining ports */

		if (dsa_to_port(ds, i)->bridge_dev != br)

		if (dsa_port_bridge_dev_get(dsa_to_port(ds, i)) != br)

			continue;



		b53_read16(dev, B53_PVLAN_PAGE, B53_PVLAN_PORT_MASK(i), &reg);

drivers/net/dsa/lan9303-core.c

+1 −1
Original line number Diff line number Diff line
@@ -1108,7 +1108,7 @@ static int lan9303_port_bridge_join(struct dsa_switch *ds, int port, 
	struct lan9303 *chip = ds->priv;



	dev_dbg(chip->dev, "%s(port %d)\n", __func__, port);

	if (dsa_to_port(ds, 1)->bridge_dev == dsa_to_port(ds, 2)->bridge_dev) {

	if (dsa_port_bridge_same(dsa_to_port(ds, 1), dsa_to_port(ds, 2))) {

		lan9303_bridge_ports(chip);

		chip->is_bridged = true;  /* unleash stp_state_set() */

	}

drivers/net/dsa/lantiq_gswip.c

+5 −5
Original line number Diff line number Diff line
@@ -759,7 +759,7 @@ static int gswip_port_vlan_filtering(struct dsa_switch *ds, int port, 
				     bool vlan_filtering,

				     struct netlink_ext_ack *extack)

{

	struct net_device *bridge = dsa_to_port(ds, port)->bridge_dev;

	struct net_device *bridge = dsa_port_bridge_dev_get(dsa_to_port(ds, port));

	struct gswip_priv *priv = ds->priv;



	/* Do not allow changing the VLAN filtering options while in bridge */
@@ -1183,8 +1183,8 @@ static int gswip_port_vlan_prepare(struct dsa_switch *ds, int port, 
				   const struct switchdev_obj_port_vlan *vlan,

				   struct netlink_ext_ack *extack)

{

	struct net_device *bridge = dsa_port_bridge_dev_get(dsa_to_port(ds, port));

	struct gswip_priv *priv = ds->priv;

	struct net_device *bridge = dsa_to_port(ds, port)->bridge_dev;

	unsigned int max_ports = priv->hw_info->max_ports;

	int pos = max_ports;

	int i, idx = -1;
@@ -1229,8 +1229,8 @@ static int gswip_port_vlan_add(struct dsa_switch *ds, int port, 
			       const struct switchdev_obj_port_vlan *vlan,

			       struct netlink_ext_ack *extack)

{

	struct net_device *bridge = dsa_port_bridge_dev_get(dsa_to_port(ds, port));

	struct gswip_priv *priv = ds->priv;

	struct net_device *bridge = dsa_to_port(ds, port)->bridge_dev;

	bool untagged = vlan->flags & BRIDGE_VLAN_INFO_UNTAGGED;

	bool pvid = vlan->flags & BRIDGE_VLAN_INFO_PVID;

	int err;
@@ -1254,8 +1254,8 @@ static int gswip_port_vlan_add(struct dsa_switch *ds, int port, 
static int gswip_port_vlan_del(struct dsa_switch *ds, int port,

			       const struct switchdev_obj_port_vlan *vlan)

{

	struct net_device *bridge = dsa_port_bridge_dev_get(dsa_to_port(ds, port));

	struct gswip_priv *priv = ds->priv;

	struct net_device *bridge = dsa_to_port(ds, port)->bridge_dev;

	bool pvid = vlan->flags & BRIDGE_VLAN_INFO_PVID;



	/* We have to receive all packets on the CPU port and should not
@@ -1340,8 +1340,8 @@ static void gswip_port_stp_state_set(struct dsa_switch *ds, int port, u8 state) 
static int gswip_port_fdb(struct dsa_switch *ds, int port,

			  const unsigned char *addr, u16 vid, bool add)

{

	struct net_device *bridge = dsa_port_bridge_dev_get(dsa_to_port(ds, port));

	struct gswip_priv *priv = ds->priv;

	struct net_device *bridge = dsa_to_port(ds, port)->bridge_dev;

	struct gswip_pce_table_entry mac_bridge = {0,};

	unsigned int cpu_port = priv->hw_info->cpu_port;

	int fid = -1;

drivers/net/dsa/microchip/ksz_common.c

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ void ksz_update_port_member(struct ksz_device *dev, int port) 
			continue;

		if (port == i)

			continue;

		if (!dp->bridge_dev || dp->bridge_dev != other_dp->bridge_dev)

		if (!dsa_port_bridge_same(dp, other_dp))

			continue;



		if (other_p->stp_state == BR_STATE_FORWARDING &&

drivers/net/dsa/mt7530.c

+3 −3
Original line number Diff line number Diff line
@@ -1204,7 +1204,7 @@ mt7530_port_bridge_join(struct dsa_switch *ds, int port, 
		 * same bridge. If the port is disabled, port matrix is kept

		 * and not being setup until the port becomes enabled.

		 */

		if (other_dp->bridge_dev != bridge)

		if (dsa_port_bridge_dev_get(other_dp) != bridge)

			continue;



		if (priv->ports[other_port].enable)
@@ -1240,7 +1240,7 @@ mt7530_port_set_vlan_unaware(struct dsa_switch *ds, int port) 
	/* This is called after .port_bridge_leave when leaving a VLAN-aware

	 * bridge. Don't set standalone ports to fallback mode.

	 */

	if (dsa_to_port(ds, port)->bridge_dev)

	if (dsa_port_bridge_dev_get(dsa_to_port(ds, port)))

		mt7530_rmw(priv, MT7530_PCR_P(port), PCR_PORT_VLAN_MASK,

			   MT7530_PORT_FALLBACK_MODE);
@@ -1320,7 +1320,7 @@ mt7530_port_bridge_leave(struct dsa_switch *ds, int port, 
		 * in the same bridge. If the port is disabled, port matrix

		 * is kept and not being setup until the port becomes enabled.

		 */

		if (other_dp->bridge_dev != bridge)

		if (dsa_port_bridge_dev_get(other_dp) != bridge)

			continue;



		if (priv->ports[other_port].enable)