From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 189D61643B for ; Fri, 20 Mar 2026 13:53:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774014785; cv=none; b=KJ0iXcVZHIZcFyTs66iykt8T3fHKu5YBBfdREiAcmmB4dv7sw3wbLi42CV8o7d63ZQpMHe6AO5zwH3JDY7a2ykCaJF+lBS72+po+56KFFjZfKzmq1oB8kb6X+iYDeCEVmnvFP0LG0Iy/5ZpTWMnn2w4b3/cuSQA9bday9oT2baQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774014785; c=relaxed/simple; bh=wO5I9Wc3BVnagddKist9+xTAVc2pBQ4VNZqHbIX0e8o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LcrOKGADPf4XaFDhR2FpJFaqLxTtszE/nS55KV1mDZmVGpLbUzNHueX+UpC80YQG9G2Bid62TCFsmlcycn7u7vTuGkrzDZRNKlvFx1/IiYPb6w2dUrrK7Z0bpPO89AY2kA3/dNKIIoaW/WKAltW7XxOoEBSRrz61ebz9L7vijMo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=U2IrMfPj; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="U2IrMfPj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ADC32C4CEF7; Fri, 20 Mar 2026 13:53:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1774014784; bh=wO5I9Wc3BVnagddKist9+xTAVc2pBQ4VNZqHbIX0e8o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U2IrMfPjvh05VfWuHdd11Dd8cuWa6tKGLyglLNk9SROmIvgcSZfjVSTR2K514Dy/+ PsrRcw167ZXcdKQSAn99Jioe1Yftd146QpaAI7jA5ztalNDJapPXCKhp1S3Qdxmdjo mpwvD6mGQxYpnf9YlK7285ECEdEaTCsf/0c0ATfmryTNGZEtUTAg/L2e6My27YCr2w 7xH1r4pUJzINryt36/FQaGFJAiJ7VN4CNd7e36ACQjPvy1UwrfLHMKc8OoRn1w55YV 3fIM53J5izj+edqlBpqCPB4nQYS37aG+ezxVeFxwHmZZPPZjq/bXC4lQT5Ze7Aa3ce UmQGRzDgANoRw== From: Sasha Levin To: stable@vger.kernel.org Cc: Kevin Hao , Simon Horman , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.18.y 1/2] net: macb: Introduce gem_init_rx_ring() Date: Fri, 20 Mar 2026 09:53:01 -0400 Message-ID: <20260320135302.4165461-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <2026032059-clad-unselfish-9202@gregkh> References: <2026032059-clad-unselfish-9202@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Kevin Hao [ Upstream commit 1a7124ecd655bcaf1845197fe416aa25cff4c3ea ] Extract the initialization code for the GEM RX ring into a new function. This change will be utilized in a subsequent patch. No functional changes are introduced. Signed-off-by: Kevin Hao Reviewed-by: Simon Horman Link: https://patch.msgid.link/20260312-macb-versal-v1-1-467647173fa4@gmail.com Signed-off-by: Jakub Kicinski Stable-dep-of: 718d0766ce4c ("net: macb: Reinitialize tx/rx queue pointer registers and rx ring during resume") Signed-off-by: Sasha Levin --- drivers/net/ethernet/cadence/macb_main.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 90550055c71c1..a20985f28f789 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -2614,6 +2614,14 @@ static void macb_init_tieoff(struct macb *bp) desc->ctrl = 0; } +static void gem_init_rx_ring(struct macb_queue *queue) +{ + queue->rx_tail = 0; + queue->rx_prepared_head = 0; + + gem_rx_refill(queue); +} + static void gem_init_rings(struct macb *bp) { struct macb_queue *queue; @@ -2631,10 +2639,7 @@ static void gem_init_rings(struct macb *bp) queue->tx_head = 0; queue->tx_tail = 0; - queue->rx_tail = 0; - queue->rx_prepared_head = 0; - - gem_rx_refill(queue); + gem_init_rx_ring(queue); } macb_init_tieoff(bp); -- 2.51.0