Commit ccac0425 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'ethtool-phy-stats' 



Andrew Lunn says:

====================
Ethtool support for phy stats

This patchset add ethtool support for reading statistics from the PHY.
The Marvell and Micrel Phys are then extended to report receiver
packet errors and idle errors.

v2:
  Fix linking when phylib is not enabled.
v3:
  Inline helpers into ethtool.c, so fixing when phylib is a module.
v4:
  Add missing static
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a3748a9c 2b2427d0

drivers/net/phy/marvell.c

+135 −0
Original line number Diff line number Diff line
@@ -137,6 +137,22 @@ MODULE_DESCRIPTION("Marvell PHY driver"); 
MODULE_AUTHOR("Andy Fleming");

MODULE_LICENSE("GPL");



struct marvell_hw_stat {

	const char *string;

	u8 page;

	u8 reg;

	u8 bits;

};



static struct marvell_hw_stat marvell_hw_stats[] = {

	{ "phy_receive_errors", 0, 21, 16},

	{ "phy_idle_errors", 0, 10, 8 },

};



struct marvell_priv {

	u64 stats[ARRAY_SIZE(marvell_hw_stats)];

};



static int marvell_ack_interrupt(struct phy_device *phydev)

{

	int err;
@@ -986,12 +1002,80 @@ static int m88e1318_set_wol(struct phy_device *phydev, struct ethtool_wolinfo *w 
	return 0;

}



static int marvell_get_sset_count(struct phy_device *phydev)

{

	return ARRAY_SIZE(marvell_hw_stats);

}



static void marvell_get_strings(struct phy_device *phydev, u8 *data)

{

	int i;



	for (i = 0; i < ARRAY_SIZE(marvell_hw_stats); i++) {

		memcpy(data + i * ETH_GSTRING_LEN,

		       marvell_hw_stats[i].string, ETH_GSTRING_LEN);

	}

}



#ifndef UINT64_MAX

#define UINT64_MAX              (u64)(~((u64)0))

#endif

static u64 marvell_get_stat(struct phy_device *phydev, int i)

{

	struct marvell_hw_stat stat = marvell_hw_stats[i];

	struct marvell_priv *priv = phydev->priv;

	int err, oldpage;

	u64 val;



	oldpage = phy_read(phydev, MII_MARVELL_PHY_PAGE);

	err = phy_write(phydev, MII_MARVELL_PHY_PAGE,

			stat.page);

	if (err < 0)

		return UINT64_MAX;



	val = phy_read(phydev, stat.reg);

	if (val < 0) {

		val = UINT64_MAX;

	} else {

		val = val & ((1 << stat.bits) - 1);

		priv->stats[i] += val;

		val = priv->stats[i];

	}



	phy_write(phydev, MII_MARVELL_PHY_PAGE, oldpage);



	return val;

}



static void marvell_get_stats(struct phy_device *phydev,

			      struct ethtool_stats *stats, u64 *data)

{

	int i;



	for (i = 0; i < ARRAY_SIZE(marvell_hw_stats); i++)

		data[i] = marvell_get_stat(phydev, i);

}



static int marvell_probe(struct phy_device *phydev)

{

	struct marvell_priv *priv;



	priv = devm_kzalloc(&phydev->dev, sizeof(*priv), GFP_KERNEL);

	if (!priv)

		return -ENOMEM;



	phydev->priv = priv;



	return 0;

}



static struct phy_driver marvell_drivers[] = {

	{

		.phy_id = MARVELL_PHY_ID_88E1101,

		.phy_id_mask = MARVELL_PHY_ID_MASK,

		.name = "Marvell 88E1101",

		.features = PHY_GBIT_FEATURES,

		.probe = marvell_probe,

		.flags = PHY_HAS_INTERRUPT,

		.config_aneg = &marvell_config_aneg,

		.read_status = &genphy_read_status,
@@ -999,6 +1083,9 @@ static struct phy_driver marvell_drivers[] = { 
		.config_intr = &marvell_config_intr,

		.resume = &genphy_resume,

		.suspend = &genphy_suspend,

		.get_sset_count = marvell_get_sset_count,

		.get_strings = marvell_get_strings,

		.get_stats = marvell_get_stats,

		.driver = { .owner = THIS_MODULE },

	},

	{
@@ -1007,6 +1094,7 @@ static struct phy_driver marvell_drivers[] = { 
		.name = "Marvell 88E1112",

		.features = PHY_GBIT_FEATURES,

		.flags = PHY_HAS_INTERRUPT,

		.probe = marvell_probe,

		.config_init = &m88e1111_config_init,

		.config_aneg = &marvell_config_aneg,

		.read_status = &genphy_read_status,
@@ -1014,6 +1102,9 @@ static struct phy_driver marvell_drivers[] = { 
		.config_intr = &marvell_config_intr,

		.resume = &genphy_resume,

		.suspend = &genphy_suspend,

		.get_sset_count = marvell_get_sset_count,

		.get_strings = marvell_get_strings,

		.get_stats = marvell_get_stats,

		.driver = { .owner = THIS_MODULE },

	},

	{
@@ -1022,6 +1113,7 @@ static struct phy_driver marvell_drivers[] = { 
		.name = "Marvell 88E1111",

		.features = PHY_GBIT_FEATURES,

		.flags = PHY_HAS_INTERRUPT,

		.probe = marvell_probe,

		.config_init = &m88e1111_config_init,

		.config_aneg = &marvell_config_aneg,

		.read_status = &marvell_read_status,
@@ -1029,6 +1121,9 @@ static struct phy_driver marvell_drivers[] = { 
		.config_intr = &marvell_config_intr,

		.resume = &genphy_resume,

		.suspend = &genphy_suspend,

		.get_sset_count = marvell_get_sset_count,

		.get_strings = marvell_get_strings,

		.get_stats = marvell_get_stats,

		.driver = { .owner = THIS_MODULE },

	},

	{
@@ -1037,6 +1132,7 @@ static struct phy_driver marvell_drivers[] = { 
		.name = "Marvell 88E1118",

		.features = PHY_GBIT_FEATURES,

		.flags = PHY_HAS_INTERRUPT,

		.probe = marvell_probe,

		.config_init = &m88e1118_config_init,

		.config_aneg = &m88e1118_config_aneg,

		.read_status = &genphy_read_status,
@@ -1044,6 +1140,9 @@ static struct phy_driver marvell_drivers[] = { 
		.config_intr = &marvell_config_intr,

		.resume = &genphy_resume,

		.suspend = &genphy_suspend,

		.get_sset_count = marvell_get_sset_count,

		.get_strings = marvell_get_strings,

		.get_stats = marvell_get_stats,

		.driver = {.owner = THIS_MODULE,},

	},

	{
@@ -1052,6 +1151,7 @@ static struct phy_driver marvell_drivers[] = { 
		.name = "Marvell 88E1121R",

		.features = PHY_GBIT_FEATURES,

		.flags = PHY_HAS_INTERRUPT,

		.probe = marvell_probe,

		.config_aneg = &m88e1121_config_aneg,

		.read_status = &marvell_read_status,

		.ack_interrupt = &marvell_ack_interrupt,
@@ -1059,6 +1159,9 @@ static struct phy_driver marvell_drivers[] = { 
		.did_interrupt = &m88e1121_did_interrupt,

		.resume = &genphy_resume,

		.suspend = &genphy_suspend,

		.get_sset_count = marvell_get_sset_count,

		.get_strings = marvell_get_strings,

		.get_stats = marvell_get_stats,

		.driver = { .owner = THIS_MODULE },

	},

	{
@@ -1067,6 +1170,7 @@ static struct phy_driver marvell_drivers[] = { 
		.name = "Marvell 88E1318S",

		.features = PHY_GBIT_FEATURES,

		.flags = PHY_HAS_INTERRUPT,

		.probe = marvell_probe,

		.config_aneg = &m88e1318_config_aneg,

		.read_status = &marvell_read_status,

		.ack_interrupt = &marvell_ack_interrupt,
@@ -1076,6 +1180,9 @@ static struct phy_driver marvell_drivers[] = { 
		.set_wol = &m88e1318_set_wol,

		.resume = &genphy_resume,

		.suspend = &genphy_suspend,

		.get_sset_count = marvell_get_sset_count,

		.get_strings = marvell_get_strings,

		.get_stats = marvell_get_stats,

		.driver = { .owner = THIS_MODULE },

	},

	{
@@ -1084,6 +1191,7 @@ static struct phy_driver marvell_drivers[] = { 
		.name = "Marvell 88E1145",

		.features = PHY_GBIT_FEATURES,

		.flags = PHY_HAS_INTERRUPT,

		.probe = marvell_probe,

		.config_init = &m88e1145_config_init,

		.config_aneg = &marvell_config_aneg,

		.read_status = &genphy_read_status,
@@ -1091,6 +1199,9 @@ static struct phy_driver marvell_drivers[] = { 
		.config_intr = &marvell_config_intr,

		.resume = &genphy_resume,

		.suspend = &genphy_suspend,

		.get_sset_count = marvell_get_sset_count,

		.get_strings = marvell_get_strings,

		.get_stats = marvell_get_stats,

		.driver = { .owner = THIS_MODULE },

	},

	{
@@ -1099,6 +1210,7 @@ static struct phy_driver marvell_drivers[] = { 
		.name = "Marvell 88E1149R",

		.features = PHY_GBIT_FEATURES,

		.flags = PHY_HAS_INTERRUPT,

		.probe = marvell_probe,

		.config_init = &m88e1149_config_init,

		.config_aneg = &m88e1118_config_aneg,

		.read_status = &genphy_read_status,
@@ -1106,6 +1218,9 @@ static struct phy_driver marvell_drivers[] = { 
		.config_intr = &marvell_config_intr,

		.resume = &genphy_resume,

		.suspend = &genphy_suspend,

		.get_sset_count = marvell_get_sset_count,

		.get_strings = marvell_get_strings,

		.get_stats = marvell_get_stats,

		.driver = { .owner = THIS_MODULE },

	},

	{
@@ -1114,6 +1229,7 @@ static struct phy_driver marvell_drivers[] = { 
		.name = "Marvell 88E1240",

		.features = PHY_GBIT_FEATURES,

		.flags = PHY_HAS_INTERRUPT,

		.probe = marvell_probe,

		.config_init = &m88e1111_config_init,

		.config_aneg = &marvell_config_aneg,

		.read_status = &genphy_read_status,
@@ -1121,6 +1237,9 @@ static struct phy_driver marvell_drivers[] = { 
		.config_intr = &marvell_config_intr,

		.resume = &genphy_resume,

		.suspend = &genphy_suspend,

		.get_sset_count = marvell_get_sset_count,

		.get_strings = marvell_get_strings,

		.get_stats = marvell_get_stats,

		.driver = { .owner = THIS_MODULE },

	},

	{
@@ -1129,6 +1248,7 @@ static struct phy_driver marvell_drivers[] = { 
		.name = "Marvell 88E1116R",

		.features = PHY_GBIT_FEATURES,

		.flags = PHY_HAS_INTERRUPT,

		.probe = marvell_probe,

		.config_init = &m88e1116r_config_init,

		.config_aneg = &genphy_config_aneg,

		.read_status = &genphy_read_status,
@@ -1136,6 +1256,9 @@ static struct phy_driver marvell_drivers[] = { 
		.config_intr = &marvell_config_intr,

		.resume = &genphy_resume,

		.suspend = &genphy_suspend,

		.get_sset_count = marvell_get_sset_count,

		.get_strings = marvell_get_strings,

		.get_stats = marvell_get_stats,

		.driver = { .owner = THIS_MODULE },

	},

	{
@@ -1144,6 +1267,7 @@ static struct phy_driver marvell_drivers[] = { 
		.name = "Marvell 88E1510",

		.features = PHY_GBIT_FEATURES,

		.flags = PHY_HAS_INTERRUPT,

		.probe = marvell_probe,

		.config_aneg = &m88e1510_config_aneg,

		.read_status = &marvell_read_status,

		.ack_interrupt = &marvell_ack_interrupt,
@@ -1151,6 +1275,9 @@ static struct phy_driver marvell_drivers[] = { 
		.did_interrupt = &m88e1121_did_interrupt,

		.resume = &genphy_resume,

		.suspend = &genphy_suspend,

		.get_sset_count = marvell_get_sset_count,

		.get_strings = marvell_get_strings,

		.get_stats = marvell_get_stats,

		.driver = { .owner = THIS_MODULE },

	},

	{
@@ -1159,6 +1286,7 @@ static struct phy_driver marvell_drivers[] = { 
		.name = "Marvell 88E1540",

		.features = PHY_GBIT_FEATURES,

		.flags = PHY_HAS_INTERRUPT,

		.probe = marvell_probe,

		.config_aneg = &m88e1510_config_aneg,

		.read_status = &marvell_read_status,

		.ack_interrupt = &marvell_ack_interrupt,
@@ -1166,6 +1294,9 @@ static struct phy_driver marvell_drivers[] = { 
		.did_interrupt = &m88e1121_did_interrupt,

		.resume = &genphy_resume,

		.suspend = &genphy_suspend,

		.get_sset_count = marvell_get_sset_count,

		.get_strings = marvell_get_strings,

		.get_stats = marvell_get_stats,

		.driver = { .owner = THIS_MODULE },

	},

	{
@@ -1174,6 +1305,7 @@ static struct phy_driver marvell_drivers[] = { 
		.name = "Marvell 88E3016",

		.features = PHY_BASIC_FEATURES,

		.flags = PHY_HAS_INTERRUPT,

		.probe = marvell_probe,

		.config_aneg = &genphy_config_aneg,

		.config_init = &m88e3016_config_init,

		.aneg_done = &marvell_aneg_done,
@@ -1183,6 +1315,9 @@ static struct phy_driver marvell_drivers[] = { 
		.did_interrupt = &m88e1121_did_interrupt,

		.resume = &genphy_resume,

		.suspend = &genphy_suspend,

		.get_sset_count = marvell_get_sset_count,

		.get_strings = marvell_get_strings,

		.get_stats = marvell_get_stats,

		.driver = { .owner = THIS_MODULE },

	},

};

drivers/net/phy/micrel.c

+96 −0
Original line number Diff line number Diff line
@@ -73,6 +73,17 @@ 


#define PS_TO_REG				200



struct kszphy_hw_stat {

	const char *string;

	u8 reg;

	u8 bits;

};



static struct kszphy_hw_stat kszphy_hw_stats[] = {

	{ "phy_receive_errors", 21, 16},

	{ "phy_idle_errors", 10, 8 },

};



struct kszphy_type {

	u32 led_mode_reg;

	u16 interrupt_level_mask;
@@ -86,6 +97,7 @@ struct kszphy_priv { 
	int led_mode;

	bool rmii_ref_clk_sel;

	bool rmii_ref_clk_sel_val;

	u64 stats[ARRAY_SIZE(kszphy_hw_stats)];

};



static const struct kszphy_type ksz8021_type = {
@@ -569,6 +581,51 @@ ksz9021_wr_mmd_phyreg(struct phy_device *phydev, int ptrad, int devnum, 
{

}



static int kszphy_get_sset_count(struct phy_device *phydev)

{

	return ARRAY_SIZE(kszphy_hw_stats);

}



static void kszphy_get_strings(struct phy_device *phydev, u8 *data)

{

	int i;



	for (i = 0; i < ARRAY_SIZE(kszphy_hw_stats); i++) {

		memcpy(data + i * ETH_GSTRING_LEN,

		       kszphy_hw_stats[i].string, ETH_GSTRING_LEN);

	}

}



#ifndef UINT64_MAX

#define UINT64_MAX              (u64)(~((u64)0))

#endif

static u64 kszphy_get_stat(struct phy_device *phydev, int i)

{

	struct kszphy_hw_stat stat = kszphy_hw_stats[i];

	struct kszphy_priv *priv = phydev->priv;

	u64 val;



	val = phy_read(phydev, stat.reg);

	if (val < 0) {

		val = UINT64_MAX;

	} else {

		val = val & ((1 << stat.bits) - 1);

		priv->stats[i] += val;

		val = priv->stats[i];

	}



	return val;

}



static void kszphy_get_stats(struct phy_device *phydev,

			     struct ethtool_stats *stats, u64 *data)

{

	int i;



	for (i = 0; i < ARRAY_SIZE(kszphy_hw_stats); i++)

		data[i] = kszphy_get_stat(phydev, i);

}



static int kszphy_probe(struct phy_device *phydev)

{

	const struct kszphy_type *type = phydev->drv->driver_data;
@@ -642,6 +699,9 @@ static struct phy_driver ksphy_driver[] = { 
	.read_status	= genphy_read_status,

	.ack_interrupt	= kszphy_ack_interrupt,

	.config_intr	= kszphy_config_intr,

	.get_sset_count = kszphy_get_sset_count,

	.get_strings	= kszphy_get_strings,

	.get_stats	= kszphy_get_stats,

	.suspend	= genphy_suspend,

	.resume		= genphy_resume,

	.driver		= { .owner = THIS_MODULE,},
@@ -659,6 +719,9 @@ static struct phy_driver ksphy_driver[] = { 
	.read_status	= genphy_read_status,

	.ack_interrupt	= kszphy_ack_interrupt,

	.config_intr	= kszphy_config_intr,

	.get_sset_count = kszphy_get_sset_count,

	.get_strings	= kszphy_get_strings,

	.get_stats	= kszphy_get_stats,

	.suspend	= genphy_suspend,

	.resume		= genphy_resume,

	.driver		= { .owner = THIS_MODULE,},
@@ -676,6 +739,9 @@ static struct phy_driver ksphy_driver[] = { 
	.read_status	= genphy_read_status,

	.ack_interrupt	= kszphy_ack_interrupt,

	.config_intr	= kszphy_config_intr,

	.get_sset_count = kszphy_get_sset_count,

	.get_strings	= kszphy_get_strings,

	.get_stats	= kszphy_get_stats,

	.suspend	= genphy_suspend,

	.resume		= genphy_resume,

	.driver		= { .owner = THIS_MODULE,},
@@ -693,6 +759,9 @@ static struct phy_driver ksphy_driver[] = { 
	.read_status	= genphy_read_status,

	.ack_interrupt	= kszphy_ack_interrupt,

	.config_intr	= kszphy_config_intr,

	.get_sset_count = kszphy_get_sset_count,

	.get_strings	= kszphy_get_strings,

	.get_stats	= kszphy_get_stats,

	.suspend	= genphy_suspend,

	.resume		= genphy_resume,

	.driver		= { .owner = THIS_MODULE,},
@@ -710,6 +779,9 @@ static struct phy_driver ksphy_driver[] = { 
	.read_status	= genphy_read_status,

	.ack_interrupt	= kszphy_ack_interrupt,

	.config_intr	= kszphy_config_intr,

	.get_sset_count = kszphy_get_sset_count,

	.get_strings	= kszphy_get_strings,

	.get_stats	= kszphy_get_stats,

	.suspend	= genphy_suspend,

	.resume		= genphy_resume,

	.driver		= { .owner = THIS_MODULE,},
@@ -727,6 +799,9 @@ static struct phy_driver ksphy_driver[] = { 
	.read_status	= genphy_read_status,

	.ack_interrupt	= kszphy_ack_interrupt,

	.config_intr	= kszphy_config_intr,

	.get_sset_count = kszphy_get_sset_count,

	.get_strings	= kszphy_get_strings,

	.get_stats	= kszphy_get_stats,

	.suspend	= genphy_suspend,

	.resume		= genphy_resume,

	.driver		= { .owner = THIS_MODULE,},
@@ -743,6 +818,9 @@ static struct phy_driver ksphy_driver[] = { 
	.read_status	= genphy_read_status,

	.ack_interrupt	= kszphy_ack_interrupt,

	.config_intr	= kszphy_config_intr,

	.get_sset_count = kszphy_get_sset_count,

	.get_strings	= kszphy_get_strings,

	.get_stats	= kszphy_get_stats,

	.suspend	= genphy_suspend,

	.resume		= genphy_resume,

	.driver		= { .owner = THIS_MODULE,},
@@ -759,6 +837,9 @@ static struct phy_driver ksphy_driver[] = { 
	.read_status	= genphy_read_status,

	.ack_interrupt	= kszphy_ack_interrupt,

	.config_intr	= kszphy_config_intr,

	.get_sset_count = kszphy_get_sset_count,

	.get_strings	= kszphy_get_strings,

	.get_stats	= kszphy_get_stats,

	.suspend	= genphy_suspend,

	.resume		= genphy_resume,

	.driver		= { .owner = THIS_MODULE,},
@@ -773,6 +854,9 @@ static struct phy_driver ksphy_driver[] = { 
	.read_status	= genphy_read_status,

	.ack_interrupt	= kszphy_ack_interrupt,

	.config_intr	= kszphy_config_intr,

	.get_sset_count = kszphy_get_sset_count,

	.get_strings	= kszphy_get_strings,

	.get_stats	= kszphy_get_stats,

	.suspend	= genphy_suspend,

	.resume		= genphy_resume,

	.driver		= { .owner = THIS_MODULE,},
@@ -788,6 +872,9 @@ static struct phy_driver ksphy_driver[] = { 
	.read_status	= genphy_read_status,

	.ack_interrupt	= kszphy_ack_interrupt,

	.config_intr	= kszphy_config_intr,

	.get_sset_count = kszphy_get_sset_count,

	.get_strings	= kszphy_get_strings,

	.get_stats	= kszphy_get_stats,

	.suspend	= genphy_suspend,

	.resume		= genphy_resume,

	.read_mmd_indirect = ksz9021_rd_mmd_phyreg,
@@ -805,6 +892,9 @@ static struct phy_driver ksphy_driver[] = { 
	.read_status	= ksz9031_read_status,

	.ack_interrupt	= kszphy_ack_interrupt,

	.config_intr	= kszphy_config_intr,

	.get_sset_count = kszphy_get_sset_count,

	.get_strings	= kszphy_get_strings,

	.get_stats	= kszphy_get_stats,

	.suspend	= genphy_suspend,

	.resume		= genphy_resume,

	.driver		= { .owner = THIS_MODULE, },
@@ -817,6 +907,9 @@ static struct phy_driver ksphy_driver[] = { 
	.config_init	= kszphy_config_init,

	.config_aneg	= ksz8873mll_config_aneg,

	.read_status	= ksz8873mll_read_status,

	.get_sset_count = kszphy_get_sset_count,

	.get_strings	= kszphy_get_strings,

	.get_stats	= kszphy_get_stats,

	.suspend	= genphy_suspend,

	.resume		= genphy_resume,

	.driver		= { .owner = THIS_MODULE, },
@@ -829,6 +922,9 @@ static struct phy_driver ksphy_driver[] = { 
	.config_init	= kszphy_config_init,

	.config_aneg	= genphy_config_aneg,

	.read_status	= genphy_read_status,

	.get_sset_count = kszphy_get_sset_count,

	.get_strings	= kszphy_get_strings,

	.get_stats	= kszphy_get_stats,

	.suspend	= genphy_suspend,

	.resume		= genphy_resume,

	.driver		= { .owner = THIS_MODULE, },

include/linux/phy.h

+6 −0
Original line number Diff line number Diff line
@@ -589,6 +589,12 @@ struct phy_driver { 
	int (*module_eeprom)(struct phy_device *dev,

			     struct ethtool_eeprom *ee, u8 *data);



	/* Get statistics from the phy using ethtool */

	int (*get_sset_count)(struct phy_device *dev);

	void (*get_strings)(struct phy_device *dev, u8 *data);

	void (*get_stats)(struct phy_device *dev,

			  struct ethtool_stats *stats, u64 *data);



	struct device_driver driver;

};

#define to_phy_driver(d) container_of(d, struct phy_driver, driver)

include/uapi/linux/ethtool.h

+3 −0
Original line number Diff line number Diff line
@@ -542,6 +542,7 @@ struct ethtool_pauseparam { 
 *	now deprecated

 * @ETH_SS_FEATURES: Device feature names

 * @ETH_SS_RSS_HASH_FUNCS: RSS hush function names

 * @ETH_SS_PHY_STATS: Statistic names, for use with %ETHTOOL_GPHYSTATS

 */

enum ethtool_stringset {

	ETH_SS_TEST		= 0,
@@ -551,6 +552,7 @@ enum ethtool_stringset { 
	ETH_SS_FEATURES,

	ETH_SS_RSS_HASH_FUNCS,

	ETH_SS_TUNABLES,

	ETH_SS_PHY_STATS,

};



/**
@@ -1225,6 +1227,7 @@ enum ethtool_sfeatures_retval_bits { 
#define ETHTOOL_SRSSH		0x00000047 /* Set RX flow hash configuration */

#define ETHTOOL_GTUNABLE	0x00000048 /* Get tunable configuration */

#define ETHTOOL_STUNABLE	0x00000049 /* Set tunable configuration */

#define ETHTOOL_GPHYSTATS	0x0000004a /* get PHY-specific statistics */



/* compatibility with older code */

#define SPARC_ETH_GSET		ETHTOOL_GSET

net/core/ethtool.c

+80 −1
Original line number Diff line number Diff line
@@ -191,6 +191,23 @@ 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;
@@ -204,6 +221,13 @@ static int __ethtool_get_sset_count(struct net_device *dev, int sset) 
	if (sset == ETH_SS_TUNABLES)

		return ARRAY_SIZE(tunable_strings);



	if (sset == ETH_SS_PHY_STATS) {

		if (dev->phydev)

			return phy_get_sset_count(dev->phydev);

		else

			return -EOPNOTSUPP;

	}



	if (ops->get_sset_count && ops->get_strings)

		return ops->get_sset_count(dev, sset);

	else
@@ -223,7 +247,17 @@ static void __ethtool_get_strings(struct net_device *dev, 
		       sizeof(rss_hash_func_strings));

	else if (stringset == ETH_SS_TUNABLES)

		memcpy(data, tunable_strings, sizeof(tunable_strings));

	else

	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

		/* ops->get_strings is valid because checked earlier */

		ops->get_strings(dev, stringset, data);

}
@@ -1401,6 +1435,47 @@ static int ethtool_get_stats(struct net_device *dev, void __user *useraddr) 
	return ret;

}



static int ethtool_get_phy_stats(struct net_device *dev, void __user *useraddr)

{

	struct ethtool_stats stats;

	struct phy_device *phydev = dev->phydev;

	u64 *data;

	int ret, n_stats;



	if (!phydev)

		return -EOPNOTSUPP;



	n_stats = phy_get_sset_count(phydev);



	if (n_stats < 0)

		return n_stats;

	WARN_ON(n_stats == 0);



	if (copy_from_user(&stats, useraddr, sizeof(stats)))

		return -EFAULT;



	stats.n_stats = n_stats;

	data = kmalloc_array(n_stats, sizeof(u64), GFP_USER);

	if (!data)

		return -ENOMEM;



	mutex_lock(&phydev->lock);

	phydev->drv->get_stats(phydev, &stats, data);

	mutex_unlock(&phydev->lock);



	ret = -EFAULT;

	if (copy_to_user(useraddr, &stats, sizeof(stats)))

		goto out;

	useraddr += sizeof(stats);

	if (copy_to_user(useraddr, data, stats.n_stats * sizeof(u64)))

		goto out;

	ret = 0;



 out:

	kfree(data);

	return ret;

}



static int ethtool_get_perm_addr(struct net_device *dev, void __user *useraddr)

{

	struct ethtool_perm_addr epaddr;
@@ -1779,6 +1854,7 @@ int dev_ethtool(struct net *net, struct ifreq *ifr) 
	case ETHTOOL_GSSET_INFO:

	case ETHTOOL_GSTRINGS:

	case ETHTOOL_GSTATS:

	case ETHTOOL_GPHYSTATS:

	case ETHTOOL_GTSO:

	case ETHTOOL_GPERMADDR:

	case ETHTOOL_GUFO:
@@ -1991,6 +2067,9 @@ int dev_ethtool(struct net *net, struct ifreq *ifr) 
	case ETHTOOL_STUNABLE:

		rc = ethtool_set_tunable(dev, useraddr);

		break;

	case ETHTOOL_GPHYSTATS:

		rc = ethtool_get_phy_stats(dev, useraddr);

		break;

	default:

		rc = -EOPNOTSUPP;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE