[dpdk-stable] patch 'common/sfc_efx: fix debug compilation control' has been queued to stable release 20.11.4

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.11.4

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/12/21. 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/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/f4893697256da4579190dbfe7761c6af87c27599

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From f4893697256da4579190dbfe7761c6af87c27599 Mon Sep 17 00:00:00 2001
From: Andrew Rybchenko <andrew.rybchenko at oktetlabs.ru>
Date: Fri, 5 Nov 2021 11:33:30 +0300
Subject: [PATCH] common/sfc_efx: fix debug compilation control
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 5e973b3fa1bb6a8e682a8bfab6142809db69dcc3 ]

efsys.h belongs to common/sfc_efx and common driver debug
toggle should be used instead of net/sfc toggle.

Fixes: 5e111ed87999 ("net/sfc: introduce common driver library")

Signed-off-by: Andrew Rybchenko <andrew.rybchenko at oktetlabs.ru>
---
 drivers/common/sfc_efx/efsys.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/common/sfc_efx/efsys.h b/drivers/common/sfc_efx/efsys.h
index a3ae3137e6..c2ff3fe9bc 100644
--- a/drivers/common/sfc_efx/efsys.h
+++ b/drivers/common/sfc_efx/efsys.h
@@ -125,7 +125,7 @@ prefetch_read_once(const volatile void *addr)
 /* Enable Riverhead support */
 #define EFSYS_OPT_RIVERHEAD 1
 
-#ifdef RTE_LIBRTE_SFC_EFX_DEBUG
+#ifdef RTE_DEBUG_COMMON_SFC_EFX
 #define EFSYS_OPT_CHECK_REG 1
 #else
 #define EFSYS_OPT_CHECK_REG 0
@@ -740,7 +740,7 @@ typedef uint64_t	efsys_stat_t;
 /* RTE_VERIFY from DPDK treats expressions with % operator incorrectly,
  * so we re-implement it here
  */
-#ifdef RTE_LIBRTE_SFC_EFX_DEBUG
+#ifdef RTE_DEBUG_COMMON_SFC_EFX
 #define EFSYS_ASSERT(_exp)						\
 	do {								\
 		if (unlikely(!(_exp)))					\
-- 
2.33.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-10 14:17:12.463387073 +0800
+++ 0240-common-sfc_efx-fix-debug-compilation-control.patch	2021-11-10 14:17:02.084077679 +0800
@@ -1 +1 @@
-From 5e973b3fa1bb6a8e682a8bfab6142809db69dcc3 Mon Sep 17 00:00:00 2001
+From f4893697256da4579190dbfe7761c6af87c27599 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 5e973b3fa1bb6a8e682a8bfab6142809db69dcc3 ]
@@ -10 +12,0 @@
-Cc: stable at dpdk.org
@@ -18 +20 @@
-index 37ec6b99ba..b2109bf3c0 100644
+index a3ae3137e6..c2ff3fe9bc 100644
@@ -30 +32 @@
-@@ -742,7 +742,7 @@ typedef uint64_t	efsys_stat_t;
+@@ -740,7 +740,7 @@ typedef uint64_t	efsys_stat_t;