[dpdk-stable] patch 'net/qede: fix milliseconds sleep macro' 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 b81bfe40219512e9ab74ffd486c02a769bc179cd Mon Sep 17 00:00:00 2001
From: Devendra Singh Rawat <dsinghrawat at marvell.com>
Date: Mon, 27 Jul 2020 19:46:44 +0530
Subject: [PATCH] net/qede: fix milliseconds sleep macro

[ upstream commit 91979430089bf897881238a168b631f1a81c5477 ]

The macro defined for milliseconds sleep was not putting the thread
to sleep and was simply calling a delay routine. This fix redefines
the macro to call the correct rte sleep API.

Fixes: ec94dbc57362 ("qede: add base driver")

Signed-off-by: Devendra Singh Rawat <dsinghrawat at marvell.com>
Signed-off-by: Igor Russkikh <irusskikh at marvell.com>
Signed-off-by: Rasesh Mody <rmody at marvell.com>
---
 drivers/net/qede/base/bcm_osal.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/qede/base/bcm_osal.h b/drivers/net/qede/base/bcm_osal.h
index 0f09557cf0..d9f507f233 100644
--- a/drivers/net/qede/base/bcm_osal.h
+++ b/drivers/net/qede/base/bcm_osal.h
@@ -81,9 +81,8 @@ typedef int bool;
 
 #define DELAY(x) rte_delay_us(x)
 #define usec_delay(x) DELAY(x)
-#define msec_delay(x) DELAY(1000 * (x))
 #define OSAL_UDELAY(time) usec_delay(time)
-#define OSAL_MSLEEP(time) msec_delay(time)
+#define OSAL_MSLEEP(time) rte_delay_us_sleep(1000 * (time))
 
 /* Memory allocations and deallocations */
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:13.760016656 +0000
+++ 0064-net-qede-fix-milliseconds-sleep-macro.patch	2020-10-28 10:35:11.532830435 +0000
@@ -1,14 +1,15 @@
-From 91979430089bf897881238a168b631f1a81c5477 Mon Sep 17 00:00:00 2001
+From b81bfe40219512e9ab74ffd486c02a769bc179cd Mon Sep 17 00:00:00 2001
 From: Devendra Singh Rawat <dsinghrawat at marvell.com>
 Date: Mon, 27 Jul 2020 19:46:44 +0530
 Subject: [PATCH] net/qede: fix milliseconds sleep macro
 
+[ upstream commit 91979430089bf897881238a168b631f1a81c5477 ]
+
 The macro defined for milliseconds sleep was not putting the thread
 to sleep and was simply calling a delay routine. This fix redefines
 the macro to call the correct rte sleep API.
 
 Fixes: ec94dbc57362 ("qede: add base driver")
-Cc: stable at dpdk.org
 
 Signed-off-by: Devendra Singh Rawat <dsinghrawat at marvell.com>
 Signed-off-by: Igor Russkikh <irusskikh at marvell.com>
@@ -18,10 +19,10 @@
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/drivers/net/qede/base/bcm_osal.h b/drivers/net/qede/base/bcm_osal.h
-index 5d4df5907a..ded4fb0f57 100644
+index 0f09557cf0..d9f507f233 100644
 --- a/drivers/net/qede/base/bcm_osal.h
 +++ b/drivers/net/qede/base/bcm_osal.h
-@@ -81,9 +81,8 @@ typedef intptr_t osal_int_ptr_t;
+@@ -81,9 +81,8 @@ typedef int bool;
  
  #define DELAY(x) rte_delay_us(x)
  #define usec_delay(x) DELAY(x)