Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA37DC43381 for ; Sun, 31 Mar 2019 15:42:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 848A820870 for ; Sun, 31 Mar 2019 15:42:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="YU0HhNP1" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731233AbfCaPmi (ORCPT ); Sun, 31 Mar 2019 11:42:38 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:46818 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731162AbfCaPmi (ORCPT ); Sun, 31 Mar 2019 11:42:38 -0400 Received: by mail-wr1-f68.google.com with SMTP id t17so8605929wrw.13 for ; Sun, 31 Mar 2019 08:42:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:subject:to:cc:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=AOlY84yOOSrm1l4hmJjs9teLeuVCMOJMMTnFGHJvpnc=; b=YU0HhNP1z2OFJFJv3bdgEjckQABnIPwCtRxEOrvOE95NLUb5jTr1pEpki+otwBnNBf n4Z0++gcTIRkCxaqx+CDxpSbmSsoGxKC4I8GMBvgtyFUBKclTQRLPex2x04lrSN+jI/e EJ3rFQ+YV5TUv7q9OF7vpR/JBdSiaZjyPARjh6VYaDbtnAvsnPJfJKH2TaXT+HmB+mWd G3fSuSzS+Gox7KqjZdlnfARwKcc3X4Eu3FRnZdIxgQPWn5KgD8tQgNoXUZgxaw5A5gNH FzRIglmxmwmZPHiRmXm8KIUWwaKyOAcJAEsaptUV/cSieScy2Sikl4zXNk3V02EyMkTW 3jYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:cc:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=AOlY84yOOSrm1l4hmJjs9teLeuVCMOJMMTnFGHJvpnc=; b=V7W1wHYDdYXksQOcKBIfnFj/utI2gS0J4q1yuf6JJ82IF1Y1Z63w6UFqK+Tykifamq 03Kx7xgCK+zDfKouKDHDYkYtFI3uz1UwwTh/67y3+LGw6I+vISYf3TQTBTCVzJpD4nom PdP/fTOnzmqjFTDrITYM5MQBztEtMQCNrOcdlfo/1Awwl+VyEw3xW7OuazBEOMyzcAqG kN3FL71F/JcJlC6Q6eW1Xx9qOxBGi2O8ukXRev1x1xqKdD5wJDPKnm+Q+ZNdoc07HBRN MbmmQoE2ckCpagkkyjN2BjItg1hVrJMtRX8L+lXsn092ByDUuXfMENd6gIPvbFl18Tft 22qw== X-Gm-Message-State: APjAAAVNUa7+YPxJuprrDO9nPbu+uTLnb/kUawrq3B+TqxX8T34J2Cm4 5Qa1tzzJHZVJ3fsOpqkdySekR40E X-Google-Smtp-Source: APXvYqy5PYzPa2Va7HVNVjaC4S+a4BEwPgXadhvNbl2Abm2scP1Xpn6M2g/UZakIS6U2DOiBcuDYLw== X-Received: by 2002:a5d:4843:: with SMTP id n3mr37740812wrs.256.1554046955369; Sun, 31 Mar 2019 08:42:35 -0700 (PDT) Received: from ?IPv6:2003:ea:8be1:dd00:a4e7:3af3:db88:50bb? (p200300EA8BE1DD00A4E73AF3DB8850BB.dip0.t-ipconnect.de. [2003:ea:8be1:dd00:a4e7:3af3:db88:50bb]) by smtp.googlemail.com with ESMTPSA id h2sm17281402wro.11.2019.03.31.08.42.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 31 Mar 2019 08:42:34 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH v2 net-next] net: phy: aquantia: add SGMII statistics To: Andrew Lunn , Florian Fainelli , David Miller Cc: "netdev@vger.kernel.org" Message-ID: <5ea225fe-a1ca-b25c-4914-6865015d5754@gmail.com> Date: Sun, 31 Mar 2019 17:42:24 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The AQR107 family has SGMII statistics counters. Let's expose them to ethtool. To interpret the counters correctly one has to be aware that rx on SGMII side is tx on ethernet side. The counters are populated by the chip in 100Mbps/1Gbps mode only. v2: - add constant AQR107_SGMII_STAT_SZ - add struct aqr107_priv to be prepared for more private data fields - let aqr107_get_stat() return U64_MAX in case of an error Signed-off-by: Heiner Kallweit --- drivers/net/phy/aquantia_main.c | 114 +++++++++++++++++++++++++++++++- 1 file changed, 112 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/aquantia_main.c b/drivers/net/phy/aquantia_main.c index be5204a1f..b7133c3f7 100644 --- a/drivers/net/phy/aquantia_main.c +++ b/drivers/net/phy/aquantia_main.c @@ -69,6 +69,18 @@ #define MDIO_AN_RX_VEND_STAT3 0xe832 #define MDIO_AN_RX_VEND_STAT3_AFR BIT(0) +/* MDIO_MMD_C22EXT */ +#define MDIO_C22EXT_STAT_SGMII_RX_GOOD_FRAMES 0xd292 +#define MDIO_C22EXT_STAT_SGMII_RX_BAD_FRAMES 0xd294 +#define MDIO_C22EXT_STAT_SGMII_RX_FALSE_CARRIER 0xd297 +#define MDIO_C22EXT_STAT_SGMII_TX_GOOD_FRAMES 0xd313 +#define MDIO_C22EXT_STAT_SGMII_TX_BAD_FRAMES 0xd315 +#define MDIO_C22EXT_STAT_SGMII_TX_FALSE_CARRIER 0xd317 +#define MDIO_C22EXT_STAT_SGMII_TX_COLLISIONS 0xd318 +#define MDIO_C22EXT_STAT_SGMII_TX_LINE_COLLISIONS 0xd319 +#define MDIO_C22EXT_STAT_SGMII_TX_FRAME_ALIGN_ERR 0xd31a +#define MDIO_C22EXT_STAT_SGMII_TX_RUNT_FRAMES 0xd31b + /* Vendor specific 1, MDIO_MMD_VEND1 */ #define VEND1_GLOBAL_FW_ID 0x0020 #define VEND1_GLOBAL_FW_ID_MAJOR GENMASK(15, 8) @@ -108,6 +120,88 @@ #define VEND1_GLOBAL_INT_VEND_MASK_GLOBAL2 BIT(1) #define VEND1_GLOBAL_INT_VEND_MASK_GLOBAL3 BIT(0) +struct aqr107_hw_stat { + const char *name; + int reg; + int size; +}; + +#define SGMII_STAT(n, r, s) { n, MDIO_C22EXT_STAT_SGMII_ ## r, s } +static const struct aqr107_hw_stat aqr107_hw_stats[] = { + SGMII_STAT("sgmii_rx_good_frames", RX_GOOD_FRAMES, 26), + SGMII_STAT("sgmii_rx_bad_frames", RX_BAD_FRAMES, 26), + SGMII_STAT("sgmii_rx_false_carrier_events", RX_FALSE_CARRIER, 8), + SGMII_STAT("sgmii_tx_good_frames", TX_GOOD_FRAMES, 26), + SGMII_STAT("sgmii_tx_bad_frames", TX_BAD_FRAMES, 26), + SGMII_STAT("sgmii_tx_false_carrier_events", TX_FALSE_CARRIER, 8), + SGMII_STAT("sgmii_tx_collisions", TX_COLLISIONS, 8), + SGMII_STAT("sgmii_tx_line_collisions", TX_LINE_COLLISIONS, 8), + SGMII_STAT("sgmii_tx_frame_alignment_err", TX_FRAME_ALIGN_ERR, 16), + SGMII_STAT("sgmii_tx_runt_frames", TX_RUNT_FRAMES, 22), +}; +#define AQR107_SGMII_STAT_SZ ARRAY_SIZE(aqr107_hw_stats) + +struct aqr107_priv { + u64 sgmii_stats[AQR107_SGMII_STAT_SZ]; +}; + +static int aqr107_get_sset_count(struct phy_device *phydev) +{ + return AQR107_SGMII_STAT_SZ; +} + +static void aqr107_get_strings(struct phy_device *phydev, u8 *data) +{ + int i; + + for (i = 0; i < AQR107_SGMII_STAT_SZ; i++) + strscpy(data + i * ETH_GSTRING_LEN, aqr107_hw_stats[i].name, + ETH_GSTRING_LEN); +} + +static u64 aqr107_get_stat(struct phy_device *phydev, int index) +{ + const struct aqr107_hw_stat *stat = aqr107_hw_stats + index; + int len_l = min(stat->size, 16); + int len_h = stat->size - len_l; + u64 ret; + int val; + + val = phy_read_mmd(phydev, MDIO_MMD_C22EXT, stat->reg); + if (val < 0) + return U64_MAX; + + ret = val & GENMASK(len_l - 1, 0); + if (len_h) { + val = phy_read_mmd(phydev, MDIO_MMD_C22EXT, stat->reg + 1); + if (val < 0) + return U64_MAX; + + ret += (val & GENMASK(len_h - 1, 0)) << 16; + } + + return ret; +} + +static void aqr107_get_stats(struct phy_device *phydev, + struct ethtool_stats *stats, u64 *data) +{ + struct aqr107_priv *priv = phydev->priv; + u64 val; + int i; + + for (i = 0; i < AQR107_SGMII_STAT_SZ; i++) { + val = aqr107_get_stat(phydev, i); + if (val == U64_MAX) + phydev_err(phydev, "Reading HW Statistics failed for %s\n", + aqr107_hw_stats[i].name); + else + priv->sgmii_stats[i] += val; + + data[i] = priv->sgmii_stats[i]; + } +} + static int aqr_config_aneg(struct phy_device *phydev) { bool changed = false; @@ -490,6 +584,16 @@ static int aqr107_resume(struct phy_device *phydev) MDIO_CTRL1_LPOWER); } +static int aqr107_probe(struct phy_device *phydev) +{ + phydev->priv = devm_kzalloc(&phydev->mdio.dev, + sizeof(struct aqr107_priv), GFP_KERNEL); + if (!phydev->priv) + return -ENOMEM; + + return aqr_hwmon_probe(phydev); +} + static struct phy_driver aqr_driver[] = { { PHY_ID_MATCH_MODEL(PHY_ID_AQ1202), @@ -536,7 +640,7 @@ static struct phy_driver aqr_driver[] = { .name = "Aquantia AQR107", .aneg_done = genphy_c45_aneg_done, .get_features = genphy_c45_pma_read_abilities, - .probe = aqr_hwmon_probe, + .probe = aqr107_probe, .config_init = aqr107_config_init, .config_aneg = aqr_config_aneg, .config_intr = aqr_config_intr, @@ -546,6 +650,9 @@ static struct phy_driver aqr_driver[] = { .set_tunable = aqr107_set_tunable, .suspend = aqr107_suspend, .resume = aqr107_resume, + .get_sset_count = aqr107_get_sset_count, + .get_strings = aqr107_get_strings, + .get_stats = aqr107_get_stats, .link_change_notify = aqr107_link_change_notify, }, { @@ -553,7 +660,7 @@ static struct phy_driver aqr_driver[] = { .name = "Aquantia AQCS109", .aneg_done = genphy_c45_aneg_done, .get_features = genphy_c45_pma_read_abilities, - .probe = aqr_hwmon_probe, + .probe = aqr107_probe, .config_init = aqcs109_config_init, .config_aneg = aqr_config_aneg, .config_intr = aqr_config_intr, @@ -563,6 +670,9 @@ static struct phy_driver aqr_driver[] = { .set_tunable = aqr107_set_tunable, .suspend = aqr107_suspend, .resume = aqr107_resume, + .get_sset_count = aqr107_get_sset_count, + .get_strings = aqr107_get_strings, + .get_stats = aqr107_get_stats, .link_change_notify = aqr107_link_change_notify, }, { -- 2.21.0