From nobody Tue Dec 30 08:50:53 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 5A0EDC072A2 for ; Fri, 17 Nov 2023 12:18:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345942AbjKQMSP (ORCPT ); Fri, 17 Nov 2023 07:18:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54410 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231345AbjKQMSK (ORCPT ); Fri, 17 Nov 2023 07:18:10 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EADA4D8 for ; Fri, 17 Nov 2023 04:18:06 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 688B6C433C9; Fri, 17 Nov 2023 12:18:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700223486; bh=lpWLTDXadMFB1ljUCDUxsx9qfZtjOHFn7HN2op9Hkwk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O6GogXYjcn1Frj2lwUchKWgxvK5RDTx7Mgg2j0upL+IZ728HKrcCN3IDC/p5JAlTI AF5dqSYAJG9c6KMC+7s0xIzn23/hpA6wajWhuQIJG8CcV0Ly0seWW5GipTJmJ3H3Ff zpvig7jIcuht85I/gVqczDQj4A98MMGS9iaueHo9TLOdBPMIVLQSY80dPAcbT5Yhyn EzNZbfRTEKx2jwOkxwtnUT3qbFkUKKyL/oVVkdKe0uS5nPWL5mt2Bjif1YSzo6VJ7r abA/Jeo4dp7nbT0VA3cDKswDPcqPoA+CV3+zqCL+goz/2O5L59k48quyjM5g/8gDrM zKGWPAIC6hIMg== 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, vigneshr@ti.com, srk@ti.com, andrew@lunn.ch, u.kleine-koenig@pengutronix.de, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Roger Quadros Subject: [PATCH v2 net-next 1/4] net: ethernet: am65-cpsw: Add standard Ethernet MAC stats to ethtool Date: Fri, 17 Nov 2023 14:17:52 +0200 Message-Id: <20231117121755.104547-2-rogerq@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231117121755.104547-1-rogerq@kernel.org> References: <20231117121755.104547-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..b9e1d568604b 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 __iomem *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 Tue Dec 30 08:50:53 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 78DBFC197A0 for ; Fri, 17 Nov 2023 12:18:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345968AbjKQMSR (ORCPT ); Fri, 17 Nov 2023 07:18:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231391AbjKQMSO (ORCPT ); Fri, 17 Nov 2023 07:18:14 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A2CDFD71 for ; Fri, 17 Nov 2023 04:18:10 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 18FD8C433CC; Fri, 17 Nov 2023 12:18:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700223490; bh=xSB7SheKHhkYfVFVkOtml7Aoo5TYoTJR9HuadaGSiGk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=At15yDr+SU7SvFQHNWQ8F7jGIsqsb8lrBs5MnBCc0zVz5dFFsaGzRKbL6EGlVbt5R JhqLVj7YDpWgpV/2uUzb0+xSDgQwLqHD2HqyMed5iXTmcwRJYMogCZ7fLtzllagxU5 G05no8MhSvdJiUB4DqAOSzlTHuoHa7Ol47Meo3huYF/hu88EIK/BVvtf3EZnUxv985 mBvETg4FUEeR/3o0Ig2EASwDneIw7rfy3kgbei/XDKQValJN4bUnPSmNO8CPWowkyO EFwQ4sNNztZMfiRMb7+EQvJ79Ay2WAhO1bZLQcqFeU0vW/4xZdEmwKt8DGp0RBtrmb F31tJqtveDZKw== 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, vigneshr@ti.com, srk@ti.com, andrew@lunn.ch, u.kleine-koenig@pengutronix.de, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Roger Quadros Subject: [PATCH v2 net-next 2/4] net: ethernet: ti: am65-cpsw: Re-arrange functions to avoid forward declaration Date: Fri, 17 Nov 2023 14:17:53 +0200 Message-Id: <20231117121755.104547-3-rogerq@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231117121755.104547-1-rogerq@kernel.org> References: <20231117121755.104547-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" Re-arrange am65_cpsw_nuss_rx_cleanup(), am65_cpsw_nuss_xmit_free() and am65_cpsw_nuss_tx_cleanup() to avoid forward declaration. No functional change. Signed-off-by: Roger Quadros Reviewed-by: Andrew Lunn --- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 145 +++++++++++------------ 1 file changed, 71 insertions(+), 74 deletions(-) diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/etherne= t/ti/am65-cpsw-nuss.c index ece9f8df98ae..adb29e8e8026 100644 --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c @@ -367,6 +367,77 @@ static void am65_cpsw_init_host_port_emac(struct am65_= cpsw_common *common); static void am65_cpsw_init_port_switch_ale(struct am65_cpsw_port *port); static void am65_cpsw_init_port_emac_ale(struct am65_cpsw_port *port); =20 +static void am65_cpsw_nuss_rx_cleanup(void *data, dma_addr_t desc_dma) +{ + struct am65_cpsw_rx_chn *rx_chn =3D data; + struct cppi5_host_desc_t *desc_rx; + struct sk_buff *skb; + dma_addr_t buf_dma; + u32 buf_dma_len; + void **swdata; + + desc_rx =3D k3_cppi_desc_pool_dma2virt(rx_chn->desc_pool, desc_dma); + swdata =3D cppi5_hdesc_get_swdata(desc_rx); + skb =3D *swdata; + cppi5_hdesc_get_obuf(desc_rx, &buf_dma, &buf_dma_len); + k3_udma_glue_rx_cppi5_to_dma_addr(rx_chn->rx_chn, &buf_dma); + + dma_unmap_single(rx_chn->dma_dev, buf_dma, buf_dma_len, DMA_FROM_DEVICE); + k3_cppi_desc_pool_free(rx_chn->desc_pool, desc_rx); + + dev_kfree_skb_any(skb); +} + +static void am65_cpsw_nuss_xmit_free(struct am65_cpsw_tx_chn *tx_chn, + struct cppi5_host_desc_t *desc) +{ + struct cppi5_host_desc_t *first_desc, *next_desc; + dma_addr_t buf_dma, next_desc_dma; + u32 buf_dma_len; + + first_desc =3D desc; + next_desc =3D first_desc; + + cppi5_hdesc_get_obuf(first_desc, &buf_dma, &buf_dma_len); + k3_udma_glue_tx_cppi5_to_dma_addr(tx_chn->tx_chn, &buf_dma); + + dma_unmap_single(tx_chn->dma_dev, buf_dma, buf_dma_len, DMA_TO_DEVICE); + + next_desc_dma =3D cppi5_hdesc_get_next_hbdesc(first_desc); + k3_udma_glue_tx_cppi5_to_dma_addr(tx_chn->tx_chn, &next_desc_dma); + while (next_desc_dma) { + next_desc =3D k3_cppi_desc_pool_dma2virt(tx_chn->desc_pool, + next_desc_dma); + cppi5_hdesc_get_obuf(next_desc, &buf_dma, &buf_dma_len); + k3_udma_glue_tx_cppi5_to_dma_addr(tx_chn->tx_chn, &buf_dma); + + dma_unmap_page(tx_chn->dma_dev, buf_dma, buf_dma_len, + DMA_TO_DEVICE); + + next_desc_dma =3D cppi5_hdesc_get_next_hbdesc(next_desc); + k3_udma_glue_tx_cppi5_to_dma_addr(tx_chn->tx_chn, &next_desc_dma); + + k3_cppi_desc_pool_free(tx_chn->desc_pool, next_desc); + } + + k3_cppi_desc_pool_free(tx_chn->desc_pool, first_desc); +} + +static void am65_cpsw_nuss_tx_cleanup(void *data, dma_addr_t desc_dma) +{ + struct am65_cpsw_tx_chn *tx_chn =3D data; + struct cppi5_host_desc_t *desc_tx; + struct sk_buff *skb; + void **swdata; + + desc_tx =3D k3_cppi_desc_pool_dma2virt(tx_chn->desc_pool, desc_dma); + swdata =3D cppi5_hdesc_get_swdata(desc_tx); + skb =3D *(swdata); + am65_cpsw_nuss_xmit_free(tx_chn, desc_tx); + + dev_kfree_skb_any(skb); +} + static int am65_cpsw_nuss_common_open(struct am65_cpsw_common *common) { struct am65_cpsw_host *host_p =3D am65_common_get_host(common); @@ -470,9 +541,6 @@ static int am65_cpsw_nuss_common_open(struct am65_cpsw_= common *common) return 0; } =20 -static void am65_cpsw_nuss_tx_cleanup(void *data, dma_addr_t desc_dma); -static void am65_cpsw_nuss_rx_cleanup(void *data, dma_addr_t desc_dma); - static int am65_cpsw_nuss_common_stop(struct am65_cpsw_common *common) { int i; @@ -646,27 +714,6 @@ static int am65_cpsw_nuss_ndo_slave_open(struct net_de= vice *ndev) return ret; } =20 -static void am65_cpsw_nuss_rx_cleanup(void *data, dma_addr_t desc_dma) -{ - struct am65_cpsw_rx_chn *rx_chn =3D data; - struct cppi5_host_desc_t *desc_rx; - struct sk_buff *skb; - dma_addr_t buf_dma; - u32 buf_dma_len; - void **swdata; - - desc_rx =3D k3_cppi_desc_pool_dma2virt(rx_chn->desc_pool, desc_dma); - swdata =3D cppi5_hdesc_get_swdata(desc_rx); - skb =3D *swdata; - cppi5_hdesc_get_obuf(desc_rx, &buf_dma, &buf_dma_len); - k3_udma_glue_rx_cppi5_to_dma_addr(rx_chn->rx_chn, &buf_dma); - - dma_unmap_single(rx_chn->dma_dev, buf_dma, buf_dma_len, DMA_FROM_DEVICE); - k3_cppi_desc_pool_free(rx_chn->desc_pool, desc_rx); - - dev_kfree_skb_any(skb); -} - static void am65_cpsw_nuss_rx_ts(struct sk_buff *skb, u32 *psdata) { struct skb_shared_hwtstamps *ssh; @@ -840,56 +887,6 @@ static int am65_cpsw_nuss_rx_poll(struct napi_struct *= napi_rx, int budget) return num_rx; } =20 -static void am65_cpsw_nuss_xmit_free(struct am65_cpsw_tx_chn *tx_chn, - struct cppi5_host_desc_t *desc) -{ - struct cppi5_host_desc_t *first_desc, *next_desc; - dma_addr_t buf_dma, next_desc_dma; - u32 buf_dma_len; - - first_desc =3D desc; - next_desc =3D first_desc; - - cppi5_hdesc_get_obuf(first_desc, &buf_dma, &buf_dma_len); - k3_udma_glue_tx_cppi5_to_dma_addr(tx_chn->tx_chn, &buf_dma); - - dma_unmap_single(tx_chn->dma_dev, buf_dma, buf_dma_len, DMA_TO_DEVICE); - - next_desc_dma =3D cppi5_hdesc_get_next_hbdesc(first_desc); - k3_udma_glue_tx_cppi5_to_dma_addr(tx_chn->tx_chn, &next_desc_dma); - while (next_desc_dma) { - next_desc =3D k3_cppi_desc_pool_dma2virt(tx_chn->desc_pool, - next_desc_dma); - cppi5_hdesc_get_obuf(next_desc, &buf_dma, &buf_dma_len); - k3_udma_glue_tx_cppi5_to_dma_addr(tx_chn->tx_chn, &buf_dma); - - dma_unmap_page(tx_chn->dma_dev, buf_dma, buf_dma_len, - DMA_TO_DEVICE); - - next_desc_dma =3D cppi5_hdesc_get_next_hbdesc(next_desc); - k3_udma_glue_tx_cppi5_to_dma_addr(tx_chn->tx_chn, &next_desc_dma); - - k3_cppi_desc_pool_free(tx_chn->desc_pool, next_desc); - } - - k3_cppi_desc_pool_free(tx_chn->desc_pool, first_desc); -} - -static void am65_cpsw_nuss_tx_cleanup(void *data, dma_addr_t desc_dma) -{ - struct am65_cpsw_tx_chn *tx_chn =3D data; - struct cppi5_host_desc_t *desc_tx; - struct sk_buff *skb; - void **swdata; - - desc_tx =3D k3_cppi_desc_pool_dma2virt(tx_chn->desc_pool, desc_dma); - swdata =3D cppi5_hdesc_get_swdata(desc_tx); - skb =3D *(swdata); - am65_cpsw_nuss_xmit_free(tx_chn, desc_tx); - - dev_kfree_skb_any(skb); -} - static struct sk_buff * am65_cpsw_nuss_tx_compl_packet(struct am65_cpsw_tx_chn *tx_chn, dma_addr_t desc_dma) --=20 2.34.1 From nobody Tue Dec 30 08:50:53 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 CE557C197A0 for ; Fri, 17 Nov 2023 12:18:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345973AbjKQMSW (ORCPT ); Fri, 17 Nov 2023 07:18:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345959AbjKQMSR (ORCPT ); Fri, 17 Nov 2023 07:18:17 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 52AA3D5B for ; Fri, 17 Nov 2023 04:18:14 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BF32EC433C8; Fri, 17 Nov 2023 12:18:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700223494; bh=WnhCZYkPXtS5MLDKBrXmXcdTGW8FI0vCOXfio8BzzM4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QRrg83rH3yeWbGrZDy9V4lmq8r0fXbVaEGB1TjNeUM+S0pxtDdaZVKwQEFNh1qg27 COmS9gClLsgB91XKmiW04iINeynxFxu5QSJESUIdI7jRTCREOJsX+M4nKShVcaFjlh Oa7ftJ369Y2sPV99Lo0ZT6C9njM4XY0wrbd/rINqnWvt400T1+edLfCcwHc5ZhfAe5 V6B9xbAik/RVxgQ4PfwGqVOSvZ1AJnzZwpmWtq0gImN1xB/fXqAo0Ezb2ylAXcxN9h k2ejnhc6iowZhljPQU0oLGu7q+9gY0yNVXgJdSEe5QpVCSSLZnDZ9FkhrzWoXEF4NY ICTaQkp1aQ9yQ== 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, vigneshr@ti.com, srk@ti.com, andrew@lunn.ch, u.kleine-koenig@pengutronix.de, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Roger Quadros Subject: [PATCH v2 net-next 3/4] net: ethernet: am65-cpsw: Set default TX channels to maximum Date: Fri, 17 Nov 2023 14:17:54 +0200 Message-Id: <20231117121755.104547-4-rogerq@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231117121755.104547-1-rogerq@kernel.org> References: <20231117121755.104547-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. The rationale is that some am65-cpsw devices can have up to 4 ethernet ports. If the number of TX channels have to be changed then all interfaces have to be brought down and up as the old default of 1 TX channel is too restrictive for any mqprio/taprio usage. Another reason for this change is to allow testing using kselftest:net/forwarding:ethtool_mm.sh out of the box. 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 adb29e8e8026..78b3e69fbccb 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) { @@ -2894,7 +2896,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 Tue Dec 30 08:50:53 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 83D48C072A2 for ; Fri, 17 Nov 2023 12:18:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345992AbjKQMSb (ORCPT ); Fri, 17 Nov 2023 07:18:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55000 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235733AbjKQMS0 (ORCPT ); Fri, 17 Nov 2023 07:18:26 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E7EB10D5 for ; Fri, 17 Nov 2023 04:18:18 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6ECC3C433CD; Fri, 17 Nov 2023 12:18:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700223498; bh=ogHEVS0KdHVrAhNQwbidAE1xp2vQIyfTD9jS7RacS6g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MjI20mqXCAD2eu6auElRXo9UWp5ocdcuS4mj3YNn4PGu07QBGHSu+XEV6A10MpWoQ 0FPT4bIo40YXf+huKwR8bKsdXtm6QHjQxiDL/IcxX9hU09QtS92PEEl8Mzpi/jTd/W 8lIx4zBiLTIgoZFAWXI2OsGeWdpJ7E4ND8iZb8DkDfFYenccvzqUJpQ/YxdOlZ4Ey9 28UmzyiiABqSb/LEiHfw+mdRm7YiaFJk3hGJAEUnTt6hswQuURv0hPIpFlY9LPFgN2 DsZsgJUCFUeRXJdx7FXLExYg1hV7uod62qMzF+kyV/wYJNwQIsBajAzQc840vfjEpX eoUqT73Qu14fw== 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, vigneshr@ti.com, srk@ti.com, andrew@lunn.ch, u.kleine-koenig@pengutronix.de, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Roger Quadros Subject: [PATCH v2 net-next 4/4] net: ethernet: ti: am65-cpsw: Fix error handling in am65_cpsw_nuss_common_open() Date: Fri, 17 Nov 2023 14:17:55 +0200 Message-Id: <20231117121755.104547-5-rogerq@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231117121755.104547-1-rogerq@kernel.org> References: <20231117121755.104547-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. In the error path, clean up the RX descriptors and SKBs. Get rid of kmemleak_not_leak() as it seems unnecessary now. Fixes: 93a76530316a ("net: ethernet: ti: introduce am65x/j721e gigabit eth = subsystem driver") Signed-off-by: Roger Quadros --- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 48 +++++++++++++++++++----- 1 file changed, 39 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/etherne= t/ti/am65-cpsw-nuss.c index 78b3e69fbccb..7992a76ed4d8 100644 --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c @@ -443,7 +443,7 @@ static void am65_cpsw_nuss_tx_cleanup(void *data, dma_a= ddr_t desc_dma) 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 @@ -510,8 +510,12 @@ static int am65_cpsw_nuss_common_open(struct am65_cpsw= _common *common) AM65_CPSW_MAX_PACKET_SIZE, GFP_KERNEL); if (!skb) { + ret =3D -ENOMEM; dev_err(common->dev, "cannot allocate skb\n"); - return -ENOMEM; + if (i) + goto fail_rx; + + return ret; } =20 ret =3D am65_cpsw_nuss_rx_push(common, skb); @@ -520,17 +524,28 @@ static int am65_cpsw_nuss_common_open(struct am65_cps= w_common *common) "cannot submit skb to channel rx, error %d\n", ret); kfree_skb(skb); + if (i) + goto fail_rx; + return ret; } - 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); + goto fail_rx; + } + + 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); @@ -541,6 +556,21 @@ 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); + +fail_rx: + k3_udma_glue_reset_rx_chn(common->rx_chns.rx_chn, 0, + &common->rx_chns, + am65_cpsw_nuss_rx_cleanup, 0); + return ret; } =20 static int am65_cpsw_nuss_common_stop(struct am65_cpsw_common *common) --=20 2.34.1