[dpdk-stable] patch 'pci: fix build on ppc' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/21/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 3262e4181cff59157e370231b9d25fe9e5689592 Mon Sep 17 00:00:00 2001
From: David Christensen <drc at linux.vnet.ibm.com>
Date: Mon, 16 Mar 2020 13:47:49 -0700
Subject: [PATCH] pci: fix build on ppc

[ upstream commit 61669ecb921fff821db11d81557fa0449a7eb79c ]

The include file rte_debug.h is pulled into x86 builds through the
following callchain:

lib/librte_eal/common/include/generic/rte_cycles.h:17,
lib/librte_eal/common/include/arch/x86/rte_cycles.h:13,
lib/librte_eal/common/include/arch/x86/rte_spinlock.h:18,
lib/librte_eal/common/include/arch/x86/rte_rwlock.h:13,

The PPC specific version of the same callchain does not include
rte_debug.h.  Add rte_debug.h back into the C files that require it.

Fixes: 0dcba5256287 ("pci: remove unneeded includes in public header file")

Signed-off-by: David Christensen <drc at linux.vnet.ibm.com>
Tested-by: David Wilder <dwilder at us.ibm.com>
Acked-by: David Marchand <david.marchand at redhat.com>
---
 drivers/bus/ifpga/ifpga_bus.c | 1 +
 lib/librte_pci/rte_pci.c      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/drivers/bus/ifpga/ifpga_bus.c b/drivers/bus/ifpga/ifpga_bus.c
index dfd6b1fba9..addbc3e86b 100644
--- a/drivers/bus/ifpga/ifpga_bus.c
+++ b/drivers/bus/ifpga/ifpga_bus.c
@@ -24,6 +24,7 @@
 #include <rte_kvargs.h>
 #include <rte_alarm.h>
 #include <rte_string_fns.h>
+#include <rte_debug.h>
 
 #include "rte_rawdev.h"
 #include "rte_rawdev_pmd.h"
diff --git a/lib/librte_pci/rte_pci.c b/lib/librte_pci/rte_pci.c
index a753cf3eca..d1ab6b414d 100644
--- a/lib/librte_pci/rte_pci.c
+++ b/lib/librte_pci/rte_pci.c
@@ -20,6 +20,7 @@
 #include <rte_eal.h>
 #include <rte_string_fns.h>
 #include <rte_common.h>
+#include <rte_debug.h>
 
 #include "rte_pci.h"
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 13:56:19.455379016 +0100
+++ 0016-pci-fix-build-on-ppc.patch	2020-05-19 13:56:18.179501099 +0100
@@ -1,8 +1,10 @@
-From 61669ecb921fff821db11d81557fa0449a7eb79c Mon Sep 17 00:00:00 2001
+From 3262e4181cff59157e370231b9d25fe9e5689592 Mon Sep 17 00:00:00 2001
 From: David Christensen <drc at linux.vnet.ibm.com>
 Date: Mon, 16 Mar 2020 13:47:49 -0700
 Subject: [PATCH] pci: fix build on ppc
 
+[ upstream commit 61669ecb921fff821db11d81557fa0449a7eb79c ]
+
 The include file rte_debug.h is pulled into x86 builds through the
 following callchain:
 
@@ -15,7 +17,6 @@
 rte_debug.h.  Add rte_debug.h back into the C files that require it.
 
 Fixes: 0dcba5256287 ("pci: remove unneeded includes in public header file")
-Cc: stable at dpdk.org
 
 Signed-off-by: David Christensen <drc at linux.vnet.ibm.com>
 Tested-by: David Wilder <dwilder at us.ibm.com>