From: Ciara Power <ciara.power@intel.com>
To: dev@dpdk.org, akhil.goyal@nxp.com
Cc: Ciara Power <ciara.power@intel.com>, hemant.agrawal@nxp.com
Subject: [dpdk-dev] [PATCH] crypto/dpaa2_sec: fix build with clang 3.4.2
Date: Thu, 31 Oct 2019 14:05:52 +0000 [thread overview]
Message-ID: <20191031140552.62117-1-ciara.power@intel.com> (raw)
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.
Fixes: 8c83f28cc8a4 ("common/dpaax: move OF library from DPAA bus")
Cc: hemant.agrawal@nxp.com
Signed-off-by: Ciara Power <ciara.power@intel.com>
---
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(-)
diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
index 52e522e4a..add3b9ea6 100644
--- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
+++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
@@ -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>
diff --git a/drivers/crypto/dpaa2_sec/meson.build b/drivers/crypto/dpaa2_sec/meson.build
index 1b749186c..9d1b170be 100644
--- a/drivers/crypto/dpaa2_sec/meson.build
+++ b/drivers/crypto/dpaa2_sec/meson.build
@@ -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')
--
2.17.1
next reply other threads:[~2019-10-31 14:09 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-31 14:05 Ciara Power [this message]
2019-11-01 5:25 ` Hemant Agrawal
2019-11-01 21:34 ` Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191031140552.62117-1-ciara.power@intel.com \
--to=ciara.power@intel.com \
--cc=akhil.goyal@nxp.com \
--cc=dev@dpdk.org \
--cc=hemant.agrawal@nxp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).