crypto/dpaa2_sec: fix build with clang 3.4.2
Subsystems (2)
PATCH 1/1 crypto/dpaa2_sec: fix build with clang 3.4.2
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;
^1 error generated.
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.
---
The commit referenced adds the common/dpaax path to Makefiles as an include path, meaning the common/dpaax/compat.h file is included instead of common/dpaax/caamflib/compat.h by the other files.
Is this the intended header file to be included?
--- drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 3 --- drivers/crypto/dpaa2_sec/meson.build | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-)
drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +0 -3
@@ -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>
drivers/crypto/dpaa2_sec/meson.build +1 -1
@@ -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')
Signature · 1 line
2.17.1
Thomas Monjalon
Applied31/10/2019 15:05, Ciara Power:
Quoted 21 lines
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; ^1 error generated.
The
dma_addr_twas defined in the commoncompat.hfile, and does not need to be redefined.
Quoted 7 lines
The meson build include directories list was updated to enable the definition in the common
compat.hfile be used.Fixes 8c83f28cc8a4 ("common/dpaax: move OF library from DPAA bus")Signed-off-by Ciara Power <[email protected]>
Applied, thanks