This is a note to let you know that I've just added the patch titled
net: axienet: limit minimum TX ring size
to the 5.10-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-axienet-limit-minimum-tx-ring-size.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 70f5817deddbc6ef3faa35841cab83c280cc653a Mon Sep 17 00:00:00 2001
From: Robert Hancock <robert.hancock@xxxxxxxxxx>
Date: Tue, 18 Jan 2022 15:41:28 -0600
Subject: net: axienet: limit minimum TX ring size
From: Robert Hancock <robert.hancock@xxxxxxxxxx>
commit 70f5817deddbc6ef3faa35841cab83c280cc653a upstream.
The driver will not work properly if the TX ring size is set to below
MAX_SKB_FRAGS + 1 since it needs to hold at least one full maximally
fragmented packet in the TX ring. Limit setting the ring size to below
this value.
Fixes: 8b09ca823ffb4 ("net: axienet: Make RX/TX ring sizes configurable")
Signed-off-by: Robert Hancock <robert.hancock@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -43,6 +43,7 @@
/* Descriptors defines for Tx and Rx DMA */
#define TX_BD_NUM_DEFAULT 64
#define RX_BD_NUM_DEFAULT 1024
+#define TX_BD_NUM_MIN (MAX_SKB_FRAGS + 1)
#define TX_BD_NUM_MAX 4096
#define RX_BD_NUM_MAX 4096
@@ -1373,7 +1374,8 @@ static int axienet_ethtools_set_ringpara
if (ering->rx_pending > RX_BD_NUM_MAX ||
ering->rx_mini_pending ||
ering->rx_jumbo_pending ||
- ering->rx_pending > TX_BD_NUM_MAX)
+ ering->tx_pending < TX_BD_NUM_MIN ||
+ ering->tx_pending > TX_BD_NUM_MAX)
return -EINVAL;
if (netif_running(ndev))
Patches currently in stable-queue which might be from robert.hancock@xxxxxxxxxx are
queue-5.10/net-axienet-wait-for-phyrstcmplt-after-core-reset.patch
queue-5.10/net-axienet-add-missing-memory-barriers.patch
queue-5.10/clk-si5341-fix-clock-hw-provider-cleanup.patch
queue-5.10/net-axienet-increase-default-tx-ring-size-to-128.patch
queue-5.10/net-axienet-fix-tx-ring-slot-available-check.patch
queue-5.10/net-axienet-fix-for-tx-busy-handling.patch
queue-5.10/net-axienet-limit-minimum-tx-ring-size.patch
queue-5.10/net-axienet-reset-core-on-initialization-prior-to-mdio-access.patch
queue-5.10/net-axienet-fix-number-of-tx-ring-slots-for-available-check.patch
queue-5.10/net-axienet-increase-reset-timeout.patch
