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

Merge branch 'dsa-define-port-types' 



Vivien Didelot says:

====================
net: dsa: define port types

The DSA code currently has 3 bitmaps in the dsa_switch structure:
cpu_port_mask, dsa_port_mask and enabled_port_mask.

They are used to store the type of each switch port. This dates back
from when DSA didn't have a dsa_port structure to hold port-specific
data.

The dsa_switch structure is mainly used to communicate with DSA drivers
and must not contain such static data parsed from DTS or pdata, which
belongs the DSA core structures, such as dsa_switch_tree and dsa_port.

Also the enabled_port_mask is misleading, often misinterpreted as the
complement of disabled ports (thus including DSA and CPU ports), while
in fact it only masks the user ports.

A port can be of 3 types when it is not unused: "cpu" (interfacing with
a master device), "dsa" (interconnecting with another "dsa" port from
another switch chip), or "user" (user-facing port.)

This patchset first fixes the usage of DSA port type helpers, then
defines the DSA_PORT_TYPE_UNUSED, DSA_PORT_TYPE_CPU, DSA_PORT_TYPE_DSA,
and DSA_PORT_TYPE_USER port types, and finally removes the misleading
port bitmaps.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5bca178e 5749f0f3

drivers/net/dsa/b53/b53_common.c

+1 −1
Original line number Diff line number Diff line
@@ -873,7 +873,7 @@ static int b53_setup(struct dsa_switch *ds) 
	for (port = 0; port < dev->num_ports; port++) {

		if (dsa_is_cpu_port(ds, port))

			b53_enable_cpu_port(dev, port);

		else if (!(BIT(port) & ds->enabled_port_mask))

		else if (dsa_is_unused_port(ds, port))

			b53_disable_port(ds, port, NULL);

	}

drivers/net/dsa/bcm_sf2.c

+4 −5
Original line number Diff line number Diff line
@@ -652,8 +652,7 @@ static int bcm_sf2_sw_suspend(struct dsa_switch *ds) 
	 * bcm_sf2_sw_setup

	 */

	for (port = 0; port < DSA_MAX_PORTS; port++) {

		if ((1 << port) & ds->enabled_port_mask ||

		    dsa_is_cpu_port(ds, port))

		if (dsa_is_user_port(ds, port) || dsa_is_cpu_port(ds, port))

			bcm_sf2_port_disable(ds, port, NULL);

	}
@@ -676,7 +675,7 @@ static int bcm_sf2_sw_resume(struct dsa_switch *ds) 
		bcm_sf2_gphy_enable_set(ds, true);



	for (port = 0; port < DSA_MAX_PORTS; port++) {

		if ((1 << port) & ds->enabled_port_mask)

		if (dsa_is_user_port(ds, port))

			bcm_sf2_port_setup(ds, port, NULL);

		else if (dsa_is_cpu_port(ds, port))

			bcm_sf2_imp_setup(ds, port);
@@ -771,7 +770,7 @@ static void bcm_sf2_sw_configure_vlan(struct dsa_switch *ds) 
	bcm_sf2_vlan_op(priv, ARLA_VTBL_CMD_CLEAR);



	for (port = 0; port < priv->hw_params.num_ports; port++) {

		if (!((1 << port) & ds->enabled_port_mask))

		if (!dsa_is_user_port(ds, port))

			continue;



		core_writel(priv, 1, CORE_DEFAULT_1Q_TAG_P(port));
@@ -786,7 +785,7 @@ static int bcm_sf2_sw_setup(struct dsa_switch *ds) 
	/* Enable all valid ports and disable those unused */

	for (port = 0; port < priv->hw_params.num_ports; port++) {

		/* IMP port receives special treatment */

		if ((1 << port) & ds->enabled_port_mask)

		if (dsa_is_user_port(ds, port))

			bcm_sf2_port_setup(ds, port, NULL);

		else if (dsa_is_cpu_port(ds, port))

			bcm_sf2_imp_setup(ds, port);

drivers/net/dsa/bcm_sf2_cfp.c

+1 −1
Original line number Diff line number Diff line
@@ -750,7 +750,7 @@ static int bcm_sf2_cfp_rule_set(struct dsa_switch *ds, int port, 
	port_num = fs->ring_cookie / SF2_NUM_EGRESS_QUEUES;



	if (fs->ring_cookie == RX_CLS_FLOW_DISC ||

	    !(BIT(port_num) & ds->enabled_port_mask) ||

	    !dsa_is_user_port(ds, port_num) ||

	    port_num >= priv->hw_params.num_ports)

		return -EINVAL;

	/*

drivers/net/dsa/mt7530.c

+3 −3
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;

}
@@ -781,7 +781,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 (ds->enabled_port_mask & BIT(i) && i != port) {

		if (dsa_is_user_port(ds, i) && i != port) {

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

				continue;

			if (priv->ports[i].enable)
@@ -818,7 +818,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 (ds->enabled_port_mask & BIT(i) && i != port) {

		if (dsa_is_user_port(ds, i) && i != port) {

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

				continue;

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

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE