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

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

net: dsa: introduce dsa_user_ports helper 



Introduce a dsa_user_ports() helper to return the ds->enabled_port_mask
mask which is more explicit. This will also minimize diffs when touching
this internal mask.

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

drivers/net/dsa/mt7530.c

+1 −1
Original line number Diff line number Diff line
@@ -688,7 +688,7 @@ mt7530_cpu_port_enable(struct mt7530_priv *priv, 
	 * the switch

	 */

	mt7530_write(priv, MT7530_PCR_P(port),

		     PCR_MATRIX(priv->ds->enabled_port_mask));

		     PCR_MATRIX(dsa_user_ports(priv->ds)));



	return 0;

}

drivers/net/dsa/mv88e6060.c

+2 −3
Original line number Diff line number Diff line
@@ -175,8 +175,7 @@ static int mv88e6060_setup_port(struct dsa_switch *ds, int p) 
	 */

	REG_WRITE(addr, PORT_VLAN_MAP,

		  ((p & 0xf) << PORT_VLAN_MAP_DBNUM_SHIFT) |

		   (dsa_is_cpu_port(ds, p) ?

			ds->enabled_port_mask :

		   (dsa_is_cpu_port(ds, p) ? dsa_user_ports(ds) :

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



	/* Port Association Vector: when learning source addresses

drivers/net/dsa/qca8k.c

+1 −2
Original line number Diff line number Diff line
@@ -551,8 +551,7 @@ qca8k_setup(struct dsa_switch *ds) 
		/* CPU port gets connected to all user ports of the switch */

		if (dsa_is_cpu_port(ds, i)) {

			qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(QCA8K_CPU_PORT),

				  QCA8K_PORT_LOOKUP_MEMBER,

				  ds->enabled_port_mask);

				  QCA8K_PORT_LOOKUP_MEMBER, dsa_user_ports(ds));

		}



		/* Invividual user ports get connected to CPU port only */

include/net/dsa.h

+5 −0
Original line number Diff line number Diff line
@@ -276,6 +276,11 @@ static inline bool dsa_is_user_port(struct dsa_switch *ds, int p) 
	return !!(ds->enabled_port_mask & BIT(p));

}



static inline u32 dsa_user_ports(struct dsa_switch *ds)

{

	return ds->enabled_port_mask;

}



static inline const struct dsa_port *dsa_to_port(struct dsa_switch *ds, int p)

{

	return &ds->ports[p];

net/dsa/dsa2.c

+1 −1
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ static int dsa_ds_apply(struct dsa_switch_tree *dst, struct dsa_switch *ds) 
	 * the slave MDIO bus driver rely on these values for probing PHY

	 * devices or not

	 */

	ds->phys_mii_mask = ds->enabled_port_mask;

	ds->phys_mii_mask |= dsa_user_ports(ds);



	/* Add the switch to devlink before calling setup, so that setup can

	 * add dpipe tables