mirror of
https://github.com/torvalds/linux
synced 2024-11-05 18:23:50 +00:00
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>
This commit is contained in:
David S. Miller
commit
21fca6e01b
17 changed files with 369 additions and 87 deletions
|
|
@ -806,16 +806,39 @@ 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)
|
||||
static struct phy_device *b53_get_phy_device(struct dsa_switch *ds, int port)
|
||||
{
|
||||
/* These ports typically do not have built-in PHYs */
|
||||
switch (port) {
|
||||
case B53_CPU_PORT_25:
|
||||
case 7:
|
||||
case B53_CPU_PORT:
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return mdiobus_get_phy(ds->slave_mii_bus, port);
|
||||
}
|
||||
|
||||
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);
|
||||
struct phy_device *phydev;
|
||||
unsigned int i;
|
||||
|
||||
for (i = 0; i < mib_size; i++)
|
||||
strlcpy(data + i * ETH_GSTRING_LEN,
|
||||
mibs[i].name, ETH_GSTRING_LEN);
|
||||
if (stringset == ETH_SS_STATS) {
|
||||
for (i = 0; i < mib_size; i++)
|
||||
strlcpy(data + i * ETH_GSTRING_LEN,
|
||||
mibs[i].name, ETH_GSTRING_LEN);
|
||||
} else if (stringset == ETH_SS_PHY_STATS) {
|
||||
phydev = b53_get_phy_device(ds, port);
|
||||
if (!phydev)
|
||||
return;
|
||||
|
||||
phy_ethtool_get_strings(phydev, data);
|
||||
}
|
||||
}
|
||||
EXPORT_SYMBOL(b53_get_strings);
|
||||
|
||||
|
|
@ -852,11 +875,34 @@ 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)
|
||||
void b53_get_ethtool_phy_stats(struct dsa_switch *ds, int port, uint64_t *data)
|
||||
{
|
||||
struct phy_device *phydev;
|
||||
|
||||
phydev = b53_get_phy_device(ds, port);
|
||||
if (!phydev)
|
||||
return;
|
||||
|
||||
phy_ethtool_get_stats(phydev, NULL, data);
|
||||
}
|
||||
EXPORT_SYMBOL(b53_get_ethtool_phy_stats);
|
||||
|
||||
int b53_get_sset_count(struct dsa_switch *ds, int port, int sset)
|
||||
{
|
||||
struct b53_device *dev = ds->priv;
|
||||
struct phy_device *phydev;
|
||||
|
||||
return b53_get_mib_size(dev);
|
||||
if (sset == ETH_SS_STATS) {
|
||||
return b53_get_mib_size(dev);
|
||||
} else if (sset == ETH_SS_PHY_STATS) {
|
||||
phydev = b53_get_phy_device(ds, port);
|
||||
if (!phydev)
|
||||
return 0;
|
||||
|
||||
return phy_ethtool_get_sset_count(phydev);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(b53_get_sset_count);
|
||||
|
||||
|
|
@ -1477,7 +1523,7 @@ void b53_br_fast_age(struct dsa_switch *ds, int port)
|
|||
}
|
||||
EXPORT_SYMBOL(b53_br_fast_age);
|
||||
|
||||
static bool b53_can_enable_brcm_tags(struct dsa_switch *ds, int port)
|
||||
static bool b53_possible_cpu_port(struct dsa_switch *ds, int port)
|
||||
{
|
||||
/* Broadcom switches will accept enabling Broadcom tags on the
|
||||
* following ports: 5, 7 and 8, any other port is not supported
|
||||
|
|
@ -1489,10 +1535,19 @@ static bool b53_can_enable_brcm_tags(struct dsa_switch *ds, int port)
|
|||
return true;
|
||||
}
|
||||
|
||||
dev_warn(ds->dev, "Port %d is not Broadcom tag capable\n", port);
|
||||
return false;
|
||||
}
|
||||
|
||||
static bool b53_can_enable_brcm_tags(struct dsa_switch *ds, int port)
|
||||
{
|
||||
bool ret = b53_possible_cpu_port(ds, port);
|
||||
|
||||
if (!ret)
|
||||
dev_warn(ds->dev, "Port %d is not Broadcom tag capable\n",
|
||||
port);
|
||||
return ret;
|
||||
}
|
||||
|
||||
enum dsa_tag_protocol b53_get_tag_protocol(struct dsa_switch *ds, int port)
|
||||
{
|
||||
struct b53_device *dev = ds->priv;
|
||||
|
|
@ -1650,6 +1705,7 @@ static const struct dsa_switch_ops b53_switch_ops = {
|
|||
.get_strings = b53_get_strings,
|
||||
.get_ethtool_stats = b53_get_ethtool_stats,
|
||||
.get_sset_count = b53_get_sset_count,
|
||||
.get_ethtool_phy_stats = b53_get_ethtool_phy_stats,
|
||||
.phy_read = b53_phy_read16,
|
||||
.phy_write = b53_phy_write16,
|
||||
.adjust_link = b53_adjust_link,
|
||||
|
|
@ -1954,6 +2010,15 @@ static int b53_switch_init(struct b53_device *dev)
|
|||
dev->num_ports = dev->cpu_port + 1;
|
||||
dev->enabled_ports |= BIT(dev->cpu_port);
|
||||
|
||||
/* Include non standard CPU port built-in PHYs to be probed */
|
||||
if (is539x(dev) || is531x5(dev)) {
|
||||
for (i = 0; i < dev->num_ports; i++) {
|
||||
if (!(dev->ds->phys_mii_mask & BIT(i)) &&
|
||||
!b53_possible_cpu_port(dev->ds, i))
|
||||
dev->ds->phys_mii_mask |= BIT(i);
|
||||
}
|
||||
}
|
||||
|
||||
dev->ports = devm_kzalloc(dev->dev,
|
||||
sizeof(struct b53_port) * dev->num_ports,
|
||||
GFP_KERNEL);
|
||||
|
|
|
|||
|
|
@ -286,9 +286,11 @@ 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);
|
||||
void b53_get_ethtool_phy_stats(struct dsa_switch *ds, int port, uint64_t *data);
|
||||
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);
|
||||
|
|
|
|||
|
|
@ -859,6 +859,7 @@ static const struct dsa_switch_ops bcm_sf2_ops = {
|
|||
.get_strings = b53_get_strings,
|
||||
.get_ethtool_stats = b53_get_ethtool_stats,
|
||||
.get_sset_count = b53_get_sset_count,
|
||||
.get_ethtool_phy_stats = b53_get_ethtool_phy_stats,
|
||||
.get_phy_flags = bcm_sf2_sw_get_phy_flags,
|
||||
.adjust_link = bcm_sf2_sw_adjust_link,
|
||||
.fixed_link_update = bcm_sf2_sw_fixed_link_update,
|
||||
|
|
|
|||
|
|
@ -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 && sset != ETH_SS_PHY_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 && stringset != ETH_SS_PHY_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);
|
||||
|
|
@ -256,6 +263,7 @@ static const struct dsa_switch_ops dsa_loop_driver = {
|
|||
.get_strings = dsa_loop_get_strings,
|
||||
.get_ethtool_stats = dsa_loop_get_ethtool_stats,
|
||||
.get_sset_count = dsa_loop_get_sset_count,
|
||||
.get_ethtool_phy_stats = dsa_loop_get_ethtool_stats,
|
||||
.phy_read = dsa_loop_phy_read,
|
||||
.phy_write = dsa_loop_phy_write,
|
||||
.port_bridge_join = dsa_loop_port_bridge_join,
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -742,11 +742,14 @@ static void mv88e6xxx_atu_vtu_get_strings(uint8_t *data)
|
|||
}
|
||||
|
||||
static void mv88e6xxx_get_strings(struct dsa_switch *ds, int port,
|
||||
uint8_t *data)
|
||||
u32 stringset, uint8_t *data)
|
||||
{
|
||||
struct mv88e6xxx_chip *chip = ds->priv;
|
||||
int count = 0;
|
||||
|
||||
if (stringset != ETH_SS_STATS)
|
||||
return;
|
||||
|
||||
mutex_lock(&chip->reg_lock);
|
||||
|
||||
if (chip->info->ops->stats_get_strings)
|
||||
|
|
@ -789,12 +792,15 @@ static int mv88e6320_stats_get_sset_count(struct mv88e6xxx_chip *chip)
|
|||
STATS_TYPE_BANK1);
|
||||
}
|
||||
|
||||
static int mv88e6xxx_get_sset_count(struct dsa_switch *ds, int port)
|
||||
static int mv88e6xxx_get_sset_count(struct dsa_switch *ds, int port, int sset)
|
||||
{
|
||||
struct mv88e6xxx_chip *chip = ds->priv;
|
||||
int serdes_count = 0;
|
||||
int count = 0;
|
||||
|
||||
if (sset != ETH_SS_STATS)
|
||||
return 0;
|
||||
|
||||
mutex_lock(&chip->reg_lock);
|
||||
if (chip->info->ops->stats_get_sset_count)
|
||||
count = chip->info->ops->stats_get_sset_count(chip);
|
||||
|
|
|
|||
|
|
@ -600,10 +600,13 @@ qca8k_phy_write(struct dsa_switch *ds, int phy, int regnum, u16 val)
|
|||
}
|
||||
|
||||
static void
|
||||
qca8k_get_strings(struct dsa_switch *ds, int port, uint8_t *data)
|
||||
qca8k_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(ar8327_mib); i++)
|
||||
strncpy(data + i * ETH_GSTRING_LEN, ar8327_mib[i].name,
|
||||
ETH_GSTRING_LEN);
|
||||
|
|
@ -631,8 +634,11 @@ qca8k_get_ethtool_stats(struct dsa_switch *ds, int port,
|
|||
}
|
||||
|
||||
static int
|
||||
qca8k_get_sset_count(struct dsa_switch *ds, int port)
|
||||
qca8k_get_sset_count(struct dsa_switch *ds, int port, int sset)
|
||||
{
|
||||
if (sset != ETH_SS_STATS)
|
||||
return 0;
|
||||
|
||||
return ARRAY_SIZE(ar8327_mib);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1277,3 +1277,51 @@ int phy_ethtool_nway_reset(struct net_device *ndev)
|
|||
return phy_restart_aneg(phydev);
|
||||
}
|
||||
EXPORT_SYMBOL(phy_ethtool_nway_reset);
|
||||
|
||||
int phy_ethtool_get_strings(struct phy_device *phydev, u8 *data)
|
||||
{
|
||||
if (!phydev->drv)
|
||||
return -EIO;
|
||||
|
||||
mutex_lock(&phydev->lock);
|
||||
phydev->drv->get_strings(phydev, data);
|
||||
mutex_unlock(&phydev->lock);
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(phy_ethtool_get_strings);
|
||||
|
||||
int phy_ethtool_get_sset_count(struct phy_device *phydev)
|
||||
{
|
||||
int ret;
|
||||
|
||||
if (!phydev->drv)
|
||||
return -EIO;
|
||||
|
||||
if (phydev->drv->get_sset_count &&
|
||||
phydev->drv->get_strings &&
|
||||
phydev->drv->get_stats) {
|
||||
mutex_lock(&phydev->lock);
|
||||
ret = phydev->drv->get_sset_count(phydev);
|
||||
mutex_unlock(&phydev->lock);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
EXPORT_SYMBOL(phy_ethtool_get_sset_count);
|
||||
|
||||
int phy_ethtool_get_stats(struct phy_device *phydev,
|
||||
struct ethtool_stats *stats, u64 *data)
|
||||
{
|
||||
if (!phydev->drv)
|
||||
return -EIO;
|
||||
|
||||
mutex_lock(&phydev->lock);
|
||||
phydev->drv->get_stats(phydev, stats, data);
|
||||
mutex_unlock(&phydev->lock);
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(phy_ethtool_get_stats);
|
||||
|
|
|
|||
|
|
@ -312,6 +312,9 @@ bool ethtool_convert_link_mode_to_legacy_u32(u32 *legacy_u32,
|
|||
* by kernel. Returns a negative error code or zero.
|
||||
* @get_fecparam: Get the network device Forward Error Correction parameters.
|
||||
* @set_fecparam: Set the network device Forward Error Correction parameters.
|
||||
* @get_ethtool_phy_stats: Return extended statistics about the PHY device.
|
||||
* This is only useful if the device maintains PHY statistics and
|
||||
* cannot use the standard PHY library helpers.
|
||||
*
|
||||
* All operations are optional (i.e. the function pointer may be set
|
||||
* to %NULL) and callers must take this into account. Callers must
|
||||
|
|
@ -407,5 +410,7 @@ struct ethtool_ops {
|
|||
struct ethtool_fecparam *);
|
||||
int (*set_fecparam)(struct net_device *,
|
||||
struct ethtool_fecparam *);
|
||||
void (*get_ethtool_phy_stats)(struct net_device *,
|
||||
struct ethtool_stats *, u64 *);
|
||||
};
|
||||
#endif /* _LINUX_ETHTOOL_H */
|
||||
|
|
|
|||
|
|
@ -1066,6 +1066,26 @@ int phy_ethtool_nway_reset(struct net_device *ndev);
|
|||
#if IS_ENABLED(CONFIG_PHYLIB)
|
||||
int __init mdio_bus_init(void);
|
||||
void mdio_bus_exit(void);
|
||||
int phy_ethtool_get_strings(struct phy_device *phydev, u8 *data);
|
||||
int phy_ethtool_get_sset_count(struct phy_device *phydev);
|
||||
int phy_ethtool_get_stats(struct phy_device *phydev,
|
||||
struct ethtool_stats *stats, u64 *data);
|
||||
#else
|
||||
int phy_ethtool_get_strings(struct phy_device *phydev, u8 *data)
|
||||
{
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
int phy_ethtool_get_sset_count(struct phy_device *phydev)
|
||||
{
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
int phy_ethtool_get_stats(struct phy_device *phydev,
|
||||
struct ethtool_stats *stats, u64 *data)
|
||||
{
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
#endif
|
||||
|
||||
extern struct bus_type mdio_bus_type;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -211,23 +211,6 @@ static int ethtool_set_features(struct net_device *dev, void __user *useraddr)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int phy_get_sset_count(struct phy_device *phydev)
|
||||
{
|
||||
int ret;
|
||||
|
||||
if (phydev->drv->get_sset_count &&
|
||||
phydev->drv->get_strings &&
|
||||
phydev->drv->get_stats) {
|
||||
mutex_lock(&phydev->lock);
|
||||
ret = phydev->drv->get_sset_count(phydev);
|
||||
mutex_unlock(&phydev->lock);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
static int __ethtool_get_sset_count(struct net_device *dev, int sset)
|
||||
{
|
||||
const struct ethtool_ops *ops = dev->ethtool_ops;
|
||||
|
|
@ -244,12 +227,9 @@ static int __ethtool_get_sset_count(struct net_device *dev, int sset)
|
|||
if (sset == ETH_SS_PHY_TUNABLES)
|
||||
return ARRAY_SIZE(phy_tunable_strings);
|
||||
|
||||
if (sset == ETH_SS_PHY_STATS) {
|
||||
if (dev->phydev)
|
||||
return phy_get_sset_count(dev->phydev);
|
||||
else
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
if (sset == ETH_SS_PHY_STATS && dev->phydev &&
|
||||
!ops->get_ethtool_phy_stats)
|
||||
return phy_ethtool_get_sset_count(dev->phydev);
|
||||
|
||||
if (ops->get_sset_count && ops->get_strings)
|
||||
return ops->get_sset_count(dev, sset);
|
||||
|
|
@ -272,17 +252,10 @@ static void __ethtool_get_strings(struct net_device *dev,
|
|||
memcpy(data, tunable_strings, sizeof(tunable_strings));
|
||||
else if (stringset == ETH_SS_PHY_TUNABLES)
|
||||
memcpy(data, phy_tunable_strings, sizeof(phy_tunable_strings));
|
||||
else if (stringset == ETH_SS_PHY_STATS) {
|
||||
struct phy_device *phydev = dev->phydev;
|
||||
|
||||
if (phydev) {
|
||||
mutex_lock(&phydev->lock);
|
||||
phydev->drv->get_strings(phydev, data);
|
||||
mutex_unlock(&phydev->lock);
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
} else
|
||||
else if (stringset == ETH_SS_PHY_STATS && dev->phydev &&
|
||||
!ops->get_ethtool_phy_stats)
|
||||
phy_ethtool_get_strings(dev->phydev, data);
|
||||
else
|
||||
/* ops->get_strings is valid because checked earlier */
|
||||
ops->get_strings(dev, stringset, data);
|
||||
}
|
||||
|
|
@ -1994,15 +1967,19 @@ static int ethtool_get_stats(struct net_device *dev, void __user *useraddr)
|
|||
|
||||
static int ethtool_get_phy_stats(struct net_device *dev, void __user *useraddr)
|
||||
{
|
||||
struct ethtool_stats stats;
|
||||
const struct ethtool_ops *ops = dev->ethtool_ops;
|
||||
struct phy_device *phydev = dev->phydev;
|
||||
struct ethtool_stats stats;
|
||||
u64 *data;
|
||||
int ret, n_stats;
|
||||
|
||||
if (!phydev)
|
||||
if (!phydev && (!ops->get_ethtool_phy_stats || !ops->get_sset_count))
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
n_stats = phy_get_sset_count(phydev);
|
||||
if (dev->phydev && !ops->get_ethtool_phy_stats)
|
||||
n_stats = phy_ethtool_get_sset_count(dev->phydev);
|
||||
else
|
||||
n_stats = ops->get_sset_count(dev, ETH_SS_PHY_STATS);
|
||||
if (n_stats < 0)
|
||||
return n_stats;
|
||||
if (n_stats > S32_MAX / sizeof(u64))
|
||||
|
|
@ -2017,9 +1994,13 @@ static int ethtool_get_phy_stats(struct net_device *dev, void __user *useraddr)
|
|||
if (n_stats && !data)
|
||||
return -ENOMEM;
|
||||
|
||||
mutex_lock(&phydev->lock);
|
||||
phydev->drv->get_stats(phydev, &stats, data);
|
||||
mutex_unlock(&phydev->lock);
|
||||
if (dev->phydev && !ops->get_ethtool_phy_stats) {
|
||||
ret = phy_ethtool_get_stats(dev->phydev, &stats, data);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
} else {
|
||||
ops->get_ethtool_phy_stats(dev, &stats, data);
|
||||
}
|
||||
|
||||
ret = -EFAULT;
|
||||
if (copy_to_user(useraddr, &stats, sizeof(stats)))
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ static void dsa_master_get_ethtool_stats(struct net_device *dev,
|
|||
int port = cpu_dp->index;
|
||||
int count = 0;
|
||||
|
||||
if (ops && ops->get_sset_count && ops->get_ethtool_stats) {
|
||||
if (ops->get_sset_count && ops->get_ethtool_stats) {
|
||||
count = ops->get_sset_count(dev, ETH_SS_STATS);
|
||||
ops->get_ethtool_stats(dev, stats, data);
|
||||
}
|
||||
|
|
@ -31,6 +31,32 @@ static void dsa_master_get_ethtool_stats(struct net_device *dev,
|
|||
ds->ops->get_ethtool_stats(ds, port, data + count);
|
||||
}
|
||||
|
||||
static void dsa_master_get_ethtool_phy_stats(struct net_device *dev,
|
||||
struct ethtool_stats *stats,
|
||||
uint64_t *data)
|
||||
{
|
||||
struct dsa_port *cpu_dp = dev->dsa_ptr;
|
||||
const struct ethtool_ops *ops = cpu_dp->orig_ethtool_ops;
|
||||
struct dsa_switch *ds = cpu_dp->ds;
|
||||
int port = cpu_dp->index;
|
||||
int count = 0;
|
||||
|
||||
if (dev->phydev && !ops->get_ethtool_phy_stats) {
|
||||
count = phy_ethtool_get_sset_count(dev->phydev);
|
||||
if (count >= 0)
|
||||
phy_ethtool_get_stats(dev->phydev, stats, data);
|
||||
} else if (ops->get_sset_count && ops->get_ethtool_phy_stats) {
|
||||
count = ops->get_sset_count(dev, ETH_SS_PHY_STATS);
|
||||
ops->get_ethtool_phy_stats(dev, stats, data);
|
||||
}
|
||||
|
||||
if (count < 0)
|
||||
count = 0;
|
||||
|
||||
if (ds->ops->get_ethtool_phy_stats)
|
||||
ds->ops->get_ethtool_phy_stats(ds, port, data + count);
|
||||
}
|
||||
|
||||
static int dsa_master_get_sset_count(struct net_device *dev, int sset)
|
||||
{
|
||||
struct dsa_port *cpu_dp = dev->dsa_ptr;
|
||||
|
|
@ -38,11 +64,17 @@ static int dsa_master_get_sset_count(struct net_device *dev, int sset)
|
|||
struct dsa_switch *ds = cpu_dp->ds;
|
||||
int count = 0;
|
||||
|
||||
if (ops && ops->get_sset_count)
|
||||
count += ops->get_sset_count(dev, sset);
|
||||
if (sset == ETH_SS_PHY_STATS && dev->phydev &&
|
||||
!ops->get_ethtool_phy_stats)
|
||||
count = phy_ethtool_get_sset_count(dev->phydev);
|
||||
else if (ops->get_sset_count)
|
||||
count = ops->get_sset_count(dev, sset);
|
||||
|
||||
if (sset == ETH_SS_STATS && ds->ops->get_sset_count)
|
||||
count += ds->ops->get_sset_count(ds, cpu_dp->index);
|
||||
if (count < 0)
|
||||
count = 0;
|
||||
|
||||
if (ds->ops->get_sset_count)
|
||||
count += ds->ops->get_sset_count(ds, cpu_dp->index, sset);
|
||||
|
||||
return count;
|
||||
}
|
||||
|
|
@ -64,19 +96,28 @@ static void dsa_master_get_strings(struct net_device *dev, uint32_t stringset,
|
|||
/* We do not want to be NULL-terminated, since this is a prefix */
|
||||
pfx[sizeof(pfx) - 1] = '_';
|
||||
|
||||
if (ops && ops->get_sset_count && ops->get_strings) {
|
||||
mcount = ops->get_sset_count(dev, ETH_SS_STATS);
|
||||
if (stringset == ETH_SS_PHY_STATS && dev->phydev &&
|
||||
!ops->get_ethtool_phy_stats) {
|
||||
mcount = phy_ethtool_get_sset_count(dev->phydev);
|
||||
if (mcount < 0)
|
||||
mcount = 0;
|
||||
else
|
||||
phy_ethtool_get_strings(dev->phydev, data);
|
||||
} else if (ops->get_sset_count && ops->get_strings) {
|
||||
mcount = ops->get_sset_count(dev, stringset);
|
||||
if (mcount < 0)
|
||||
mcount = 0;
|
||||
ops->get_strings(dev, stringset, data);
|
||||
}
|
||||
|
||||
if (stringset == ETH_SS_STATS && ds->ops->get_strings) {
|
||||
if (ds->ops->get_strings) {
|
||||
ndata = data + mcount * len;
|
||||
/* This function copies ETH_GSTRINGS_LEN bytes, we will mangle
|
||||
* the output after to prepend our CPU port prefix we
|
||||
* constructed earlier
|
||||
*/
|
||||
ds->ops->get_strings(ds, port, ndata);
|
||||
count = ds->ops->get_sset_count(ds, port);
|
||||
ds->ops->get_strings(ds, port, stringset, ndata);
|
||||
count = ds->ops->get_sset_count(ds, port, stringset);
|
||||
for (i = 0; i < count; i++) {
|
||||
memmove(ndata + (i * len + sizeof(pfx)),
|
||||
ndata + i * len, len - sizeof(pfx));
|
||||
|
|
@ -102,6 +143,7 @@ static int dsa_master_ethtool_setup(struct net_device *dev)
|
|||
ops->get_sset_count = dsa_master_get_sset_count;
|
||||
ops->get_ethtool_stats = dsa_master_get_ethtool_stats;
|
||||
ops->get_strings = dsa_master_get_strings;
|
||||
ops->get_ethtool_phy_stats = dsa_master_get_ethtool_phy_stats;
|
||||
|
||||
dev->ethtool_ops = ops;
|
||||
|
||||
|
|
|
|||
|
|
@ -273,24 +273,37 @@ int dsa_port_vlan_del(struct dsa_port *dp,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static struct phy_device *dsa_port_get_phy_device(struct dsa_port *dp)
|
||||
{
|
||||
struct device_node *phy_dn;
|
||||
struct phy_device *phydev;
|
||||
|
||||
phy_dn = of_parse_phandle(dp->dn, "phy-handle", 0);
|
||||
if (!phy_dn)
|
||||
return NULL;
|
||||
|
||||
phydev = of_phy_find_device(phy_dn);
|
||||
if (!phydev) {
|
||||
of_node_put(phy_dn);
|
||||
return ERR_PTR(-EPROBE_DEFER);
|
||||
}
|
||||
|
||||
return phydev;
|
||||
}
|
||||
|
||||
static int dsa_port_setup_phy_of(struct dsa_port *dp, bool enable)
|
||||
{
|
||||
struct device_node *port_dn = dp->dn;
|
||||
struct device_node *phy_dn;
|
||||
struct dsa_switch *ds = dp->ds;
|
||||
struct phy_device *phydev;
|
||||
int port = dp->index;
|
||||
int err = 0;
|
||||
|
||||
phy_dn = of_parse_phandle(port_dn, "phy-handle", 0);
|
||||
if (!phy_dn)
|
||||
phydev = dsa_port_get_phy_device(dp);
|
||||
if (!phydev)
|
||||
return 0;
|
||||
|
||||
phydev = of_phy_find_device(phy_dn);
|
||||
if (!phydev) {
|
||||
err = -EPROBE_DEFER;
|
||||
goto err_put_of;
|
||||
}
|
||||
if (IS_ERR(phydev))
|
||||
return PTR_ERR(phydev);
|
||||
|
||||
if (enable) {
|
||||
err = genphy_config_init(phydev);
|
||||
|
|
@ -317,8 +330,6 @@ static int dsa_port_setup_phy_of(struct dsa_port *dp, bool enable)
|
|||
|
||||
err_put_dev:
|
||||
put_device(&phydev->mdio.dev);
|
||||
err_put_of:
|
||||
of_node_put(phy_dn);
|
||||
return err;
|
||||
}
|
||||
|
||||
|
|
@ -372,3 +383,60 @@ void dsa_port_link_unregister_of(struct dsa_port *dp)
|
|||
else
|
||||
dsa_port_setup_phy_of(dp, false);
|
||||
}
|
||||
|
||||
int dsa_port_get_phy_strings(struct dsa_port *dp, uint8_t *data)
|
||||
{
|
||||
struct phy_device *phydev;
|
||||
int ret = -EOPNOTSUPP;
|
||||
|
||||
if (of_phy_is_fixed_link(dp->dn))
|
||||
return ret;
|
||||
|
||||
phydev = dsa_port_get_phy_device(dp);
|
||||
if (IS_ERR_OR_NULL(phydev))
|
||||
return ret;
|
||||
|
||||
ret = phy_ethtool_get_strings(phydev, data);
|
||||
put_device(&phydev->mdio.dev);
|
||||
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(dsa_port_get_phy_strings);
|
||||
|
||||
int dsa_port_get_ethtool_phy_stats(struct dsa_port *dp, uint64_t *data)
|
||||
{
|
||||
struct phy_device *phydev;
|
||||
int ret = -EOPNOTSUPP;
|
||||
|
||||
if (of_phy_is_fixed_link(dp->dn))
|
||||
return ret;
|
||||
|
||||
phydev = dsa_port_get_phy_device(dp);
|
||||
if (IS_ERR_OR_NULL(phydev))
|
||||
return ret;
|
||||
|
||||
ret = phy_ethtool_get_stats(phydev, NULL, data);
|
||||
put_device(&phydev->mdio.dev);
|
||||
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(dsa_port_get_ethtool_phy_stats);
|
||||
|
||||
int dsa_port_get_phy_sset_count(struct dsa_port *dp)
|
||||
{
|
||||
struct phy_device *phydev;
|
||||
int ret = -EOPNOTSUPP;
|
||||
|
||||
if (of_phy_is_fixed_link(dp->dn))
|
||||
return ret;
|
||||
|
||||
phydev = dsa_port_get_phy_device(dp);
|
||||
if (IS_ERR_OR_NULL(phydev))
|
||||
return ret;
|
||||
|
||||
ret = phy_ethtool_get_sset_count(phydev);
|
||||
put_device(&phydev->mdio.dev);
|
||||
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(dsa_port_get_phy_sset_count);
|
||||
|
|
|
|||
|
|
@ -560,7 +560,8 @@ static void dsa_slave_get_strings(struct net_device *dev,
|
|||
strncpy(data + 2 * len, "rx_packets", len);
|
||||
strncpy(data + 3 * len, "rx_bytes", len);
|
||||
if (ds->ops->get_strings)
|
||||
ds->ops->get_strings(ds, dp->index, data + 4 * len);
|
||||
ds->ops->get_strings(ds, dp->index, stringset,
|
||||
data + 4 * len);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -605,7 +606,7 @@ static int dsa_slave_get_sset_count(struct net_device *dev, int sset)
|
|||
|
||||
count = 4;
|
||||
if (ds->ops->get_sset_count)
|
||||
count += ds->ops->get_sset_count(ds, dp->index);
|
||||
count += ds->ops->get_sset_count(ds, dp->index, sset);
|
||||
|
||||
return count;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue