net: phy: icplus: add PHY counter for IP101G

The IP101G provides three counters: RX packets, CRC errors and symbol
errors. The error counters can be configured to clear automatically on
read. Unfortunately, this isn't true for the RX packet counter. Because
of this and because the RX packet counter is more likely to overflow,
than the error counters implement only support for the error counters.

Signed-off-by: Michael Walle <michael@walle.cc>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/icplus.c b/drivers/net/phy/icplus.c
index f98edd6..41bd0fa 100644 (file)
--- a/drivers/net/phy/icplus.c
+++ b/drivers/net/phy/icplus.c
@@ -51,6 +51,12 @@ MODULE_LICENSE("GPL");
 
 #define IP101G_DEFAULT_PAGE                    16
 
+#define IP101G_P1_CNT_CTRL             17
+#define CNT_CTRL_RX_EN                 BIT(13)
+#define IP101G_P8_CNT_CTRL             17
+#define CNT_CTRL_RDCLR_EN              BIT(15)
+#define IP101G_CNT_REG                 18
+
 #define IP175C_PHY_ID 0x02430d80
 #define IP1001_PHY_ID 0x02430d90
 #define IP101A_PHY_ID 0x02430c54
@@ -65,8 +71,19 @@ enum ip101gr_sel_intr32 {
        IP101GR_SEL_INTR32_RXER,
 };
 
+struct ip101g_hw_stat {
+       const char *name;
+       int page;
+};
+
+static struct ip101g_hw_stat ip101g_hw_stats[] = {
+       { "phy_crc_errors", 1 },
+       { "phy_symbol_errors", 11, },
+};
+
 struct ip101a_g_phy_priv {
        enum ip101gr_sel_intr32 sel_intr32;
+       u64 stats[ARRAY_SIZE(ip101g_hw_stats)];
 };
 
 static int ip175c_config_init(struct phy_device *phydev)
@@ -265,6 +282,20 @@ static int ip101a_config_init(struct phy_device *phydev)
 
 static int ip101g_config_init(struct phy_device *phydev)
 {
+       int ret;
+
+       /* Enable the PHY counters */
+       ret = phy_modify_paged(phydev, 1, IP101G_P1_CNT_CTRL,
+                              CNT_CTRL_RX_EN, CNT_CTRL_RX_EN);
+       if (ret)
+               return ret;
+
+       /* Clear error counters on read */
+       ret = phy_modify_paged(phydev, 8, IP101G_P8_CNT_CTRL,
+                              CNT_CTRL_RDCLR_EN, CNT_CTRL_RDCLR_EN);
+       if (ret)
+               return ret;
+
        return ip101a_g_config_intr_pin(phydev);
 }
 
@@ -405,6 +436,47 @@ static int ip101g_match_phy_device(struct phy_device *phydev)
        return ip101a_g_match_phy_device(phydev, false);
 }
 
+static int ip101g_get_sset_count(struct phy_device *phydev)
+{
+       return ARRAY_SIZE(ip101g_hw_stats);
+}
+
+static void ip101g_get_strings(struct phy_device *phydev, u8 *data)
+{
+       int i;
+
+       for (i = 0; i < ARRAY_SIZE(ip101g_hw_stats); i++)
+               strscpy(data + i * ETH_GSTRING_LEN,
+                       ip101g_hw_stats[i].name, ETH_GSTRING_LEN);
+}
+
+static u64 ip101g_get_stat(struct phy_device *phydev, int i)
+{
+       struct ip101g_hw_stat stat = ip101g_hw_stats[i];
+       struct ip101a_g_phy_priv *priv = phydev->priv;
+       int val;
+       u64 ret;
+
+       val = phy_read_paged(phydev, stat.page, IP101G_CNT_REG);
+       if (val < 0) {
+               ret = U64_MAX;
+       } else {
+               priv->stats[i] += val;
+               ret = priv->stats[i];
+       }
+
+       return ret;
+}
+
+static void ip101g_get_stats(struct phy_device *phydev,
+                            struct ethtool_stats *stats, u64 *data)
+{
+       int i;
+
+       for (i = 0; i < ARRAY_SIZE(ip101g_hw_stats); i++)
+               data[i] = ip101g_get_stat(phydev, i);
+}
+
 static struct phy_driver icplus_driver[] = {
 {
        PHY_ID_MATCH_MODEL(IP175C_PHY_ID),
@@ -445,6 +517,9 @@ static struct phy_driver icplus_driver[] = {
        .handle_interrupt = ip101a_g_handle_interrupt,
        .config_init    = ip101g_config_init,
        .soft_reset     = genphy_soft_reset,
+       .get_sset_count = ip101g_get_sset_count,
+       .get_strings    = ip101g_get_strings,
+       .get_stats      = ip101g_get_stats,
        .suspend        = genphy_suspend,
        .resume         = genphy_resume,
 } };