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

Commit 6d3c8c0d authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: dsa: Remove master_netdev and use dst->cpu_dp->netdev 



In preparation for supporting multiple CPU ports, remove
dst->master_netdev and ds->master_netdev and replace them with only one
instance of the common object we have for a port: struct
dsa_port::netdev. ds->master_netdev is currently write only and would be
helpful in the case where we have two switches, both with CPU ports, and
also connected within each other, which the multi-CPU port patch series
would address.

While at it, introduce a helper function used in net/dsa/slave.c to
immediately get a reference on the master network device called
dsa_master_netdev().

Reviewed-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 38b6ec50

drivers/net/dsa/bcm_sf2.c

+2 −2
Original line number Diff line number Diff line
@@ -806,7 +806,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->dst[ds->index].master_netdev;

	struct net_device *p = ds->dst[ds->index].cpu_dp->netdev;

	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);

	struct ethtool_wolinfo pwol;
@@ -829,7 +829,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->dst[ds->index].master_netdev;

	struct net_device *p = ds->dst[ds->index].cpu_dp->netdev;

	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);

	s8 cpu_port = ds->dst->cpu_dp->index;

	struct ethtool_wolinfo pwol;

drivers/net/dsa/mt7530.c

+2 −2
Original line number Diff line number Diff line
@@ -912,11 +912,11 @@ mt7530_setup(struct dsa_switch *ds) 
	struct device_node *dn;

	struct mt7530_dummy_poll p;



	/* The parent node of master_netdev which holds the common system

	/* The parent node of cpu_dp->netdev which holds the common system

	 * controller also is the container for two GMACs nodes representing

	 * as two netdev instances.

	 */

	dn = ds->master_netdev->dev.of_node->parent;

	dn = ds->dst->cpu_dp->netdev->dev.of_node->parent;

	priv->ethernet = syscon_node_to_regmap(dn);

	if (IS_ERR(priv->ethernet))

		return PTR_ERR(priv->ethernet);

include/net/dsa.h

+0 −5
Original line number Diff line number Diff line
@@ -226,11 +226,6 @@ struct dsa_switch { 
	 */

	s8		rtable[DSA_MAX_SWITCHES];



	/*

	 * The lower device this switch uses to talk to the host

	 */

	struct net_device *master_netdev;



	/*

	 * Slave mii_bus and devices for the individual ports.

	 */

net/dsa/dsa.c

+2 −7
Original line number Diff line number Diff line
@@ -118,10 +118,7 @@ int dsa_cpu_port_ethtool_setup(struct dsa_port *cpu_dp) 
	struct net_device *master;

	struct ethtool_ops *cpu_ops;



	master = ds->dst->master_netdev;

	if (ds->master_netdev)

		master = ds->master_netdev;



	master = ds->dst->cpu_dp->netdev;

	cpu_ops = devm_kzalloc(ds->dev, sizeof(*cpu_ops), GFP_KERNEL);

	if (!cpu_ops)

		return -ENOMEM;
@@ -142,9 +139,7 @@ void dsa_cpu_port_ethtool_restore(struct dsa_port *cpu_dp) 
	struct dsa_switch *ds = cpu_dp->ds;

	struct net_device *master;



	master = ds->dst->master_netdev;

	if (ds->master_netdev)

		master = ds->master_netdev;

	master = ds->dst->cpu_dp->netdev;



	master->ethtool_ops = ds->dst->master_orig_ethtool_ops;

}

net/dsa/dsa2.c

+7 −11
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ static int dsa_ds_apply(struct dsa_switch_tree *dst, struct dsa_switch *ds) 
		return err;



	if (ds->ops->set_addr) {

		err = ds->ops->set_addr(ds, dst->master_netdev->dev_addr);

		err = ds->ops->set_addr(ds, dst->cpu_dp->netdev->dev_addr);

		if (err < 0)

			return err;

	}
@@ -444,7 +444,7 @@ static int dsa_dst_apply(struct dsa_switch_tree *dst) 
	 * sent to the tag format's receive function.

	 */

	wmb();

	dst->master_netdev->dsa_ptr = dst;

	dst->cpu_dp->netdev->dsa_ptr = dst;

	dst->applied = true;



	return 0;
@@ -458,7 +458,7 @@ static void dsa_dst_unapply(struct dsa_switch_tree *dst) 
	if (!dst->applied)

		return;



	dst->master_netdev->dsa_ptr = NULL;

	dst->cpu_dp->netdev->dsa_ptr = NULL;



	/* If we used a tagging format that doesn't have an ethertype

	 * field, make sure that all packets from this point get sent
@@ -504,14 +504,10 @@ static int dsa_cpu_parse(struct dsa_port *port, u32 index, 
	if (!ethernet_dev)

		return -EPROBE_DEFER;



	if (!ds->master_netdev)

		ds->master_netdev = ethernet_dev;



	if (!dst->master_netdev)

		dst->master_netdev = ethernet_dev;



	if (!dst->cpu_dp)

	if (!dst->cpu_dp) {

		dst->cpu_dp = port;

		dst->cpu_dp->netdev = ethernet_dev;

	}



	tag_protocol = ds->ops->get_tag_protocol(ds);

	dst->tag_ops = dsa_resolve_tag_protocol(tag_protocol);
@@ -578,7 +574,7 @@ static int dsa_dst_parse(struct dsa_switch_tree *dst) 
			return err;

	}



	if (!dst->master_netdev) {

	if (!dst->cpu_dp->netdev) {

		pr_warn("Tree has no master device\n");

		return -EINVAL;

	}