[dpdk-stable] patch 'net/ena/base: specify delay operations' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/30/20. 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.

Thanks.

Luca Boccassi

---
>From 6153928dce909b906c4ca47526cb69678a0523c8 Mon Sep 17 00:00:00 2001
From: Michal Krawczyk <mk at semihalf.com>
Date: Thu, 17 Sep 2020 07:30:17 +0200
Subject: [PATCH] net/ena/base: specify delay operations

[ upstream commit 5ec22f97b6300ff65f89c8cb0fa072de139ac520 ]

ENA_MSLEEP() and ENA_UDELAY() were expecting different behavior - the
first one is expecting driver to sleep, while the other, to busy wait.

For both cases, the rte_delay_(u|m)s() function was used, which could
be either sleep or block, depending on the configuration.

To make the macros valid, the operations should be specified directly.
Because of that, the rte_delay_us_sleep() and rte_delay_us_block() are
now being used.

Fixes: 9ba7981ec992 ("ena: add communication layer for DPDK")

Signed-off-by: Michal Krawczyk <mk at semihalf.com>
Reviewed-by: Igor Chauskin <igorch at amazon.com>
Reviewed-by: Guy Tzalik <gtzalik at amazon.com>
Reviewed-by: Stephen Hemminger <stephen at networkplumber.org>
---
 drivers/net/ena/base/ena_plat_dpdk.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ena/base/ena_plat_dpdk.h b/drivers/net/ena/base/ena_plat_dpdk.h
index 2090e34adf..5a9d71749e 100644
--- a/drivers/net/ena/base/ena_plat_dpdk.h
+++ b/drivers/net/ena/base/ena_plat_dpdk.h
@@ -55,8 +55,8 @@ typedef uint64_t dma_addr_t;
 
 #define ENA_ABORT() abort()
 
-#define ENA_MSLEEP(x) rte_delay_ms(x)
-#define ENA_UDELAY(x) rte_delay_us(x)
+#define ENA_MSLEEP(x) rte_delay_us_sleep(x * 1000)
+#define ENA_UDELAY(x) rte_delay_us_block(x)
 
 #define ENA_TOUCH(x) ((void)(x))
 #define memcpy_toio memcpy
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:13.817609221 +0000
+++ 0066-net-ena-base-specify-delay-operations.patch	2020-10-28 10:35:11.536830495 +0000
@@ -1,8 +1,10 @@
-From 5ec22f97b6300ff65f89c8cb0fa072de139ac520 Mon Sep 17 00:00:00 2001
+From 6153928dce909b906c4ca47526cb69678a0523c8 Mon Sep 17 00:00:00 2001
 From: Michal Krawczyk <mk at semihalf.com>
 Date: Thu, 17 Sep 2020 07:30:17 +0200
 Subject: [PATCH] net/ena/base: specify delay operations
 
+[ upstream commit 5ec22f97b6300ff65f89c8cb0fa072de139ac520 ]
+
 ENA_MSLEEP() and ENA_UDELAY() were expecting different behavior - the
 first one is expecting driver to sleep, while the other, to busy wait.
 
@@ -14,7 +16,6 @@
 now being used.
 
 Fixes: 9ba7981ec992 ("ena: add communication layer for DPDK")
-Cc: stable at dpdk.org
 
 Signed-off-by: Michal Krawczyk <mk at semihalf.com>
 Reviewed-by: Igor Chauskin <igorch at amazon.com>
@@ -25,10 +26,10 @@
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/net/ena/base/ena_plat_dpdk.h b/drivers/net/ena/base/ena_plat_dpdk.h
-index ba7a098f59..d9b728c4d6 100644
+index 2090e34adf..5a9d71749e 100644
 --- a/drivers/net/ena/base/ena_plat_dpdk.h
 +++ b/drivers/net/ena/base/ena_plat_dpdk.h
-@@ -56,8 +56,8 @@ typedef uint64_t dma_addr_t;
+@@ -55,8 +55,8 @@ typedef uint64_t dma_addr_t;
  
  #define ENA_ABORT() abort()