patch 'common/sfc_efx/base: fix maximum Tx data count' has been queued to stable release 19.11.14
christian.ehrhardt at canonical.com
christian.ehrhardt at canonical.com
Fri Nov 11 12:38:43 CET 2022
Hi,
FYI, your patch has been queued to stable release 19.11.14
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/18/22. So please
shout if anyone has objections.
Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.
Queued patches are on a temporary branch at:
https://github.com/cpaelzer/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/ce133425516f71194faeef70fa9b0c0feae387b0
Thanks.
Christian Ehrhardt <christian.ehrhardt at canonical.com>
---
>From ce133425516f71194faeef70fa9b0c0feae387b0 Mon Sep 17 00:00:00 2001
From: Ivan Malov <ivan.malov at oktetlabs.ru>
Date: Fri, 12 Aug 2022 15:24:52 +0300
Subject: [PATCH] common/sfc_efx/base: fix maximum Tx data count
[ upstream commit 79b0c1926137690d680dec1b96b7a03279674fb9 ]
Maximum data count of a Tx descriptor is advertised to users,
however, this value is mistakenly derived from the Rx define.
Use the Tx one instead. The resulting value will be the same.
Fixes: 1e43fe3cb41e ("net/sfc/base: separate limitations on Tx DMA descriptors")
Signed-off-by: Ivan Malov <ivan.malov at oktetlabs.ru>
Reviewed-by: Andrew Rybchenko <andrew.rybchenko at oktetlabs.ru>
---
drivers/net/sfc/base/ef10_nic.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/sfc/base/ef10_nic.c b/drivers/net/sfc/base/ef10_nic.c
index 3eb4674c5e..b7eaf1d506 100644
--- a/drivers/net/sfc/base/ef10_nic.c
+++ b/drivers/net/sfc/base/ef10_nic.c
@@ -1935,7 +1935,7 @@ ef10_nic_board_cfg(
/* Alignment for WPTR updates */
encp->enc_rx_push_align = EF10_RX_WPTR_ALIGN;
- encp->enc_tx_dma_desc_size_max = EFX_MASK32(ESF_DZ_RX_KER_BYTE_CNT);
+ encp->enc_tx_dma_desc_size_max = EFX_MASK32(ESF_DZ_TX_KER_BYTE_CNT);
/* No boundary crossing limits */
encp->enc_tx_dma_desc_boundary = 0;
--
2.38.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2022-11-11 12:35:05.718106624 +0100
+++ 0026-common-sfc_efx-base-fix-maximum-Tx-data-count.patch 2022-11-11 12:35:04.773192062 +0100
@@ -1 +1 @@
-From 79b0c1926137690d680dec1b96b7a03279674fb9 Mon Sep 17 00:00:00 2001
+From ce133425516f71194faeef70fa9b0c0feae387b0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 79b0c1926137690d680dec1b96b7a03279674fb9 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -16 +17 @@
- drivers/common/sfc_efx/base/ef10_nic.c | 2 +-
+ drivers/net/sfc/base/ef10_nic.c | 2 +-
@@ -19,5 +20,5 @@
-diff --git a/drivers/common/sfc_efx/base/ef10_nic.c b/drivers/common/sfc_efx/base/ef10_nic.c
-index b27fc64210..7bda778f8b 100644
---- a/drivers/common/sfc_efx/base/ef10_nic.c
-+++ b/drivers/common/sfc_efx/base/ef10_nic.c
-@@ -2233,7 +2233,7 @@ ef10_nic_board_cfg(
+diff --git a/drivers/net/sfc/base/ef10_nic.c b/drivers/net/sfc/base/ef10_nic.c
+index 3eb4674c5e..b7eaf1d506 100644
+--- a/drivers/net/sfc/base/ef10_nic.c
++++ b/drivers/net/sfc/base/ef10_nic.c
+@@ -1935,7 +1935,7 @@ ef10_nic_board_cfg(
More information about the stable
mailing list