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

Kevin Traynor ktraynor at redhat.com
Thu May 28 18:21:55 CEST 2020


Hi,

FYI, your patch has been queued to LTS release 18.11.9

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

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/4422fd3200bbcdda4ab27afb39d5d410391bbf2a

Thanks.

Kevin.

---
>From 4422fd3200bbcdda4ab27afb39d5d410391bbf2a 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 55d3abf9fe..1fddde60a5 100644
--- a/drivers/bus/ifpga/ifpga_bus.c
+++ b/drivers/bus/ifpga/ifpga_bus.c
@@ -25,4 +25,5 @@
 #include <rte_alarm.h>
 #include <rte_string_fns.h>
+#include <rte_debug.h>
 
 #include "rte_rawdev.h"
diff --git a/lib/librte_pci/rte_pci.c b/lib/librte_pci/rte_pci.c
index f400178bb6..a13aed9856 100644
--- a/lib/librte_pci/rte_pci.c
+++ b/lib/librte_pci/rte_pci.c
@@ -21,4 +21,5 @@
 #include <rte_string_fns.h>
 #include <rte_common.h>
+#include <rte_debug.h>
 
 #include "rte_pci.h"
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-28 17:12:59.591505883 +0100
+++ 0008-pci-fix-build-on-ppc.patch	2020-05-28 17:12:59.032557962 +0100
@@ -1 +1 @@
-From 61669ecb921fff821db11d81557fa0449a7eb79c Mon Sep 17 00:00:00 2001
+From 4422fd3200bbcdda4ab27afb39d5d410391bbf2a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 61669ecb921fff821db11d81557fa0449a7eb79c ]
+
@@ -18 +19,0 @@
-Cc: stable at dpdk.org
@@ -29 +30 @@
-index dfd6b1fba9..addbc3e86b 100644
+index 55d3abf9fe..1fddde60a5 100644
@@ -39 +40 @@
-index a753cf3eca..d1ab6b414d 100644
+index f400178bb6..a13aed9856 100644



More information about the stable mailing list