From nobody Tue Dec 30 17:09:01 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3E19EC4332F for ; Tue, 14 Nov 2023 09:08:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232514AbjKNJId (ORCPT ); Tue, 14 Nov 2023 04:08:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60560 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232519AbjKNJI1 (ORCPT ); Tue, 14 Nov 2023 04:08:27 -0500 Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D26A7D72; Tue, 14 Nov 2023 01:08:21 -0800 (PST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 87161C0018; Tue, 14 Nov 2023 09:08:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1699952900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AuuOCKjlqLcnvt3M5sD79QPuk+XlpLSx15DuBOECLAE=; b=BK2RXlYsmKdayp6U8Qutdtk4/Bah2kEhFKbP0xWe05piExxAsB3DMW1svMETHT8ahi0N7h VkMt/1/Z6H5rGC7LDILz+/Nr1KLxJmdjcdSAmby/lmBfXxTEpBWmmU/DDPPNqRjO9U4knU Gu9rSRfMJdM60DGcpXCjsdsF+yIzsml9JNlgk0xPtVItbTkBvrhZQOtzXpSYTcGx+kP0qB Ptkyqt/nLNXRZqmLMDORB2BYlw2qz3GeJZIwRzobVMI4+QZCqPcteJvlMjLKJhVDumLSEP VWEjFDaJ6ECtUH39WbWPqjKhQ1UtlXJDVIoqm+HKsIlsdwQ6HPHC1p4CAH+kDg== From: Romain Gantois To: davem@davemloft.net, Rob Herring , Krzysztof Kozlowski Cc: Romain Gantois , Jakub Kicinski , Eric Dumazet , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, thomas.petazzoni@bootlin.com, Andrew Lunn , Florian Fainelli , Heiner Kallweit , Russell King , linux-arm-kernel@lists.infradead.org, Vladimir Oltean , Luka Perkov , Robert Marko , Andy Gross , Bjorn Andersson , Konrad Dybcio Subject: [PATCH net-next v2 4/8] net: qualcomm: ipqess: Add Ethtool ops to IPQESS port netdevices Date: Tue, 14 Nov 2023 10:07:30 +0100 Message-ID: <20231114090743.865453-5-romain.gantois@bootlin.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231114090743.865453-1-romain.gantois@bootlin.com> References: <20231114090743.865453-1-romain.gantois@bootlin.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-GND-Sasl: romain.gantois@bootlin.com Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The IPQESS driver registers one netdevice for each front-facing switch port. Add support for several ethtool operations to these netdevices. Signed-off-by: Romain Gantois --- drivers/net/ethernet/qualcomm/ipqess/Makefile | 2 +- .../ethernet/qualcomm/ipqess/ipqess_ethtool.c | 245 ++++++++++++++++++ .../ethernet/qualcomm/ipqess/ipqess_port.c | 1 + .../ethernet/qualcomm/ipqess/ipqess_port.h | 3 + 4 files changed, 250 insertions(+), 1 deletion(-) create mode 100644 drivers/net/ethernet/qualcomm/ipqess/ipqess_ethtool.c diff --git a/drivers/net/ethernet/qualcomm/ipqess/Makefile b/drivers/net/et= hernet/qualcomm/ipqess/Makefile index f389080cc5aa..6253f1b0ffd2 100644 --- a/drivers/net/ethernet/qualcomm/ipqess/Makefile +++ b/drivers/net/ethernet/qualcomm/ipqess/Makefile @@ -5,4 +5,4 @@ =20 obj-$(CONFIG_QCOM_IPQ4019_ESS) +=3D ipqess.o =20 -ipqess-objs :=3D ipqess_port.o ipqess_switch.o ipqess_edma.o +ipqess-objs :=3D ipqess_port.o ipqess_switch.o ipqess_edma.o ipqess_ethtoo= l.o diff --git a/drivers/net/ethernet/qualcomm/ipqess/ipqess_ethtool.c b/driver= s/net/ethernet/qualcomm/ipqess/ipqess_ethtool.c new file mode 100644 index 000000000000..06a8f2cccc4e --- /dev/null +++ b/drivers/net/ethernet/qualcomm/ipqess/ipqess_ethtool.c @@ -0,0 +1,245 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Ethtool operations for a single switch port + * + * Copyright (c) 2023, Romain Gantois + * Based on net/dsa + */ + +#include + +#include "ipqess_port.h" + +static void ipqess_port_get_drvinfo(struct net_device *dev, + struct ethtool_drvinfo *drvinfo) +{ + strscpy(drvinfo->driver, "qca8k-ipqess", sizeof(drvinfo->driver)); + strscpy(drvinfo->bus_info, "platform", sizeof(drvinfo->bus_info)); +} + +static int ipqess_port_nway_reset(struct net_device *dev) +{ + struct ipqess_port *port =3D netdev_priv(dev); + + return phylink_ethtool_nway_reset(port->pl); +} + +static const char ipqess_gstrings_base_stats[][ETH_GSTRING_LEN] =3D { + "tx_packets", + "tx_bytes", + "rx_packets", + "rx_bytes", +}; + +static void ipqess_port_get_strings(struct net_device *dev, + u32 stringset, u8 *data) +{ + struct ipqess_port *port =3D netdev_priv(dev); + struct qca8k_priv *priv =3D port->sw->priv; + int i; + + if (stringset =3D=3D ETH_SS_STATS) { + memcpy(data, &ipqess_gstrings_base_stats, + sizeof(ipqess_gstrings_base_stats)); + + if (stringset !=3D ETH_SS_STATS) + return; + + for (i =3D 0; i < priv->info->mib_count; i++) + memcpy(data + (4 + i) * ETH_GSTRING_LEN, + ar8327_mib[i].name, + ETH_GSTRING_LEN); + + } else if (stringset =3D=3D ETH_SS_TEST) { + net_selftest_get_strings(data); + } +} + +static void ipqess_port_get_ethtool_stats(struct net_device *dev, + struct ethtool_stats *stats, + uint64_t *data) +{ + struct ipqess_port *port =3D netdev_priv(dev); + struct qca8k_priv *priv =3D port->sw->priv; + const struct qca8k_mib_desc *mib; + struct pcpu_sw_netstats *s; + unsigned int start; + u32 reg, c, val; + u32 hi =3D 0; + int ret; + int i; + + for_each_possible_cpu(i) { + u64 tx_packets, tx_bytes, rx_packets, rx_bytes; + + s =3D per_cpu_ptr(dev->tstats, i); + do { + start =3D u64_stats_fetch_begin(&s->syncp); + tx_packets =3D u64_stats_read(&s->tx_packets); + tx_bytes =3D u64_stats_read(&s->tx_bytes); + rx_packets =3D u64_stats_read(&s->rx_packets); + rx_bytes =3D u64_stats_read(&s->rx_bytes); + } while (u64_stats_fetch_retry(&s->syncp, start)); + data[0] +=3D tx_packets; + data[1] +=3D tx_bytes; + data[2] +=3D rx_packets; + data[3] +=3D rx_bytes; + } + + for (c =3D 0; c < priv->info->mib_count; c++) { + mib =3D &ar8327_mib[c]; + reg =3D QCA8K_PORT_MIB_COUNTER(port->index) + mib->offset; + + ret =3D qca8k_read(priv, reg, &val); + if (ret < 0) + continue; + + if (mib->size =3D=3D 2) { + ret =3D qca8k_read(priv, reg + 4, &hi); + if (ret < 0) + continue; + } + + data[4 + c] =3D val; + if (mib->size =3D=3D 2) + data[4 + c] |=3D (u64)hi << 32; + } +} + +static int ipqess_port_get_sset_count(struct net_device *dev, int sset) +{ + struct ipqess_port *port =3D netdev_priv(dev); + struct qca8k_priv *priv =3D port->sw->priv; + + if (sset =3D=3D ETH_SS_STATS) { + int count =3D 0; + + if (sset !=3D ETH_SS_STATS) + count =3D 0; + else + count =3D priv->info->mib_count; + + if (count < 0) + return count; + + return count + 4; + } else if (sset =3D=3D ETH_SS_TEST) { + return net_selftest_get_count(); + } + + return -EOPNOTSUPP; +} + +static int ipqess_port_set_wol(struct net_device *dev, + struct ethtool_wolinfo *w) +{ + struct ipqess_port *port =3D netdev_priv(dev); + + return phylink_ethtool_set_wol(port->pl, w); +} + +static void ipqess_port_get_wol(struct net_device *dev, + struct ethtool_wolinfo *w) +{ + struct ipqess_port *port =3D netdev_priv(dev); + + phylink_ethtool_get_wol(port->pl, w); +} + +static int ipqess_port_set_eee(struct net_device *dev, struct ethtool_eee = *eee) +{ + struct ipqess_port *port =3D netdev_priv(dev); + int ret; + u32 lpi_en =3D QCA8K_REG_EEE_CTRL_LPI_EN(port->index); + struct qca8k_priv *priv =3D port->sw->priv; + u32 lpi_ctl1; + + /* Port's PHY and MAC both need to be EEE capable */ + if (!dev->phydev || !port->pl) + return -ENODEV; + + mutex_lock(&priv->reg_mutex); + lpi_ctl1 =3D qca8k_read(priv, QCA8K_REG_EEE_CTRL, &lpi_ctl1); + if (lpi_ctl1 < 0) { + mutex_unlock(&priv->reg_mutex); + return ret; + } + + if (eee->tx_lpi_enabled && eee->eee_enabled) + lpi_ctl1 |=3D lpi_en; + else + lpi_ctl1 &=3D ~lpi_en; + ret =3D qca8k_write(priv, QCA8K_REG_EEE_CTRL, lpi_ctl1); + mutex_unlock(&priv->reg_mutex); + + if (ret) + return ret; + + return phylink_ethtool_set_eee(port->pl, eee); +} + +static int ipqess_port_get_eee(struct net_device *dev, struct ethtool_eee = *e) +{ + struct ipqess_port *port =3D netdev_priv(dev); + + /* Port's PHY and MAC both need to be EEE capable */ + if (!dev->phydev || !port->pl) + return -ENODEV; + + return phylink_ethtool_get_eee(port->pl, e); +} + +static int ipqess_port_get_link_ksettings(struct net_device *dev, + struct ethtool_link_ksettings *cmd) +{ + struct ipqess_port *port =3D netdev_priv(dev); + + return phylink_ethtool_ksettings_get(port->pl, cmd); +} + +static int ipqess_port_set_link_ksettings(struct net_device *dev, + const struct ethtool_link_ksettings *cmd) +{ + struct ipqess_port *port =3D netdev_priv(dev); + + return phylink_ethtool_ksettings_set(port->pl, cmd); +} + +static void ipqess_port_get_pauseparam(struct net_device *dev, + struct ethtool_pauseparam *pause) +{ + struct ipqess_port *port =3D netdev_priv(dev); + + phylink_ethtool_get_pauseparam(port->pl, pause); +} + +static int ipqess_port_set_pauseparam(struct net_device *dev, + struct ethtool_pauseparam *pause) +{ + struct ipqess_port *port =3D netdev_priv(dev); + + return phylink_ethtool_set_pauseparam(port->pl, pause); +} + +static const struct ethtool_ops ipqess_port_ethtool_ops =3D { + .get_drvinfo =3D ipqess_port_get_drvinfo, + .nway_reset =3D ipqess_port_nway_reset, + .get_link =3D ethtool_op_get_link, + .get_strings =3D ipqess_port_get_strings, + .get_ethtool_stats =3D ipqess_port_get_ethtool_stats, + .get_sset_count =3D ipqess_port_get_sset_count, + .self_test =3D net_selftest, + .set_wol =3D ipqess_port_set_wol, + .get_wol =3D ipqess_port_get_wol, + .set_eee =3D ipqess_port_set_eee, + .get_eee =3D ipqess_port_get_eee, + .get_link_ksettings =3D ipqess_port_get_link_ksettings, + .set_link_ksettings =3D ipqess_port_set_link_ksettings, + .get_pauseparam =3D ipqess_port_get_pauseparam, + .set_pauseparam =3D ipqess_port_set_pauseparam, +}; + +void ipqess_port_set_ethtool_ops(struct net_device *netdev) +{ + netdev->ethtool_ops =3D &ipqess_port_ethtool_ops; +} diff --git a/drivers/net/ethernet/qualcomm/ipqess/ipqess_port.c b/drivers/n= et/ethernet/qualcomm/ipqess/ipqess_port.c index f0f5fe3a7c24..52d7baa7cae0 100644 --- a/drivers/net/ethernet/qualcomm/ipqess/ipqess_port.c +++ b/drivers/net/ethernet/qualcomm/ipqess/ipqess_port.c @@ -684,6 +684,7 @@ int ipqess_port_register(struct ipqess_switch *sw, netdev->dev.of_node =3D port->dn; =20 netdev->rtnl_link_ops =3D &ipqess_port_link_ops; + ipqess_port_set_ethtool_ops(netdev); =20 netdev->tstats =3D netdev_alloc_pcpu_stats(struct pcpu_sw_netstats); if (!netdev->tstats) { diff --git a/drivers/net/ethernet/qualcomm/ipqess/ipqess_port.h b/drivers/n= et/ethernet/qualcomm/ipqess/ipqess_port.h index 26bac45dd811..19d4b5d73625 100644 --- a/drivers/net/ethernet/qualcomm/ipqess/ipqess_port.h +++ b/drivers/net/ethernet/qualcomm/ipqess/ipqess_port.h @@ -59,4 +59,7 @@ int ipqess_port_register(struct ipqess_switch *sw, struct device_node *port_node); void ipqess_port_unregister(struct ipqess_port *port); =20 +/* Defined in ipqess_ethtool.c */ +void ipqess_port_set_ethtool_ops(struct net_device *netdev); + #endif --=20 2.42.0