From nobody Wed Dec 31 00:35:50 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 A24F9C4332F for ; Mon, 13 Nov 2023 11:07:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229892AbjKMLH0 (ORCPT ); Mon, 13 Nov 2023 06:07:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43642 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229470AbjKMLHX (ORCPT ); Mon, 13 Nov 2023 06:07:23 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 33EE310D0 for ; Mon, 13 Nov 2023 03:07:20 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 370A5C433CB; Mon, 13 Nov 2023 11:07:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699873639; bh=bN8FSN+y+03IPg4F931v2Jh6hFvo4bxNhLJa8WipQWM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PdvLOAOaU/wKIWKM1KxY60RwmGDSq1UXZlrBO3HC4IGqOiJrf7pMfcljXSe+AuLJc w9GU6NHQ2GFP50pewNlBiUM5VAnN6978gVSWzMQJpwUDqdNkS8i2FqbfajpFL+Bv1e 6W/2gJ2RpEjSoOt0M4uRgkToGDdE1wR4qGqhUWDI7GupWKNnSsN7aH/OincREAtWsx nycnYtSH7HNGIa4Ad00Ic6jM8irxC8lN3hq13l0OBDlfrzuYhLSM4pJ7VgTUpyJfG8 GimYD5hj6wXP6UoNDnpUhyMXrKJFQtL7swsCy+VrIfU7ufZaFSoiyHj8GYHBgzo7Fv 29q1iwDuN68jA== From: Roger Quadros To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: vladimir.oltean@nxp.com, s-vadapalli@ti.com, r-gunasekaran@ti.com, srk@ti.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Roger Quadros Subject: [PATCH net-next 1/3] net: ethernet: am65-cpsw: Add standard Ethernet MAC stats to ethtool Date: Mon, 13 Nov 2023 13:07:06 +0200 Message-Id: <20231113110708.137379-2-rogerq@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231113110708.137379-1-rogerq@kernel.org> References: <20231113110708.137379-1-rogerq@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Gets 'ethtool -S eth0 --groups eth-mac' command to work. Signed-off-by: Roger Quadros Reviewed-by: Andrew Lunn --- drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 26 +++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/drivers/net/ethernet/ti/am65-cpsw-ethtool.c b/drivers/net/ethe= rnet/ti/am65-cpsw-ethtool.c index c51e2af91f69..ac7276f0f77a 100644 --- a/drivers/net/ethernet/ti/am65-cpsw-ethtool.c +++ b/drivers/net/ethernet/ti/am65-cpsw-ethtool.c @@ -662,6 +662,31 @@ static void am65_cpsw_get_ethtool_stats(struct net_dev= ice *ndev, hw_stats[i].offset); } =20 +static void am65_cpsw_get_eth_mac_stats(struct net_device *ndev, + struct ethtool_eth_mac_stats *s) +{ + struct am65_cpsw_port *port =3D am65_ndev_to_port(ndev); + struct am65_cpsw_stats_regs *stats; + + stats =3D port->stat_base; + + s->FramesTransmittedOK =3D readl_relaxed(&stats->tx_good_frames); + s->SingleCollisionFrames =3D readl_relaxed(&stats->tx_single_coll_frames); + s->MultipleCollisionFrames =3D readl_relaxed(&stats->tx_mult_coll_frames); + s->FramesReceivedOK =3D readl_relaxed(&stats->rx_good_frames); + s->FrameCheckSequenceErrors =3D readl_relaxed(&stats->rx_crc_errors); + s->AlignmentErrors =3D readl_relaxed(&stats->rx_align_code_errors); + s->OctetsTransmittedOK =3D readl_relaxed(&stats->tx_octets); + s->FramesWithDeferredXmissions =3D readl_relaxed(&stats->tx_deferred_fram= es); + s->LateCollisions =3D readl_relaxed(&stats->tx_late_collisions); + s->CarrierSenseErrors =3D readl_relaxed(&stats->tx_carrier_sense_errors); + s->OctetsReceivedOK =3D readl_relaxed(&stats->rx_octets); + s->MulticastFramesXmittedOK =3D readl_relaxed(&stats->tx_multicast_frames= ); + s->BroadcastFramesXmittedOK =3D readl_relaxed(&stats->tx_broadcast_frames= ); + s->MulticastFramesReceivedOK =3D readl_relaxed(&stats->rx_multicast_frame= s); + s->BroadcastFramesReceivedOK =3D readl_relaxed(&stats->rx_broadcast_frame= s); +}; + static int am65_cpsw_get_ethtool_ts_info(struct net_device *ndev, struct ethtool_ts_info *info) { @@ -729,6 +754,7 @@ const struct ethtool_ops am65_cpsw_ethtool_ops_slave = =3D { .get_sset_count =3D am65_cpsw_get_sset_count, .get_strings =3D am65_cpsw_get_strings, .get_ethtool_stats =3D am65_cpsw_get_ethtool_stats, + .get_eth_mac_stats =3D am65_cpsw_get_eth_mac_stats, .get_ts_info =3D am65_cpsw_get_ethtool_ts_info, .get_priv_flags =3D am65_cpsw_get_ethtool_priv_flags, .set_priv_flags =3D am65_cpsw_set_ethtool_priv_flags, --=20 2.34.1 From nobody Wed Dec 31 00:35:50 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 5CF94C4332F for ; Mon, 13 Nov 2023 11:07:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230117AbjKMLH3 (ORCPT ); Mon, 13 Nov 2023 06:07:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43704 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229889AbjKMLH0 (ORCPT ); Mon, 13 Nov 2023 06:07:26 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4C0F010D7 for ; Mon, 13 Nov 2023 03:07:23 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 58709C433C8; Mon, 13 Nov 2023 11:07:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699873643; bh=sHCRpYWlwN1++CWChUaVlOJq1vUhjh4oC5rKbeN65HU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UcVyKSsoOi4EGz1SVIaJoOdWkdYgJk+eGaUMj+OhwJibXvmBRYctyYYSwGm1ecXWS VeRffEN7ClWQZBmD1mfCZHzqS2wEHQGjHUh4FzGxxi9ebmRXRBVum/KCcwfjPb5AXe b7FyTWeVQXayqLvsOxk1e0p47dNGOIhislNZw8zZ8aeHULkHNw8U2BIhlFI4OLk/Wd wYAvUQ7x9YVvW59RgRmWdXhS2JwDBNRBvpPe8rKTcDxF60bDu+lUnVhaTKXt/JF1g7 iZICMGQcBk4OPfJFHborcOpAb0FG9cxWf85cDpI2HHS7S3TtNdF0AFPPaiArgG/s6b gEEb7QXjhK5xA== From: Roger Quadros To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: vladimir.oltean@nxp.com, s-vadapalli@ti.com, r-gunasekaran@ti.com, srk@ti.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Roger Quadros Subject: [PATCH net-next 2/3] net: ethernet: am65-cpsw: Set default TX channels to maximum Date: Mon, 13 Nov 2023 13:07:07 +0200 Message-Id: <20231113110708.137379-3-rogerq@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231113110708.137379-1-rogerq@kernel.org> References: <20231113110708.137379-1-rogerq@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" am65-cpsw supports 8 TX hardware queues. Set this as default. Signed-off-by: Roger Quadros Reviewed-by: Andrew Lunn --- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/etherne= t/ti/am65-cpsw-nuss.c index ece9f8df98ae..7c440899c93c 100644 --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c @@ -136,6 +136,8 @@ NETIF_MSG_IFUP | NETIF_MSG_PROBE | NETIF_MSG_IFDOWN | \ NETIF_MSG_RX_ERR | NETIF_MSG_TX_ERR) =20 +#define AM65_CPSW_DEFAULT_TX_CHNS 8 + static void am65_cpsw_port_set_sl_mac(struct am65_cpsw_port *slave, const u8 *dev_addr) { @@ -2897,7 +2899,7 @@ static int am65_cpsw_nuss_probe(struct platform_devic= e *pdev) =20 common->rx_flow_id_base =3D -1; init_completion(&common->tdown_complete); - common->tx_ch_num =3D 1; + common->tx_ch_num =3D AM65_CPSW_DEFAULT_TX_CHNS; common->pf_p0_rx_ptype_rrobin =3D false; common->default_vlan =3D 1; =20 --=20 2.34.1 From nobody Wed Dec 31 00:35:50 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 68904C4332F for ; Mon, 13 Nov 2023 11:07:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230157AbjKMLHh (ORCPT ); Mon, 13 Nov 2023 06:07:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43808 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230094AbjKMLH3 (ORCPT ); Mon, 13 Nov 2023 06:07:29 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6D89210F0 for ; Mon, 13 Nov 2023 03:07:26 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6FF6AC433C7; Mon, 13 Nov 2023 11:07:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699873646; bh=ZR/DMZiyPsFy+qz8rEgRfcpH4vlRg6uq7If8iaVqgDs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fFTOq4h4BIeRZgABsCAYrICCROmZWg0yTLFR3qD5fmh+i5iCyUQPRjfQQGloe+CVs lbKAIqSv4CnJYPudxvm8kyBTs91R49XO6RJ6A2xp5He0htSmV9aVPldmxwsGB8rwrZ Ng8UTO3zR9LsV/fzOKooOF7ko/kbkiFsvfyj7jMGh0DDWKpUhwwuaLNF4zO8uCl6mk 7mkAxj25in57JrKMZ1+nhdbOpPMNwNOH3pkhgAqZbg/8E2U7YhD6qVQ/Xkna2IHyOZ UIiwbsQI2ssUJURO2STSw9ZqQUUHJSBYnoN4h68JvpsNEGGhTmEknEc0p1n/tGDMMo rSYeDRj26szDg== From: Roger Quadros To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: vladimir.oltean@nxp.com, s-vadapalli@ti.com, r-gunasekaran@ti.com, srk@ti.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Roger Quadros Subject: [PATCH net-next 3/3] net: ethernet: am65-cpsw: Error out if Enable TX/RX channel fails Date: Mon, 13 Nov 2023 13:07:08 +0200 Message-Id: <20231113110708.137379-4-rogerq@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231113110708.137379-1-rogerq@kernel.org> References: <20231113110708.137379-1-rogerq@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" k3_udma_glue_enable_rx/tx_chn returns error code on failure. Bail out on error while enabling TX/RX channel. Signed-off-by: Roger Quadros Reviewed-by: Andrew Lunn --- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 33 +++++++++++++++++++----- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/etherne= t/ti/am65-cpsw-nuss.c index 7c440899c93c..340f25bf33b1 100644 --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c @@ -372,7 +372,7 @@ static void am65_cpsw_init_port_emac_ale(struct am65_cp= sw_port *port); static int am65_cpsw_nuss_common_open(struct am65_cpsw_common *common) { struct am65_cpsw_host *host_p =3D am65_common_get_host(common); - int port_idx, i, ret; + int port_idx, i, ret, tx; struct sk_buff *skb; u32 val, port_mask; =20 @@ -453,13 +453,22 @@ static int am65_cpsw_nuss_common_open(struct am65_cps= w_common *common) } kmemleak_not_leak(skb); } - k3_udma_glue_enable_rx_chn(common->rx_chns.rx_chn); =20 - for (i =3D 0; i < common->tx_ch_num; i++) { - ret =3D k3_udma_glue_enable_tx_chn(common->tx_chns[i].tx_chn); - if (ret) - return ret; - napi_enable(&common->tx_chns[i].napi_tx); + ret =3D k3_udma_glue_enable_rx_chn(common->rx_chns.rx_chn); + if (ret) { + dev_err(common->dev, "couldn't enable rx chn: %d\n", ret); + return ret; + } + + for (tx =3D 0; tx < common->tx_ch_num; tx++) { + ret =3D k3_udma_glue_enable_tx_chn(common->tx_chns[tx].tx_chn); + if (ret) { + dev_err(common->dev, "couldn't enable tx chn %d: %d\n", + tx, ret); + tx--; + goto fail_tx; + } + napi_enable(&common->tx_chns[tx].napi_tx); } =20 napi_enable(&common->napi_rx); @@ -470,6 +479,16 @@ static int am65_cpsw_nuss_common_open(struct am65_cpsw= _common *common) =20 dev_dbg(common->dev, "cpsw_nuss started\n"); return 0; + +fail_tx: + while (tx >=3D 0) { + napi_disable(&common->tx_chns[tx].napi_tx); + k3_udma_glue_disable_tx_chn(common->tx_chns[tx].tx_chn); + tx--; + } + + k3_udma_glue_disable_rx_chn(common->rx_chns.rx_chn); + return ret; } =20 static void am65_cpsw_nuss_tx_cleanup(void *data, dma_addr_t desc_dma); --=20 2.34.1