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

net: dsa: add dsa_to_port helper 



The dsa_port structure is part of DSA core data and must only be updated
by the later. It is OK and sometimes necessary for the DSA drivers to
access this data, but this has to be read only.

For that purpose, add a dsa_to_port() helper which returns a const
pointer to a dsa_port structure which must be used by DSA drivers from
now on instead of digging into ds->ports[] themselves.

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

drivers/net/dsa/b53/b53_common.c

+2 −2
Original line number Diff line number Diff line
@@ -1354,7 +1354,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 (ds->ports[i].bridge_dev != br)

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

			continue;



		/* Add this local port to the remote port VLAN control
@@ -1390,7 +1390,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 (ds->ports[i].bridge_dev != br)

		if (dsa_to_port(ds, i)->bridge_dev != 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
@@ -863,7 +863,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 (ds->ports[1].bridge_dev ==  ds->ports[2].bridge_dev) {

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

		lan9303_bridge_ports(chip);

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

	}

drivers/net/dsa/mt7530.c

+2 −2
Original line number Diff line number Diff line
@@ -782,7 +782,7 @@ mt7530_port_bridge_join(struct dsa_switch *ds, int port, 
		 * and not being setup until the port becomes enabled.

		 */

		if (ds->enabled_port_mask & BIT(i) && i != port) {

			if (ds->ports[i].bridge_dev != bridge)

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

				continue;

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

				mt7530_set(priv, MT7530_PCR_P(i),
@@ -819,7 +819,7 @@ mt7530_port_bridge_leave(struct dsa_switch *ds, int port, 
		 * is kept and not being setup until the port becomes enabled.

		 */

		if (ds->enabled_port_mask & BIT(i) && i != port) {

			if (ds->ports[i].bridge_dev != bridge)

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

				continue;

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

				mt7530_clear(priv, MT7530_PCR_P(i),

drivers/net/dsa/mv88e6060.c

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ static int mv88e6060_setup_port(struct dsa_switch *ds, int p) 
		  ((p & 0xf) << PORT_VLAN_MAP_DBNUM_SHIFT) |

		   (dsa_is_cpu_port(ds, p) ?

			ds->enabled_port_mask :

			BIT(ds->ports[p].cpu_dp->index)));

			BIT(dsa_to_port(ds, p)->cpu_dp->index)));



	/* Port Association Vector: when learning source addresses

	 * of packets, add the address to the address database using

drivers/net/dsa/mv88e6xxx/chip.c

+4 −4
Original line number Diff line number Diff line
@@ -851,7 +851,7 @@ static u16 mv88e6xxx_port_vlan(struct mv88e6xxx_chip *chip, int dev, int port) 
	for (i = 0; i < mv88e6xxx_num_ports(chip); ++i)

		if (dsa_is_cpu_port(chip->ds, i) ||

		    dsa_is_dsa_port(chip->ds, i) ||

		    (br && chip->ds->ports[i].bridge_dev == br))

		    (br && dsa_to_port(chip->ds, i)->bridge_dev == br))

			pvlan |= BIT(i);



	return pvlan;
@@ -1144,16 +1144,16 @@ static int mv88e6xxx_port_check_hw_vlan(struct dsa_switch *ds, int port, 
			    MV88E6XXX_G1_VTU_DATA_MEMBER_TAG_NON_MEMBER)

				continue;



			if (ds->ports[i].bridge_dev ==

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

			    ds->ports[port].bridge_dev)

				break; /* same bridge, check next VLAN */



			if (!ds->ports[i].bridge_dev)

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

				continue;



			dev_err(ds->dev, "p%d: hw VLAN %d already used by %s\n",

				port, vlan.vid,

				netdev_name(ds->ports[i].bridge_dev));

				netdev_name(dsa_to_port(ds, i)->bridge_dev));

			err = -EOPNOTSUPP;

			goto unlock;

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE