diff mbox

[dpdk-dev,v3,1/2] crypto/mrvl: sync compilation with musdk-17.10

Message ID 1515488928-30495-1-git-send-email-tdu@semihalf.com (mailing list archive)
State Accepted, archived
Delegated to: Pablo de Lara Guarch
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Tomasz Duszynski Jan. 9, 2018, 9:08 a.m. UTC 
  With a new version of the musdk library it's no longer necessary to
explicitly define MVCONF_ARCH_DMA_ADDR_T_64BIT.

Proper defines are autogenerated by ./configure script based on
passed options and available after mv_autogen_comp_flags.h inclusion.

Signed-off-by: Tomasz Duszynski <tdu@semihalf.com>
Acked-by: Jianbo Liu <jianbo.liu@arm.com>
---
 v2:
  * Mention required MUSDK compilation option

 drivers/crypto/mrvl/Makefile          | 3 ++-
 drivers/crypto/mrvl/rte_mrvl_compat.h | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

--
2.7.4

Comments

De Lara Guarch, Pablo Jan. 9, 2018, 11:47 a.m. UTC | #1 
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Tomasz Duszynski
> Sent: Tuesday, January 9, 2018 9:09 AM
> To: dev@dpdk.org
> Cc: mw@semihalf.com; dima@marvell.com; nsamsono@marvell.com;
> jianbo.liu@arm.com; Tomasz Duszynski <tdu@semihalf.com>
> Subject: [dpdk-dev] [PATCH v3 1/2] crypto/mrvl: sync compilation with
> musdk-17.10
> 
> With a new version of the musdk library it's no longer necessary to
> explicitly define MVCONF_ARCH_DMA_ADDR_T_64BIT.
> 
> Proper defines are autogenerated by ./configure script based on passed
> options and available after mv_autogen_comp_flags.h inclusion.
> 
> Signed-off-by: Tomasz Duszynski <tdu@semihalf.com>
> Acked-by: Jianbo Liu <jianbo.liu@arm.com>

Applied to dpdk-next-crypto.
Thanks,

Pablo
Ferruh Yigit Jan. 16, 2018, 5:54 p.m. UTC | #2 
On 1/9/2018 11:47 AM, De Lara Guarch, Pablo wrote:
> 
> 
>> -----Original Message-----
>> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Tomasz Duszynski
>> Sent: Tuesday, January 9, 2018 9:09 AM
>> To: dev@dpdk.org
>> Cc: mw@semihalf.com; dima@marvell.com; nsamsono@marvell.com;
>> jianbo.liu@arm.com; Tomasz Duszynski <tdu@semihalf.com>
>> Subject: [dpdk-dev] [PATCH v3 1/2] crypto/mrvl: sync compilation with
>> musdk-17.10
>>
>> With a new version of the musdk library it's no longer necessary to
>> explicitly define MVCONF_ARCH_DMA_ADDR_T_64BIT.
>>
>> Proper defines are autogenerated by ./configure script based on passed
>> options and available after mv_autogen_comp_flags.h inclusion.
>>
>> Signed-off-by: Tomasz Duszynski <tdu@semihalf.com>
>> Acked-by: Jianbo Liu <jianbo.liu@arm.com>
> 
> Applied to dpdk-next-crypto.

Hi Pablo,

Would you be OK if I get this specific patch to the next-net? And merge with net
counterpart of it [1].

Because when net and crypto versions are separate patches, one of them is
causing build error for a specific version of musdk.
When musdk version is updated, both net and crypto should be updated atomically
for that new version.

[1]
https://dpdk.org/dev/patchwork/patch/31927/

> Thanks,
> 
> Pablo
>
diff mbox

Patch

diff --git a/drivers/crypto/mrvl/Makefile b/drivers/crypto/mrvl/Makefile
index 3532f7c..5515b40 100644
--- a/drivers/crypto/mrvl/Makefile
+++ b/drivers/crypto/mrvl/Makefile
@@ -47,7 +47,8 @@  LIB = librte_pmd_mrvl_crypto.a
 CFLAGS += -O3
 CFLAGS += $(WERROR_FLAGS)
 CFLAGS += -I$(LIBMUSDK_PATH)/include
-CFLAGS += -DMVCONF_ARCH_DMA_ADDR_T_64BIT
+CFLAGS += -DMVCONF_TYPES_PUBLIC
+CFLAGS += -DMVCONF_DMA_PHYS_ADDR_T_PUBLIC

 # library version
 LIBABIVER := 1
diff --git a/drivers/crypto/mrvl/rte_mrvl_compat.h b/drivers/crypto/mrvl/rte_mrvl_compat.h
index c29fa10..22cd184 100644
--- a/drivers/crypto/mrvl/rte_mrvl_compat.h
+++ b/drivers/crypto/mrvl/rte_mrvl_compat.h
@@ -43,6 +43,7 @@ 
 #ifdef container_of
 #undef container_of
 #endif
+#include "env/mv_autogen_comp_flags.h"
 #include "drivers/mv_sam.h"
 #include "drivers/mv_sam_cio.h"
 #include "drivers/mv_sam_session.h"