diff options
| author | David S. Miller <[email protected]> | 2018-04-27 11:53:04 -0400 | 
|---|---|---|
| committer | David S. Miller <[email protected]> | 2018-04-27 11:53:04 -0400 | 
| commit | 21fca6e01beb9cae33c7d45a69e032d91c81f07d (patch) | |
| tree | ee5924b4a53b16f813c239101935af3f480b7781 /drivers/net/dsa/mt7530.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 <[email protected]>
Diffstat (limited to 'drivers/net/dsa/mt7530.c')
| -rw-r--r-- | drivers/net/dsa/mt7530.c | 11 | 
1 files changed, 9 insertions, 2 deletions
| diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index 80a4dbc3a499..62e486652e62 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -573,10 +573,14 @@ static int mt7530_phy_write(struct dsa_switch *ds, int port, int regnum,  }  static void -mt7530_get_strings(struct dsa_switch *ds, int port, uint8_t *data) +mt7530_get_strings(struct dsa_switch *ds, int port, u32 stringset, +		   uint8_t *data)  {  	int i; +	if (stringset != ETH_SS_STATS) +		return; +  	for (i = 0; i < ARRAY_SIZE(mt7530_mib); i++)  		strncpy(data + i * ETH_GSTRING_LEN, mt7530_mib[i].name,  			ETH_GSTRING_LEN); @@ -604,8 +608,11 @@ mt7530_get_ethtool_stats(struct dsa_switch *ds, int port,  }  static int -mt7530_get_sset_count(struct dsa_switch *ds, int port) +mt7530_get_sset_count(struct dsa_switch *ds, int port, int sset)  { +	if (sset != ETH_SS_STATS) +		return 0; +  	return ARRAY_SIZE(mt7530_mib);  } |