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 /include/net/dsa.h | |
| 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 'include/net/dsa.h')
| -rw-r--r-- | include/net/dsa.h | 12 | 
1 files changed, 10 insertions, 2 deletions
| diff --git a/include/net/dsa.h b/include/net/dsa.h index 60fb4ec8ba61..462e9741b210 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -356,10 +356,13 @@ struct dsa_switch_ops {  	/*  	 * ethtool hardware statistics.  	 */ -	void	(*get_strings)(struct dsa_switch *ds, int port, uint8_t *data); +	void	(*get_strings)(struct dsa_switch *ds, int port, +			       u32 stringset, uint8_t *data);  	void	(*get_ethtool_stats)(struct dsa_switch *ds,  				     int port, uint64_t *data); -	int	(*get_sset_count)(struct dsa_switch *ds, int port); +	int	(*get_sset_count)(struct dsa_switch *ds, int port, int sset); +	void	(*get_ethtool_phy_stats)(struct dsa_switch *ds, +					 int port, uint64_t *data);  	/*  	 * ethtool Wake-on-LAN @@ -588,4 +591,9 @@ static inline int call_dsa_notifiers(unsigned long val, struct net_device *dev,  #define BRCM_TAG_GET_PORT(v)		((v) >> 8)  #define BRCM_TAG_GET_QUEUE(v)		((v) & 0xff) + +int dsa_port_get_phy_strings(struct dsa_port *dp, uint8_t *data); +int dsa_port_get_ethtool_phy_stats(struct dsa_port *dp, uint64_t *data); +int dsa_port_get_phy_sset_count(struct dsa_port *dp); +  #endif |