d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

crypto/dpaa2_sec: fix build with clang 3.4.2

Browse Source 
Building with clang 3.4.2 caused the following error:

  CC dpaa2_sec_dpseci.o
In file included from /dpdk/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c:40:
In file included from /dpdk/drivers/common/dpaax/caamflib/desc/ipsec.h:11:
In file included from /dpdk/drivers/common/dpaax/caamflib/rta.h:11:
In file included from .../common/dpaax/caamflib/rta/sec_run_time_asm.h:14:
/dpdk/drivers/common/dpaax/compat.h:108:18:
error: redefinition of typedef 'dma_addr_t' is a C11 feature
[-Werror,-Wtypedef-redefinition]
typedef uint64_t        dma_addr_t;
                        ^
/dpdk/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c:37:18:
note: previous definition is here
typedef uint64_t        dma_addr_t;
                        ^

The dma_addr_t was defined in the common compat.h file, and does not
need to be redefined.

The meson build include directories list was updated to enable the
definition in the common compat.h file be used.

Fixes: 8c83f28cc8a4 ("common/dpaax: move OF library from DPAA bus")

Signed-off-by: Ciara Power <ciara.power@intel.com>
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
This commit is contained in:
Ciara Power 2019-10-31 14:05:52 +00:00 committed by Thomas Monjalon
parent d22cd795ec
commit 38383890b2
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
View File

@ -33,9 +33,6 @@
#include "dpaa2_sec_event.h"
#include "dpaa2_sec_logs.h"
/* Required types */
typedef uint64_t dma_addr_t;
/* RTA header files */
#include <desc/ipsec.h>
#include <desc/pdcp.h>

2
drivers/crypto/dpaa2_sec/meson.build
View File

@ -14,4 +14,4 @@ sources = files('dpaa2_sec_dpseci.c',
allow_experimental_apis = true
includes += include_directories('mc', '../../common/dpaax/caamflib')
includes += include_directories('mc', '../../common/dpaax', '../../common/dpaax/caamflib')