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

Merge branch 'dsa-master-ethtool-move' 



Vivien Didelot says:

====================
net: dsa: move master ethtool code

The DSA core overrides the master device's ethtool_ops structure so that
it can inject statistics and such of its dedicated switch CPU port.

This ethtool code is currently called on unnecessary conditions or
before the master interface and its switch CPU port get wired up.
This patchset fixes this.

Similarly to slave.c where the DSA slave net_device is the entry point
of the dsa_slave_* functions, this patchset also isolates the master's
ethtool code in a new master.c file, where the DSA master net_device is
the entry point of the dsa_master_* functions.

This is a first step towards better control of the master device and
support for multiple CPU ports.
====================

Tested-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 69e33b27 f2f23566

include/net/dsa.h

+0 −1
Original line number Diff line number Diff line
@@ -188,7 +188,6 @@ struct dsa_port { 
	/*

	 * Original copy of the master netdev ethtool_ops

	 */

	struct ethtool_ops	ethtool_ops;

	const struct ethtool_ops *orig_ethtool_ops;

};

net/dsa/Makefile

+1 −1
Original line number Diff line number Diff line 
# the core

obj-$(CONFIG_NET_DSA) += dsa_core.o

dsa_core-y += dsa.o dsa2.o legacy.o port.o slave.o switch.o

dsa_core-y += dsa.o dsa2.o legacy.o master.o port.o slave.o switch.o



# tagging formats

dsa_core-$(CONFIG_NET_DSA_TAG_BRCM) += tag_brcm.o

net/dsa/dsa.c

+0 −28
Original line number Diff line number Diff line
@@ -112,34 +112,6 @@ const struct dsa_device_ops *dsa_resolve_tag_protocol(int tag_protocol) 
	return ops;

}



int dsa_cpu_port_ethtool_setup(struct dsa_port *cpu_dp)

{

	struct dsa_switch *ds = cpu_dp->ds;

	struct net_device *master;

	struct ethtool_ops *cpu_ops;



	master = cpu_dp->netdev;



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

	if (!cpu_ops)

		return -ENOMEM;



	memcpy(&cpu_dp->ethtool_ops, master->ethtool_ops,

	       sizeof(struct ethtool_ops));

	cpu_dp->orig_ethtool_ops = master->ethtool_ops;

	memcpy(cpu_ops, &cpu_dp->ethtool_ops,

	       sizeof(struct ethtool_ops));

	dsa_cpu_port_ethtool_init(cpu_ops);

	master->ethtool_ops = cpu_ops;



	return 0;

}



void dsa_cpu_port_ethtool_restore(struct dsa_port *cpu_dp)

{

	cpu_dp->netdev->ethtool_ops = cpu_dp->orig_ethtool_ops;

}



void dsa_cpu_dsa_destroy(struct dsa_port *port)

{

	struct device_node *port_dn = port->dn;

net/dsa/dsa2.c

+8 −10
Original line number Diff line number Diff line
@@ -433,18 +433,17 @@ static int dsa_dst_apply(struct dsa_switch_tree *dst) 
			return err;

	}



	if (dst->cpu_dp) {

		err = dsa_cpu_port_ethtool_setup(dst->cpu_dp);

		if (err)

			return err;

	}



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

	 * field, make sure that all packets from this point on get

	 * sent to the tag format's receive function.

	 */

	wmb();

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



	err = dsa_master_ethtool_setup(dst->cpu_dp->netdev);

	if (err)

		return err;



	dst->applied = true;



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

		return;



	dsa_master_ethtool_restore(dst->cpu_dp->netdev);



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



	/* If we used a tagging format that doesn't have an ethertype
@@ -474,10 +475,7 @@ static void dsa_dst_unapply(struct dsa_switch_tree *dst) 
		dsa_ds_unapply(dst, ds);

	}



	if (dst->cpu_dp) {

		dsa_cpu_port_ethtool_restore(dst->cpu_dp);

	dst->cpu_dp = NULL;

	}



	pr_info("DSA: tree %d unapplied\n", dst->tree);

	dst->applied = false;

net/dsa/dsa_priv.h

+4 −3
Original line number Diff line number Diff line
@@ -97,8 +97,6 @@ struct dsa_slave_priv { 
int dsa_cpu_dsa_setup(struct dsa_port *port);

void dsa_cpu_dsa_destroy(struct dsa_port *dport);

const struct dsa_device_ops *dsa_resolve_tag_protocol(int tag_protocol);

int dsa_cpu_port_ethtool_setup(struct dsa_port *cpu_dp);

void dsa_cpu_port_ethtool_restore(struct dsa_port *cpu_dp);

bool dsa_schedule_work(struct work_struct *work);



/* legacy.c */
@@ -112,6 +110,10 @@ int dsa_legacy_fdb_del(struct ndmsg *ndm, struct nlattr *tb[], 
		       struct net_device *dev,

		       const unsigned char *addr, u16 vid);



/* master.c */

int dsa_master_ethtool_setup(struct net_device *dev);

void dsa_master_ethtool_restore(struct net_device *dev);



/* port.c */

int dsa_port_set_state(struct dsa_port *dp, u8 state,

		       struct switchdev_trans *trans);
@@ -139,7 +141,6 @@ int dsa_port_vlan_del(struct dsa_port *dp, 
/* slave.c */

extern const struct dsa_device_ops notag_netdev_ops;

void dsa_slave_mii_bus_init(struct dsa_switch *ds);

void dsa_cpu_port_ethtool_init(struct ethtool_ops *ops);

int dsa_slave_create(struct dsa_port *port, const char *name);

void dsa_slave_destroy(struct net_device *slave_dev);

int dsa_slave_suspend(struct net_device *slave_dev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE