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

Commit 1bbc7289 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'dsa-master-and-slave-helpers' 



Vivien Didelot says:

====================
net: dsa: master and slave helpers

This patch series adds a few helpers to DSA core for clarity and
readability but brings no functional changes.

A dsa_slave_notify helper calls the DSA notifiers when (un)registering a
slave device.

Most of the DSA slave code only needs to access the dsa_port structure,
not the dsa_slave_priv (which only contains a few PHY-specific members).
Thus a dsa_slave_to_port helper returns a dsa_port structure of a slave
device.

A dsa_slave_to_master returns the master device of a slave device.

After that the netdev member of the dsa_port structure is split into two
explicit master and slave members to avoid confusion, and a dsa_to_port
helper is added for switch drivers to get a const reference to a port.

Changes in v2:
  - prefer dsa_slave_to_master instead of dsa_slave_get_master
  - rename dsa_master_get_slave to dsa_master_find_slave
  - pack master and slave net devices into an anonymous union
  - add dsa_to_port public helper for switch drivers
  - add Reviewed-by tags from Florian
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a2084f56 c8652c83

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/bcm_sf2.c

+3 −3
Original line number Diff line number Diff line
@@ -601,7 +601,7 @@ static void bcm_sf2_sw_fixed_link_update(struct dsa_switch *ds, int port, 
		 * state machine and make it go in PHY_FORCING state instead.

		 */

		if (!status->link)

			netif_carrier_off(ds->ports[port].netdev);

			netif_carrier_off(ds->ports[port].slave);

		status->duplex = 1;

	} else {

		status->link = 1;
@@ -690,7 +690,7 @@ static int bcm_sf2_sw_resume(struct dsa_switch *ds) 
static void bcm_sf2_sw_get_wol(struct dsa_switch *ds, int port,

			       struct ethtool_wolinfo *wol)

{

	struct net_device *p = ds->ports[port].cpu_dp->netdev;

	struct net_device *p = ds->ports[port].cpu_dp->master;

	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);

	struct ethtool_wolinfo pwol;
@@ -713,7 +713,7 @@ static void bcm_sf2_sw_get_wol(struct dsa_switch *ds, int port, 
static int bcm_sf2_sw_set_wol(struct dsa_switch *ds, int port,

			      struct ethtool_wolinfo *wol)

{

	struct net_device *p = ds->ports[port].cpu_dp->netdev;

	struct net_device *p = ds->ports[port].cpu_dp->master;

	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);

	s8 cpu_port = ds->ports[port].cpu_dp->index;

	struct ethtool_wolinfo pwol;

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

+3 −3
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),
@@ -933,7 +933,7 @@ mt7530_setup(struct dsa_switch *ds) 
	 * controller also is the container for two GMACs nodes representing

	 * as two netdev instances.

	 */

	dn = ds->ports[MT7530_CPU_PORT].netdev->dev.of_node->parent;

	dn = ds->ports[MT7530_CPU_PORT].master->dev.of_node->parent;

	priv->ethernet = syscon_node_to_regmap(dn);

	if (IS_ERR(priv->ethernet))

		return PTR_ERR(priv->ethernet);

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