This is a note to let you know that I've just added the patch titled
net: stmmac: Add queue reset into stmmac_xdp_open() function
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
net-stmmac-add-queue-reset-into-stmmac_xdp_open-function.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 24e3fce00c0b557491ff596c0682a29dee6fe848 Mon Sep 17 00:00:00 2001
From: Song Yoong Siang <yoong.siang.song@xxxxxxxxx>
Date: Tue, 4 Apr 2023 12:48:23 +0800
Subject: net: stmmac: Add queue reset into stmmac_xdp_open() function
From: Song Yoong Siang <yoong.siang.song@xxxxxxxxx>
commit 24e3fce00c0b557491ff596c0682a29dee6fe848 upstream.
Queue reset was moved out from __init_dma_rx_desc_rings() and
__init_dma_tx_desc_rings() functions. Thus, the driver fails to transmit
and receive packet after XDP prog setup.
This commit adds the missing queue reset into stmmac_xdp_open() function.
Fixes: f9ec5723c3db ("net: ethernet: stmicro: stmmac: move queue reset to dedicated functions")
Cc: <stable@xxxxxxxxxxxxxxx> # 6.0+
Signed-off-by: Song Yoong Siang <yoong.siang.song@xxxxxxxxx>
Reviewed-by: Alexander Duyck <alexanderduyck@xxxxxx>
Link: https://lore.kernel.org/r/20230404044823.3226144-1-yoong.siang.song@xxxxxxxxx
Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 ++
1 file changed, 2 insertions(+)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -6627,6 +6627,8 @@ int stmmac_xdp_open(struct net_device *d
goto init_error;
}
+ stmmac_reset_queues_param(priv);
+
/* DMA CSR Channel configuration */
for (chan = 0; chan < dma_csr_ch; chan++) {
stmmac_init_chan(priv, priv->ioaddr, priv->plat->dma_cfg, chan);
Patches currently in stable-queue which might be from yoong.siang.song@xxxxxxxxx are
queue-6.1/net-stmmac-add-queue-reset-into-stmmac_xdp_open-function.patch
