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

Commit 89f09048 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: dsa: Pass stringset to ethtool operations 



Up until now we largely assumed that we were interested in ETH_SS_STATS
type of strings for all ethtool operations, this is about to change with
the introduction of additional string sets, e.g: ETH_SS_PHY_STATS.
Update all functions to take an appropriate stringset argument and act
on it when it is different than ETH_SS_STATS for now.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1d1e79f1

drivers/net/dsa/b53/b53_common.c

+9 −2
Original line number Diff line number Diff line
@@ -806,13 +806,17 @@ static unsigned int b53_get_mib_size(struct b53_device *dev) 
		return B53_MIBS_SIZE;

}



void b53_get_strings(struct dsa_switch *ds, int port, uint8_t *data)

void b53_get_strings(struct dsa_switch *ds, int port, u32 stringset,

		     uint8_t *data)

{

	struct b53_device *dev = ds->priv;

	const struct b53_mib_desc *mibs = b53_get_mib(dev);

	unsigned int mib_size = b53_get_mib_size(dev);

	unsigned int i;



	if (stringset != ETH_SS_STATS)

		return;



	for (i = 0; i < mib_size; i++)

		strlcpy(data + i * ETH_GSTRING_LEN,

			mibs[i].name, ETH_GSTRING_LEN);
@@ -852,10 +856,13 @@ void b53_get_ethtool_stats(struct dsa_switch *ds, int port, uint64_t *data) 
}

EXPORT_SYMBOL(b53_get_ethtool_stats);



int b53_get_sset_count(struct dsa_switch *ds, int port)

int b53_get_sset_count(struct dsa_switch *ds, int port, int sset)

{

	struct b53_device *dev = ds->priv;



	if (sset != ETH_SS_STATS)

		return 0;



	return b53_get_mib_size(dev);

}

EXPORT_SYMBOL(b53_get_sset_count);

drivers/net/dsa/b53/b53_priv.h

+3 −2
Original line number Diff line number Diff line
@@ -286,9 +286,10 @@ static inline int b53_switch_get_reset_gpio(struct b53_device *dev) 
/* Exported functions towards other drivers */

void b53_imp_vlan_setup(struct dsa_switch *ds, int cpu_port);

int b53_configure_vlan(struct dsa_switch *ds);

void b53_get_strings(struct dsa_switch *ds, int port, uint8_t *data);

void b53_get_strings(struct dsa_switch *ds, int port, u32 stringset,

		     uint8_t *data);

void b53_get_ethtool_stats(struct dsa_switch *ds, int port, uint64_t *data);

int b53_get_sset_count(struct dsa_switch *ds, int port);

int b53_get_sset_count(struct dsa_switch *ds, int port, int sset);

int b53_br_join(struct dsa_switch *ds, int port, struct net_device *bridge);

void b53_br_leave(struct dsa_switch *ds, int port, struct net_device *bridge);

void b53_br_set_stp_state(struct dsa_switch *ds, int port, u8 state);

drivers/net/dsa/dsa_loop.c

+9 −2
Original line number Diff line number Diff line
@@ -86,16 +86,23 @@ static int dsa_loop_setup(struct dsa_switch *ds) 
	return 0;

}



static int dsa_loop_get_sset_count(struct dsa_switch *ds, int port)

static int dsa_loop_get_sset_count(struct dsa_switch *ds, int port, int sset)

{

	if (sset != ETH_SS_STATS)

		return 0;



	return __DSA_LOOP_CNT_MAX;

}



static void dsa_loop_get_strings(struct dsa_switch *ds, int port, uint8_t *data)

static void dsa_loop_get_strings(struct dsa_switch *ds, int port,

				 u32 stringset, uint8_t *data)

{

	struct dsa_loop_priv *ps = ds->priv;

	unsigned int i;



	if (stringset != ETH_SS_STATS)

		return;



	for (i = 0; i < __DSA_LOOP_CNT_MAX; i++)

		memcpy(data + i * ETH_GSTRING_LEN,

		       ps->ports[port].mib[i].name, ETH_GSTRING_LEN);

drivers/net/dsa/lan9303-core.c

+9 −2
Original line number Diff line number Diff line
@@ -977,10 +977,14 @@ static const struct lan9303_mib_desc lan9303_mib[] = { 
	{ .offset = LAN9303_MAC_TX_LATECOL_0, .name = "TxLateCol", },

};



static void lan9303_get_strings(struct dsa_switch *ds, int port, uint8_t *data)

static void lan9303_get_strings(struct dsa_switch *ds, int port,

				u32 stringset, uint8_t *data)

{

	unsigned int u;



	if (stringset != ETH_SS_STATS)

		return;



	for (u = 0; u < ARRAY_SIZE(lan9303_mib); u++) {

		strncpy(data + u * ETH_GSTRING_LEN, lan9303_mib[u].name,

			ETH_GSTRING_LEN);
@@ -1007,8 +1011,11 @@ static void lan9303_get_ethtool_stats(struct dsa_switch *ds, int port, 
	}

}



static int lan9303_get_sset_count(struct dsa_switch *ds, int port)

static int lan9303_get_sset_count(struct dsa_switch *ds, int port, int sset)

{

	if (sset != ETH_SS_STATS)

		return 0;



	return ARRAY_SIZE(lan9303_mib);

}

drivers/net/dsa/microchip/ksz_common.c

+9 −2
Original line number Diff line number Diff line
@@ -439,15 +439,22 @@ static void ksz_disable_port(struct dsa_switch *ds, int port, 
	ksz_port_cfg(dev, port, REG_PORT_CTRL_0, PORT_MAC_LOOPBACK, true);

}



static int ksz_sset_count(struct dsa_switch *ds, int port)

static int ksz_sset_count(struct dsa_switch *ds, int port, int sset)

{

	if (sset != ETH_SS_STATS)

		return 0;



	return TOTAL_SWITCH_COUNTER_NUM;

}



static void ksz_get_strings(struct dsa_switch *ds, int port, uint8_t *buf)

static void ksz_get_strings(struct dsa_switch *ds, int port,

			    u32 stringset, uint8_t *buf)

{

	int i;



	if (stringset != ETH_SS_STATS)

		return;



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

		memcpy(buf + i * ETH_GSTRING_LEN, mib_names[i].string,

		       ETH_GSTRING_LEN);