diff mbox series

pci: restore access to RTE_VERIFY for Power builds

Message ID 20200316204749.28066-1-drc@linux.vnet.ibm.com (mailing list archive)
State Accepted, archived
Delegated to: David Marchand
Headers
Series pci: restore access to RTE_VERIFY for Power builds |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-testing success Testing PASS
ci/travis-robot success Travis build: passed
ci/Intel-compilation fail apply issues

Commit Message

David Christensen March 16, 2020, 8:47 p.m. UTC 
  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")
Cc: bruce.richardson@intel.com

Signed-off-by: David Christensen <drc@linux.vnet.ibm.com>
---
 drivers/bus/ifpga/ifpga_bus.c | 1 +
 lib/librte_pci/rte_pci.c      | 1 +
 2 files changed, 2 insertions(+)

Comments

David Wilder March 16, 2020, 11:14 p.m. UTC | #1 
On 2020-03-16 13:47, David Christensen wrote:
> 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")
> Cc: bruce.richardson@intel.com
> 
> Signed-off-by: David Christensen <drc@linux.vnet.ibm.com>
> ---
...

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

Tested-by: David Wilder <dwilder@us.ibm.com>
David Marchand March 17, 2020, 1:21 p.m. UTC | #2 
On Mon, Mar 16, 2020 at 9:48 PM David Christensen
<drc@linux.vnet.ibm.com> wrote:
>
> 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")
Cc: stable@dpdk.org

>
> Signed-off-by: David Christensen <drc@linux.vnet.ibm.com>

Acked-by: David Marchand <david.marchand@redhat.com>
David Marchand March 17, 2020, 7:39 p.m. UTC | #3 
On Tue, Mar 17, 2020 at 2:21 PM David Marchand
<david.marchand@redhat.com> wrote:
> On Mon, Mar 16, 2020 at 9:48 PM David Christensen
> <drc@linux.vnet.ibm.com> wrote:
> >
> > 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")
> Cc: stable@dpdk.org
>
> >
> > Signed-off-by: David Christensen <drc@linux.vnet.ibm.com>
> Tested-by: David Wilder <dwilder@us.ibm.com>
> Acked-by: David Marchand <david.marchand@redhat.com>

Applied, thanks.
Xu, Rosen March 19, 2020, 1:26 a.m. UTC | #4 
Thanks David.

> -----Original Message-----
> From: David Marchand <david.marchand@redhat.com>
> Sent: Wednesday, March 18, 2020 3:39
> To: David Christensen <drc@linux.vnet.ibm.com>
> Cc: Xu, Rosen <rosen.xu@intel.com>; Gaetan Rivet <grive@u256.net>; dev
> <dev@dpdk.org>; Richardson, Bruce <bruce.richardson@intel.com>; David
> Wilder <dwilder@us.ibm.com>
> Subject: Re: [dpdk-dev] [PATCH] pci: restore access to RTE_VERIFY for Power
> builds
> 
> On Tue, Mar 17, 2020 at 2:21 PM David Marchand
> <david.marchand@redhat.com> wrote:
> > On Mon, Mar 16, 2020 at 9:48 PM David Christensen
> > <drc@linux.vnet.ibm.com> wrote:
> > >
> > > 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")
> > Cc: stable@dpdk.org
> >
> > >
> > > Signed-off-by: David Christensen <drc@linux.vnet.ibm.com>
> > Tested-by: David Wilder <dwilder@us.ibm.com>
> > Acked-by: David Marchand <david.marchand@redhat.com>
> 
> Applied, thanks.
> 
> 
> --
> David Marchand
diff mbox series

Patch

diff --git a/drivers/bus/ifpga/ifpga_bus.c b/drivers/bus/ifpga/ifpga_bus.c
index dfd6b1fba..addbc3e86 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 a753cf3ec..d1ab6b414 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"