From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 685B246983F for ; Wed, 29 Jul 2026 16:57:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785344277; cv=none; b=dlE0MtyjRdKgfdyR4xCB86lknNAi4TJlT5ALL5ul81VHYhkhPA9qIIxEqVwUxynDSdWC18HDMfZ3XuNos4UH2i+HhgBRpXoioC6eqa57zS0Rp69vdiEiDFN+KxSFMsnipnunpPgFr97tZMBGSSRir78rtdX/BucUaSdNV9fQFao= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785344277; c=relaxed/simple; bh=8TQxN0Tn37SPmU6gq8ovbmyd2iRkVhfCP9fuPyful3Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=UhNXDq5wpJzlme6q8eOkqbL+3aFiOa5PrtI1V2Gt5QdlfUXxB20VmXPuXwqzDpVayLbL2BL3uGu0X8bH5JFZoHy3P/4VrxKf+zg2AW6IEKEMzXb4g+P0q18jAz2lRliY1+bjn9UKyx0I08xef79cht1/+3+1Dhe83+KSBkXSrpM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=PGx/78xa; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="PGx/78xa" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2E1601F00A3D; Wed, 29 Jul 2026 16:57:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1785344274; bh=ufMzAzAcx7ATCLwlpmej2tlUw5TGAh3etDOLPOnRQxM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=PGx/78xa+kzc+womID5K+B1S/AkEq0EWzH4nuqZXdBGPGXVSonHFA8/5H/VyoXg+r PaVpcv5I9pSbbSrQSf+4pbBbR0m8z1GbmhWYa5k6GWpJ5mluPw6BmEGpdGU+0RSK4z RctChTv4pbThSVAUIvN30W+lDotwQ3oCPDx/uCbvTAyVbzx/dB1uRtF0Ihworjz6QQ W5wEII75Uh1Sm4LbznKWBrkxcLfxugt4JOtLvZMm5M9lKZVbSTMbXme64i4cncoLqB dwALNfirDGWxuwJ3ZnsaDXND6dMw1wVKdNwJ/gxQ1ip1NAtd4lx7AtTYWR3e4dZyIC Lh0OkOOA1AVrw== From: Sasha Levin To: stable@vger.kernel.org Cc: =?UTF-8?q?Th=C3=A9o=20Lebrun?= , Nicolas Ferre , Simon Horman , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.10.y 4/6] net: macb: move ring size computation to functions Date: Wed, 29 Jul 2026 12:57:47 -0400 Message-ID: <20260729165749.3661232-4-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260729165749.3661232-1-sashal@kernel.org> References: <2026072142-acorn-watch-76da@gregkh> <20260729165749.3661232-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Théo Lebrun [ Upstream commit 92d4256fafd8d0a14d3aaa10452ac771bf9b597c ] The tx/rx ring size calculation is somewhat complex and partially hidden behind a macro. Move that out of the {RX,TX}_RING_BYTES() macros and macb_{alloc,free}_consistent() functions into neat separate functions. In macb_free_consistent(), we drop the size variable and directly call the size helpers in the arguments list. In macb_alloc_consistent(), we keep the size variable that is used by netdev_dbg() calls. Acked-by: Nicolas Ferre Signed-off-by: Théo Lebrun Reviewed-by: Simon Horman Link: https://patch.msgid.link/20250923-macb-fixes-v6-3-772d655cdeb6@bootlin.com Signed-off-by: Jakub Kicinski Stable-dep-of: 27f575836cfe ("net: macb: drop in-flight Tx SKBs on close") Signed-off-by: Sasha Levin --- drivers/net/ethernet/cadence/macb_main.c | 27 ++++++++++++++---------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 25a7e63f20e144..b7aeab39e2ccbe 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -50,14 +50,10 @@ struct sifive_fu540_macb_mgmt { #define DEFAULT_RX_RING_SIZE 512 /* must be power of 2 */ #define MIN_RX_RING_SIZE 64 #define MAX_RX_RING_SIZE 8192 -#define RX_RING_BYTES(bp) (macb_dma_desc_get_size(bp) \ - * (bp)->rx_ring_size) #define DEFAULT_TX_RING_SIZE 512 /* must be power of 2 */ #define MIN_TX_RING_SIZE 64 #define MAX_TX_RING_SIZE 4096 -#define TX_RING_BYTES(bp) (macb_dma_desc_get_size(bp) \ - * (bp)->tx_ring_size) /* level of occupied TX descriptors under which we wake up TX process */ #define MACB_TX_WAKEUP_THRESH(bp) (3 * (bp)->tx_ring_size / 4) @@ -2169,11 +2165,20 @@ static void macb_free_rx_buffers(struct macb *bp) } } +static unsigned int macb_tx_ring_size_per_queue(struct macb *bp) +{ + return macb_dma_desc_get_size(bp) * bp->tx_ring_size + bp->tx_bd_rd_prefetch; +} + +static unsigned int macb_rx_ring_size_per_queue(struct macb *bp) +{ + return macb_dma_desc_get_size(bp) * bp->rx_ring_size + bp->rx_bd_rd_prefetch; +} + static void macb_free_consistent(struct macb *bp) { struct macb_queue *queue; unsigned int q; - int size; bp->macbgem_ops.mog_free_rx_buffers(bp); @@ -2181,14 +2186,14 @@ static void macb_free_consistent(struct macb *bp) kfree(queue->tx_skb); queue->tx_skb = NULL; if (queue->tx_ring) { - size = TX_RING_BYTES(bp) + bp->tx_bd_rd_prefetch; - dma_free_coherent(&bp->pdev->dev, size, + dma_free_coherent(&bp->pdev->dev, + macb_tx_ring_size_per_queue(bp), queue->tx_ring, queue->tx_ring_dma); queue->tx_ring = NULL; } if (queue->rx_ring) { - size = RX_RING_BYTES(bp) + bp->rx_bd_rd_prefetch; - dma_free_coherent(&bp->pdev->dev, size, + dma_free_coherent(&bp->pdev->dev, + macb_rx_ring_size_per_queue(bp), queue->rx_ring, queue->rx_ring_dma); queue->rx_ring = NULL; } @@ -2239,7 +2244,7 @@ static int macb_alloc_consistent(struct macb *bp) int size; for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue) { - size = TX_RING_BYTES(bp) + bp->tx_bd_rd_prefetch; + size = macb_tx_ring_size_per_queue(bp); queue->tx_ring = dma_alloc_coherent(&bp->pdev->dev, size, &queue->tx_ring_dma, GFP_KERNEL); @@ -2257,7 +2262,7 @@ static int macb_alloc_consistent(struct macb *bp) if (!queue->tx_skb) goto out_err; - size = RX_RING_BYTES(bp) + bp->rx_bd_rd_prefetch; + size = macb_rx_ring_size_per_queue(bp); queue->rx_ring = dma_alloc_coherent(&bp->pdev->dev, size, &queue->rx_ring_dma, GFP_KERNEL); -- 2.53.0