devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Alexandru Ardelean <alexandru.ardelean@analog.com>
To: netdev@vger.kernel.org, devicetree@vger.kernel.org,
	linux-kernel@vger.kernel.org
Cc: davem@davemloft.net, robh+dt@kernel.org, mark.rutland@arm.com,
	f.fainelli@gmail.com, hkallweit1@gmail.com, andrew@lunn.ch,
	Alexandru Ardelean <alexandru.ardelean@analog.com>
Subject: [PATCH v2 14/15] net: phy: adin: add ethtool get_stats support
Date: Thu, 8 Aug 2019 15:30:25 +0300	[thread overview]
Message-ID: <20190808123026.17382-15-alexandru.ardelean@analog.com> (raw)
In-Reply-To: <20190808123026.17382-1-alexandru.ardelean@analog.com>

This change implements retrieving all the error counters from the PHY.
The PHY supports several error counters/stats. The `Mean Square Errors`
status values are only valie when a link is established, and shouldn't be
accumulated. These values characterize the quality of a signal.

The rest of the error counters are self-clearing on read.
Most of them are reports from the Frame Checker engine that the PHY has.

Not retrieving the `LPI Wake Error Count Register` here, since that is used
by the PHY framework to check for any EEE errors. And that register is
self-clearing when read (as per IEEE spec).

Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
---
 drivers/net/phy/adin.c | 109 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 109 insertions(+)

diff --git a/drivers/net/phy/adin.c b/drivers/net/phy/adin.c
index d6d1f5037eb7..d170d1e837b5 100644
--- a/drivers/net/phy/adin.c
+++ b/drivers/net/phy/adin.c
@@ -155,12 +155,40 @@ static struct adin_clause45_mmd_map adin_clause45_mmd_map[] = {
 	{ MDIO_MMD_PCS, MDIO_PCS_EEE_WK_ERR,	ADIN1300_LPI_WAKE_ERR_CNT_REG },
 };
 
+struct adin_hw_stat {
+	const char *string;
+	u16 reg1;
+	u16 reg2;
+	bool do_not_accumulate;
+};
+
+/* Named just like in the datasheet */
+static struct adin_hw_stat adin_hw_stats[] = {
+	{ "RxErrCnt",		0x0014,	},
+	{ "MseA",		0x8402,	0,	true },
+	{ "MseB",		0x8403,	0,	true },
+	{ "MseC",		0x8404,	0,	true },
+	{ "MseD",		0x8405,	0,	true },
+	{ "FcFrmCnt",		0x940A, 0x940B }, /* FcFrmCntH + FcFrmCntL */
+	{ "FcLenErrCnt",	0x940C },
+	{ "FcAlgnErrCnt",	0x940D },
+	{ "FcSymbErrCnt",	0x940E },
+	{ "FcOszCnt",		0x940F },
+	{ "FcUszCnt",		0x9410 },
+	{ "FcOddCnt",		0x9411 },
+	{ "FcOddPreCnt",	0x9412 },
+	{ "FcDribbleBitsCnt",	0x9413 },
+	{ "FcFalseCarrierCnt",	0x9414 },
+};
+
 /**
  * struct adin_priv - ADIN PHY driver private data
  * edpd_enabled		true if Energy Detect Powerdown mode is enabled
+ * stats		statistic counters for the PHY
  */
 struct adin_priv {
 	bool			edpd_enabled;
+	u64			stats[ARRAY_SIZE(adin_hw_stats)];
 };
 
 static int adin_lookup_reg_value(const struct adin_cfg_reg_map *tbl, int cfg)
@@ -561,6 +589,81 @@ static int adin_reset(struct phy_device *phydev)
 	return adin_subsytem_soft_reset(phydev);
 }
 
+static int adin_get_sset_count(struct phy_device *phydev)
+{
+	return ARRAY_SIZE(adin_hw_stats);
+}
+
+static void adin_get_strings(struct phy_device *phydev, u8 *data)
+{
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(adin_hw_stats); i++) {
+		strlcpy(&data[i * ETH_GSTRING_LEN],
+			adin_hw_stats[i].string, ETH_GSTRING_LEN);
+	}
+}
+
+static int adin_read_mmd_stat_regs(struct phy_device *phydev,
+				   struct adin_hw_stat *stat,
+				   u32 *val)
+{
+	int ret;
+
+	ret = phy_read_mmd(phydev, MDIO_MMD_VEND1, stat->reg1);
+	if (ret < 0)
+		return ret;
+
+	*val = (ret & 0xffff);
+
+	if (stat->reg2 == 0)
+		return 0;
+
+	ret = phy_read_mmd(phydev, MDIO_MMD_VEND1, stat->reg2);
+	if (ret < 0)
+		return ret;
+
+	*val <<= 16;
+	*val |= (ret & 0xffff);
+
+	return 0;
+}
+
+static u64 adin_get_stat(struct phy_device *phydev, int i)
+{
+	struct adin_hw_stat *stat = &adin_hw_stats[i];
+	struct adin_priv *priv = phydev->priv;
+	u32 val;
+	int ret;
+
+	if (stat->reg1 > 0x1f) {
+		ret = adin_read_mmd_stat_regs(phydev, stat, &val);
+		if (ret < 0)
+			return (u64)(~0);
+	} else {
+		ret = phy_read(phydev, stat->reg1);
+		if (ret < 0)
+			return (u64)(~0);
+		val = (ret & 0xffff);
+	}
+
+	if (stat->do_not_accumulate)
+		priv->stats[i] = val;
+	else
+		priv->stats[i] += val;
+
+	return priv->stats[i];
+}
+
+static void adin_get_stats(struct phy_device *phydev,
+			   struct ethtool_stats *stats, u64 *data)
+{
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(adin_hw_stats); i++)
+		data[i] = adin_get_stat(phydev, i);
+}
+
 static int adin_probe(struct phy_device *phydev)
 {
 	struct device *dev = &phydev->mdio.dev;
@@ -588,6 +691,9 @@ static struct phy_driver adin_driver[] = {
 		.get_features	= genphy_read_abilities,
 		.ack_interrupt	= adin_phy_ack_intr,
 		.config_intr	= adin_phy_config_intr,
+		.get_sset_count	= adin_get_sset_count,
+		.get_strings	= adin_get_strings,
+		.get_stats	= adin_get_stats,
 		.resume		= genphy_resume,
 		.suspend	= genphy_suspend,
 		.read_mmd	= adin_read_mmd,
@@ -603,6 +709,9 @@ static struct phy_driver adin_driver[] = {
 		.get_features	= genphy_read_abilities,
 		.ack_interrupt	= adin_phy_ack_intr,
 		.config_intr	= adin_phy_config_intr,
+		.get_sset_count	= adin_get_sset_count,
+		.get_strings	= adin_get_strings,
+		.get_stats	= adin_get_stats,
 		.resume		= genphy_resume,
 		.suspend	= genphy_suspend,
 		.read_mmd	= adin_read_mmd,
-- 
2.20.1

  parent reply	other threads:[~2019-08-08 12:30 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-08 12:30 [PATCH v2 00/15] net: phy: adin: add support for Analog Devices PHYs Alexandru Ardelean
2019-08-08 12:30 ` [PATCH v2 01/15] " Alexandru Ardelean
2019-08-08 15:13   ` Andrew Lunn
2019-08-08 12:30 ` [PATCH v2 02/15] net: phy: adin: hook genphy_read_abilities() to get_features Alexandru Ardelean
2019-08-08 15:24   ` Andrew Lunn
2019-08-08 19:32     ` Heiner Kallweit
2019-08-09 12:00       ` Ardelean, Alexandru
2019-08-08 12:30 ` [PATCH v2 03/15] net: phy: adin: hook genphy_{suspend,resume} into the driver Alexandru Ardelean
2019-08-08 15:24   ` Andrew Lunn
2019-08-08 12:30 ` [PATCH v2 04/15] net: phy: adin: add support for interrupts Alexandru Ardelean
2019-08-08 15:25   ` Andrew Lunn
2019-08-08 12:30 ` [PATCH v2 05/15] net: phy: adin: add {write,read}_mmd hooks Alexandru Ardelean
2019-08-08 15:35   ` Andrew Lunn
2019-08-09 12:05     ` Ardelean, Alexandru
2019-08-08 12:30 ` [PATCH v2 06/15] net: phy: adin: configure RGMII/RMII/MII modes on config Alexandru Ardelean
2019-08-08 15:38   ` Andrew Lunn
2019-08-08 12:30 ` [PATCH v2 07/15] net: phy: adin: make RGMII internal delays configurable Alexandru Ardelean
2019-08-08 15:40   ` Andrew Lunn
2019-08-08 12:30 ` [PATCH v2 08/15] net: phy: adin: make RMII fifo depth configurable Alexandru Ardelean
2019-08-08 15:42   ` Andrew Lunn
2019-08-08 12:30 ` [PATCH v2 09/15] net: phy: adin: add support MDI/MDIX/Auto-MDI selection Alexandru Ardelean
2019-08-08 12:30 ` [PATCH v2 10/15] net: phy: adin: add EEE translation layer from Clause 45 to Clause 22 Alexandru Ardelean
2019-08-08 12:30 ` [PATCH v2 11/15] net: phy: adin: implement PHY subsystem software reset Alexandru Ardelean
2019-08-08 12:30 ` [PATCH v2 12/15] net: phy: adin: implement Energy Detect Powerdown mode Alexandru Ardelean
2019-08-08 12:30 ` [PATCH v2 13/15] net: phy: adin: configure downshift on config_init Alexandru Ardelean
2019-08-08 19:38   ` Heiner Kallweit
2019-08-08 20:39     ` Andrew Lunn
2019-08-09 12:06       ` Ardelean, Alexandru
2019-08-08 12:30 ` Alexandru Ardelean [this message]
2019-08-08 12:30 ` [PATCH v2 15/15] dt-bindings: net: add bindings for ADIN PHY driver Alexandru Ardelean
2019-08-08 23:03   ` Rob Herring
2019-08-09 12:06     ` Ardelean, Alexandru
2019-08-08 18:24 ` [PATCH v2 00/15] net: phy: adin: add support for Analog Devices PHYs David Miller
2019-08-09 12:32   ` Ardelean, Alexandru

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190808123026.17382-15-alexandru.ardelean@analog.com \
    --to=alexandru.ardelean@analog.com \
    --cc=andrew@lunn.ch \
    --cc=davem@davemloft.net \
    --cc=devicetree@vger.kernel.org \
    --cc=f.fainelli@gmail.com \
    --cc=hkallweit1@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=netdev@vger.kernel.org \
    --cc=robh+dt@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).