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

net: dsa: move master ethtool code 



DSA overrides the master device ethtool ops, so that it can inject stats
from its dedicated switch CPU port as well.

The related code is currently split in dsa.c and slave.c, but it only
scopes the master net device. Move it to a new master.c DSA core file.

This file will be later extented with master net device specific code.

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

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;



	cpu_dp->orig_ethtool_ops = master->ethtool_ops;

	if (cpu_dp->orig_ethtool_ops)

		memcpy(cpu_ops, cpu_dp->orig_ethtool_ops, sizeof(*cpu_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;

	cpu_dp->orig_ethtool_ops = NULL;

}



void dsa_cpu_dsa_destroy(struct dsa_port *port)

{

	struct device_node *port_dn = port->dn;

net/dsa/dsa2.c

+2 −2
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ static int dsa_dst_apply(struct dsa_switch_tree *dst) 
	wmb();

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



	err = dsa_cpu_port_ethtool_setup(dst->cpu_dp);

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

	if (err)

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

		return;



	dsa_cpu_port_ethtool_restore(dst->cpu_dp);

	dsa_master_ethtool_restore(dst->cpu_dp->netdev);



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

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);

net/dsa/legacy.c

+2 −2
Original line number Diff line number Diff line
@@ -602,7 +602,7 @@ static int dsa_setup_dst(struct dsa_switch_tree *dst, struct net_device *dev, 
	wmb();

	dev->dsa_ptr = dst;



	return dsa_cpu_port_ethtool_setup(dst->cpu_dp);

	return dsa_master_ethtool_setup(dst->cpu_dp->netdev);

}



static int dsa_probe(struct platform_device *pdev)
@@ -667,7 +667,7 @@ static void dsa_remove_dst(struct dsa_switch_tree *dst) 
{

	int i;



	dsa_cpu_port_ethtool_restore(dst->cpu_dp);

	dsa_master_ethtool_restore(dst->cpu_dp->netdev);



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

CRA Git | Maintained and supported by SUSTech CRA and CCSE