Skip to contentSkip to conversation

pci: restore access to RTE_VERIFY for Power builds

PATCH Applied David Christensen 4 participants 5 messages Mar 16, 2020 – Mar 19, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pci: restore access to RTE_VERIFY for Power builds

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")
---
 drivers/bus/ifpga/ifpga_bus.c | 1 +
 lib/librte_pci/rte_pci.c      | 1 +
 2 files changed, 2 insertions(+)
drivers/bus/ifpga/ifpga_bus.c +1 -0
index dfd6b1fba..addbc3e86 100644
@@ -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"
lib/librte_pci/rte_pci.c +1 -0
index a753cf3ec..d1ab6b414 100644
@@ -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"
 
Signature · 1 line
2.18.1
Tested-by on v1 1/1
#1 lore raw
Quoted 8 lines · David Christensen

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,

Quoted 8 lines

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")

---

...

Ran ci against this patch (with my ppc64le ci patches included), it ran clean. Results are here:
https://travis-ci.org/github/djlwilder/dpdk/builds/663247710

Acked-by on v1 1/1
#2 lore raw
In reply to David Christensen
Quoted 9 lines · David Christensen

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,

Quoted 4 lines

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")
Quoted 2 lines
Signature · 1 line
David Marchand
#3 lore raw
Quoted 14 lines · David Marchand
Quoted 12 lines · David Christensen

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.

Quoted 7 lines
Quoted 1 line
Fixes 0dcba5256287 ("pci: remove unneeded includes in public header file")
Quoted 2 lines

Applied, thanks.

Signature · 1 line
David Marchand
#4 lore raw

Thanks David.

Quoted 40 lines

-----Original Message-----
From: David Marchand <[email protected]>
Sent: Wednesday, March 18, 2020 3:39
To: David Christensen <[email protected]>
Cc: Xu, Rosen <[email protected]>; Gaetan Rivet <[email protected]>; dev <[email protected]>; Richardson, Bruce <[email protected]>; David Wilder <[email protected]>
Subject: Re: [dpdk-dev] [PATCH] pci: restore access to RTE_VERIFY for Power builds

Quoted 14 lines · David Marchand
Quoted 12 lines · David Christensen

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.

Quoted 8 lines
Quoted 2 lines
Fixes 0dcba5256287 ("pci: remove unneeded includes in public header

file")

Quoted 2 lines

Applied, thanks.

--
David Marchand