diff options
| author | David S. Miller <davem@davemloft.net> | 2018-04-27 11:53:04 -0400 | 
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-04-27 11:53:04 -0400 | 
| commit | 21fca6e01beb9cae33c7d45a69e032d91c81f07d (patch) | |
| tree | ee5924b4a53b16f813c239101935af3f480b7781 /drivers/net/dsa/microchip/ksz_common.c | |
| parent | 834944073301e85001c3ed9913027ca47c6f889b (diff) | |
| parent | 96cbddcd52e76d9052948e408b17bedc8aa1c11a (diff) | |
Merge branch 'net-Extend-availability-of-PHY-statistics'
Florian Fainelli says:
====================
net: Extend availability of PHY statistics
This patch series adds support for retrieving PHY statistics with DSA switches
when the CPU port uses a PHY to PHY connection (as opposed to MAC to MAC).
To get there a number of things are done:
- first we move the code dealing with PHY statistics outside of net/core/ethtool.c
  and create helper functions since the same code will be reused
- then we allow network device drivers to provide an ethtool_get_phy_stats callback
  when the standard PHY library helpers are not suitable
- we update the DSA functions dealing with ethtool operations to get passed a
  stringset instead of assuming ETH_SS_STATS like they currently do
- then we provide a set of standard helpers within DSA as a framework and add
  the plumbing to allow retrieving the PHY statistics of the CPU port(s)
- finally plug support for retrieving such PHY statistics with the b53 driver
Changes in v3:
- retrict the b53 change to 539x and 531x5 series of switches
- added a change to dsa_loop.c to help test the feature
Changes in v2:
- got actual testing when the DSA master network device has a PHY that
  already provides statistics (thanks Nikita!)
- fixed the kbuild error reported when CONFIG_PHYLIB=n
- removed the checking of ops which is redundant and not needed
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa/microchip/ksz_common.c')
| -rw-r--r-- | drivers/net/dsa/microchip/ksz_common.c | 11 | 
1 files changed, 9 insertions, 2 deletions
| diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c index bcb3e6c734f2..7210c49b7922 100644 --- a/drivers/net/dsa/microchip/ksz_common.c +++ b/drivers/net/dsa/microchip/ksz_common.c @@ -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); | 
