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

Message ID 1513001223-9881-2-git-send-email-tdu@semihalf.com (mailing list archive)
State Superseded, 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 Dec. 11, 2017, 2:07 p.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>
---
 drivers/crypto/mrvl/Makefile          | 3 ++-
 drivers/crypto/mrvl/rte_mrvl_compat.h | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

--
2.7.4
  

Comments

Tomasz Duszynski Jan. 8, 2018, 2:27 p.m. UTC | #1
On Mon, Dec 11, 2017 at 03:07:02PM +0100, Tomasz Duszynski wrote:
> 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>
> ---
>  drivers/crypto/mrvl/Makefile          | 3 ++-
>  drivers/crypto/mrvl/rte_mrvl_compat.h | 1 +
>  2 files changed, 3 insertions(+), 1 deletion(-)
>
> 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"
> --
> 2.7.4
>

This patch has been available here for some time already and it looks it
has not been picked up yet. Should I respin the series?

--
- Tomasz Duszyński
  
De Lara Guarch, Pablo Jan. 8, 2018, 2:41 p.m. UTC | #2
Hi Tomasz,

> -----Original Message-----

> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Tomasz Duszynski

> Sent: Monday, January 8, 2018 2:28 PM

> To: dev@dpdk.org

> Cc: mw@semihalf.com; jck@semihalf.com; dima@marvell.com;

> nsamsono@marvell.com; jianbo.liu@arm.com; Tomasz Duszynski

> <tdu@semihalf.com>

> Subject: Re: [dpdk-dev] [PATCH v2 1/2] crypto/mrvl: sync compilation with

> musdk-17.10

> 

> On Mon, Dec 11, 2017 at 03:07:02PM +0100, Tomasz Duszynski wrote:

> > 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>

> > ---

> >  drivers/crypto/mrvl/Makefile          | 3 ++-

> >  drivers/crypto/mrvl/rte_mrvl_compat.h | 1 +

> >  2 files changed, 3 insertions(+), 1 deletion(-)

> >

> > 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"

> > --

> > 2.7.4

> >

> 

> This patch has been available here for some time already and it looks it has

> not been picked up yet. Should I respin the series?


Sorry, I missed this. I was waiting for the network driver patches to be applied, which are now.

Will merge soon.

Pablo

> 

> --

> - Tomasz Duszyński
  
Tomasz Duszynski Jan. 8, 2018, 2:45 p.m. UTC | #3
On Mon, Jan 08, 2018 at 02:41:30PM +0000, De Lara Guarch, Pablo wrote:
> Hi Tomasz,
>
> > -----Original Message-----
> > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Tomasz Duszynski
> > Sent: Monday, January 8, 2018 2:28 PM
> > To: dev@dpdk.org
> > Cc: mw@semihalf.com; jck@semihalf.com; dima@marvell.com;
> > nsamsono@marvell.com; jianbo.liu@arm.com; Tomasz Duszynski
> > <tdu@semihalf.com>
> > Subject: Re: [dpdk-dev] [PATCH v2 1/2] crypto/mrvl: sync compilation with
> > musdk-17.10
> >
> > On Mon, Dec 11, 2017 at 03:07:02PM +0100, Tomasz Duszynski wrote:
> > > 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>
> > > ---
> > >  drivers/crypto/mrvl/Makefile          | 3 ++-
> > >  drivers/crypto/mrvl/rte_mrvl_compat.h | 1 +
> > >  2 files changed, 3 insertions(+), 1 deletion(-)
> > >
> > > 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"
> > > --
> > > 2.7.4
> > >
> >
> > This patch has been available here for some time already and it looks it has
> > not been picked up yet. Should I respin the series?
>
> Sorry, I missed this. I was waiting for the network driver patches to be applied, which are now.
>
> Will merge soon.
>
> Pablo
>

No problem, thanks.

--
- Tomasz Duszyński
  

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"