Commit 68bb8ea8 authored by Vivien Didelot's avatar Vivien Didelot Committed by Jakub Kicinski
Browse files

net: dsa: use dsa_to_port helper everywhere 



Do not let the drivers access the ds->ports static array directly
while there is a dsa_to_port helper for this purpose.

At the same time, un-const this helper since the SJA1105 driver
assigns the priv member of the returned dsa_port structure.

Signed-off-by: default avatarVivien Didelot <vivien.didelot@gmail.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
parent 88652bf8

drivers/net/dsa/b53/b53_common.c

+3 −3
Original line number Diff line number Diff line
@@ -524,7 +524,7 @@ int b53_enable_port(struct dsa_switch *ds, int port, struct phy_device *phy) 
	if (!dsa_is_user_port(ds, port))

		return 0;



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

	cpu_port = dsa_to_port(ds, port)->cpu_dp->index;



	if (dev->ops->irq_enable)

		ret = dev->ops->irq_enable(dev, port);
@@ -1629,7 +1629,7 @@ EXPORT_SYMBOL(b53_fdb_dump); 
int b53_br_join(struct dsa_switch *ds, int port, struct net_device *br)

{

	struct b53_device *dev = ds->priv;

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

	s8 cpu_port = dsa_to_port(ds, port)->cpu_dp->index;

	u16 pvlan, reg;

	unsigned int i;
@@ -1675,7 +1675,7 @@ void b53_br_leave(struct dsa_switch *ds, int port, struct net_device *br) 
{

	struct b53_device *dev = ds->priv;

	struct b53_vlan *vl = &dev->vlans[0];

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

	s8 cpu_port = dsa_to_port(ds, port)->cpu_dp->index;

	unsigned int i;

	u16 pvlan, reg, pvid;

drivers/net/dsa/bcm_sf2.c

+4 −4
Original line number Diff line number Diff line
@@ -662,7 +662,7 @@ static void bcm_sf2_sw_fixed_state(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].slave);

			netif_carrier_off(dsa_to_port(ds, port)->slave);

		status->duplex = DUPLEX_FULL;

	} else {

		status->link = true;
@@ -728,7 +728,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->master;

	struct net_device *p = dsa_to_port(ds, port)->cpu_dp->master;

	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);

	struct ethtool_wolinfo pwol = { };
@@ -752,9 +752,9 @@ 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->master;

	struct net_device *p = dsa_to_port(ds, port)->cpu_dp->master;

	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);

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

	s8 cpu_port = dsa_to_port(ds, port)->cpu_dp->index;

	struct ethtool_wolinfo pwol =  { };



	if (p->ethtool_ops->get_wol)

drivers/net/dsa/bcm_sf2_cfp.c

+3 −3
Original line number Diff line number Diff line
@@ -821,7 +821,7 @@ static int bcm_sf2_cfp_rule_insert(struct dsa_switch *ds, int port, 
				   struct ethtool_rx_flow_spec *fs)

{

	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);

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

	s8 cpu_port = dsa_to_port(ds, port)->cpu_dp->index;

	__u64 ring_cookie = fs->ring_cookie;

	unsigned int queue_num, port_num;

	int ret;
@@ -1049,7 +1049,7 @@ static int bcm_sf2_cfp_rule_get_all(struct bcm_sf2_priv *priv, 
int bcm_sf2_get_rxnfc(struct dsa_switch *ds, int port,

		      struct ethtool_rxnfc *nfc, u32 *rule_locs)

{

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

	struct net_device *p = dsa_to_port(ds, port)->cpu_dp->master;

	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);

	int ret = 0;
@@ -1092,7 +1092,7 @@ int bcm_sf2_get_rxnfc(struct dsa_switch *ds, int port, 
int bcm_sf2_set_rxnfc(struct dsa_switch *ds, int port,

		      struct ethtool_rxnfc *nfc)

{

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

	struct net_device *p = dsa_to_port(ds, port)->cpu_dp->master;

	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);

	int ret = 0;

drivers/net/dsa/mt7530.c

+6 −6
Original line number Diff line number Diff line
@@ -862,7 +862,7 @@ mt7530_port_set_vlan_unaware(struct dsa_switch *ds, int port) 


	for (i = 0; i < MT7530_NUM_PORTS; i++) {

		if (dsa_is_user_port(ds, i) &&

		    dsa_port_is_vlan_filtering(&ds->ports[i])) {

		    dsa_port_is_vlan_filtering(dsa_to_port(ds, i))) {

			all_user_ports_removed = false;

			break;

		}
@@ -922,7 +922,7 @@ mt7530_port_bridge_leave(struct dsa_switch *ds, int port, 
		 * other port is still a VLAN-aware port.

		 */

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

		   !dsa_port_is_vlan_filtering(&ds->ports[i])) {

		   !dsa_port_is_vlan_filtering(dsa_to_port(ds, i))) {

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

				continue;

			if (priv->ports[i].enable)
@@ -1165,7 +1165,7 @@ mt7530_port_vlan_add(struct dsa_switch *ds, int port, 
	/* The port is kept as VLAN-unaware if bridge with vlan_filtering not

	 * being set.

	 */

	if (!dsa_port_is_vlan_filtering(&ds->ports[port]))

	if (!dsa_port_is_vlan_filtering(dsa_to_port(ds, port)))

		return;



	mutex_lock(&priv->reg_mutex);
@@ -1196,7 +1196,7 @@ mt7530_port_vlan_del(struct dsa_switch *ds, int port, 
	/* The port is kept as VLAN-unaware if bridge with vlan_filtering not

	 * being set.

	 */

	if (!dsa_port_is_vlan_filtering(&ds->ports[port]))

	if (!dsa_port_is_vlan_filtering(dsa_to_port(ds, port)))

		return 0;



	mutex_lock(&priv->reg_mutex);
@@ -1252,7 +1252,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].master->dev.of_node->parent;

	dn = dsa_to_port(ds, MT7530_CPU_PORT)->master->dev.of_node->parent;



	if (priv->id == ID_MT7530) {

		priv->ethernet = syscon_node_to_regmap(dn);
@@ -1340,7 +1340,7 @@ mt7530_setup(struct dsa_switch *ds) 


	if (!dsa_is_unused_port(ds, 5)) {

		priv->p5_intf_sel = P5_INTF_SEL_GMAC5;

		interface = of_get_phy_mode(ds->ports[5].dn);

		interface = of_get_phy_mode(dsa_to_port(ds, 5)->dn);

	} else {

		/* Scan the ethernet nodes. look for GMAC1, lookup used phy */

		for_each_child_of_node(dn, mac_np) {

drivers/net/dsa/mv88e6xxx/chip.c

+5 −5
Original line number Diff line number Diff line
@@ -1075,7 +1075,7 @@ static u16 mv88e6xxx_port_vlan(struct mv88e6xxx_chip *chip, int dev, int port) 
	if (dsa_is_cpu_port(ds, port) || dsa_is_dsa_port(ds, port))

		return mv88e6xxx_port_mask(chip);



	br = ds->ports[port].bridge_dev;

	br = dsa_to_port(ds, port)->bridge_dev;

	pvlan = 0;



	/* Frames from user ports can egress any local DSA links and CPU ports,
@@ -1402,7 +1402,7 @@ static int mv88e6xxx_port_check_hw_vlan(struct dsa_switch *ds, int port, 
			if (dsa_is_dsa_port(ds, i) || dsa_is_cpu_port(ds, i))

				continue;



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

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

				continue;



			if (vlan.member[i] ==
@@ -1410,7 +1410,7 @@ static int mv88e6xxx_port_check_hw_vlan(struct dsa_switch *ds, int port, 
				continue;



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

			    ds->ports[port].bridge_dev)

			    dsa_to_port(ds, port)->bridge_dev)

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



			if (!dsa_to_port(ds, i)->bridge_dev)
@@ -2042,7 +2042,7 @@ static int mv88e6xxx_bridge_map(struct mv88e6xxx_chip *chip, 


	/* Remap the Port VLAN of each local bridge group member */

	for (port = 0; port < mv88e6xxx_num_ports(chip); ++port) {

		if (chip->ds->ports[port].bridge_dev == br) {

		if (dsa_to_port(chip->ds, port)->bridge_dev == br) {

			err = mv88e6xxx_port_vlan_map(chip, port);

			if (err)

				return err;
@@ -2059,7 +2059,7 @@ static int mv88e6xxx_bridge_map(struct mv88e6xxx_chip *chip, 
			break;



		for (port = 0; port < ds->num_ports; ++port) {

			if (ds->ports[port].bridge_dev == br) {

			if (dsa_to_port(ds, port)->bridge_dev == br) {

				err = mv88e6xxx_pvt_map(chip, dev, port);

				if (err)

					return err;

CRA Git | Maintained and supported by SUSTech CRA and CCSE