[PATCH] crypto/mrvl: add MRVL PMD to meson

[PATCH] crypto/mrvl: add MRVL PMD to meson

[Tomasz Duszynski]

Add MRVL CRYPTO PMD to meson build system.

Signed-off-by: Tomasz Duszynski <tdu@semihalf.com>
---
 drivers/crypto/meson.build      |  2 +-
 drivers/crypto/mrvl/meson.build | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 drivers/crypto/mrvl/meson.build

diff --git a/drivers/crypto/meson.build b/drivers/crypto/meson.build
index 736c9f5..1295743 100644
--- a/drivers/crypto/meson.build
+++ b/drivers/crypto/meson.build
@@ -2,7 +2,7 @@
 # Copyright(c) 2017 Intel Corporation
 
 drivers = ['dpaa_sec', 'dpaa2_sec',
-	'openssl', 'null', 'qat']
+	'openssl', 'mrvl', 'null', 'qat']
 
 std_deps = ['cryptodev'] # cryptodev pulls in all other needed deps
 config_flag_fmt = 'RTE_LIBRTE_@0@_PMD'
diff --git a/drivers/crypto/mrvl/meson.build b/drivers/crypto/mrvl/meson.build
new file mode 100644
index 0000000..c05c793
--- /dev/null
+++ b/drivers/crypto/mrvl/meson.build
@@ -0,0 +1,21 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Marvell International Ltd.
+# Copyright(c) 2018 Semihalf.
+# All rights reserved.
+
+path = run_command('printenv', 'LIBMUSDK_PATH').stdout().strip()
+lib_dir = path + '/lib'
+inc_dir = path + '/include'
+
+lib = cc.find_library('libmusdk', dirs: [lib_dir], required: false)
+if not lib.found()
+	build = false
+else
+	ext_deps += lib
+	includes += include_directories(inc_dir)
+	cflags += ['-DMVCONF_TYPES_PUBLIC', '-DMVCONF_DMA_PHYS_ADDR_T_PUBLIC']
+endif
+
+sources = files('rte_mrvl_pmd.c', 'rte_mrvl_pmd_ops.c')
+
+deps += ['bus_vdev']
-- 
2.7.4

Re: [PATCH] crypto/mrvl: add MRVL PMD to meson

[De Lara Guarch, Pablo]

Hi Tomasz,

> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Tomasz Duszynski
> Sent: Monday, April 16, 2018 7:08 AM
> To: dev@dpdk.org
> Cc: Richardson, Bruce <bruce.richardson@intel.com>; dima@marvell.com;
> nsamsono@marvell.com; Tomasz Duszynski <tdu@semihalf.com>
> Subject: [dpdk-dev] [PATCH] crypto/mrvl: add MRVL PMD to meson
> 
> Add MRVL CRYPTO PMD to meson build system.
> 
> Signed-off-by: Tomasz Duszynski <tdu@semihalf.com>

Could you make the same change that you made in the network driver into this patch?
Bruce will get this patch, as he has already applied the network driver patch, which will be a dependency of this one.

Thanks,
Pablo

Re: [PATCH] crypto/mrvl: add MRVL PMD to meson

[Tomasz Duszynski]

On Thu, Apr 19, 2018 at 11:31:54AM +0000, De Lara Guarch, Pablo wrote:
> Hi Tomasz,
>
> > -----Original Message-----
> > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Tomasz Duszynski
> > Sent: Monday, April 16, 2018 7:08 AM
> > To: dev@dpdk.org
> > Cc: Richardson, Bruce <bruce.richardson@intel.com>; dima@marvell.com;
> > nsamsono@marvell.com; Tomasz Duszynski <tdu@semihalf.com>
> > Subject: [dpdk-dev] [PATCH] crypto/mrvl: add MRVL PMD to meson
> >
> > Add MRVL CRYPTO PMD to meson build system.
> >
> > Signed-off-by: Tomasz Duszynski <tdu@semihalf.com>
>
> Could you make the same change that you made in the network driver into this patch?
> Bruce will get this patch, as he has already applied the network driver patch, which will be a dependency of this one.
>
> Thanks,
> Pablo

You mean this one http://dpdk.org/dev/patchwork/patch/38488/?
Frankly speaking I have a crypto patch but since I did not see any comments
from Bruce regarding net I postponed it.

--
- Tomasz Duszyński

Re: [PATCH] crypto/mrvl: add MRVL PMD to meson

[Bruce Richardson]

On Thu, Apr 19, 2018 at 01:40:23PM +0200, Tomasz Duszynski wrote:
> On Thu, Apr 19, 2018 at 11:31:54AM +0000, De Lara Guarch, Pablo wrote:
> > Hi Tomasz,
> >
> > > -----Original Message-----
> > > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Tomasz Duszynski
> > > Sent: Monday, April 16, 2018 7:08 AM
> > > To: dev@dpdk.org
> > > Cc: Richardson, Bruce <bruce.richardson@intel.com>; dima@marvell.com;
> > > nsamsono@marvell.com; Tomasz Duszynski <tdu@semihalf.com>
> > > Subject: [dpdk-dev] [PATCH] crypto/mrvl: add MRVL PMD to meson
> > >
> > > Add MRVL CRYPTO PMD to meson build system.
> > >
> > > Signed-off-by: Tomasz Duszynski <tdu@semihalf.com>
> >
> > Could you make the same change that you made in the network driver into this patch?
> > Bruce will get this patch, as he has already applied the network driver patch, which will be a dependency of this one.
> >
> > Thanks,
> > Pablo
> 
> You mean this one http://dpdk.org/dev/patchwork/patch/38488/?
> Frankly speaking I have a crypto patch but since I did not see any comments
> from Bruce regarding net I postponed it.
> 
Yes, 38488. If you rebase this on top of that I'll pull it into the
next-build tree. This was originally targetted at the next-crypto tree but
it makes more sense to go to next-build.

/Bruce

[PATCH v2] crypto/mrvl: add MRVL PMD to meson

[Tomasz Duszynski]

Add MRVL CRYPTO PMD to meson build system.

Signed-off-by: Tomasz Duszynski <tdu@semihalf.com>
---
v2:
- Get lib path from meson option instead of env variable

 drivers/crypto/meson.build      |  2 +-
 drivers/crypto/mrvl/meson.build | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 drivers/crypto/mrvl/meson.build

diff --git a/drivers/crypto/meson.build b/drivers/crypto/meson.build
index 736c9f5..1295743 100644
--- a/drivers/crypto/meson.build
+++ b/drivers/crypto/meson.build
@@ -2,7 +2,7 @@
 # Copyright(c) 2017 Intel Corporation

 drivers = ['dpaa_sec', 'dpaa2_sec',
-	'openssl', 'null', 'qat']
+	'openssl', 'mrvl', 'null', 'qat']

 std_deps = ['cryptodev'] # cryptodev pulls in all other needed deps
 config_flag_fmt = 'RTE_LIBRTE_@0@_PMD'
diff --git a/drivers/crypto/mrvl/meson.build b/drivers/crypto/mrvl/meson.build
new file mode 100644
index 0000000..3c8ea3c
--- /dev/null
+++ b/drivers/crypto/mrvl/meson.build
@@ -0,0 +1,21 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Marvell International Ltd.
+# Copyright(c) 2018 Semihalf.
+# All rights reserved.
+
+path = get_option('lib_musdk_dir')
+lib_dir = path + '/lib'
+inc_dir = path + '/include'
+
+lib = cc.find_library('libmusdk', dirs: [lib_dir], required: false)
+if not lib.found()
+	build = false
+else
+	ext_deps += lib
+	includes += include_directories(inc_dir)
+	cflags += ['-DMVCONF_TYPES_PUBLIC', '-DMVCONF_DMA_PHYS_ADDR_T_PUBLIC']
+endif
+
+sources = files('rte_mrvl_pmd.c', 'rte_mrvl_pmd_ops.c')
+
+deps += ['bus_vdev']
--
2.7.4

Re: [PATCH v2] crypto/mrvl: add MRVL PMD to meson

[Bruce Richardson]

On Thu, Apr 19, 2018 at 02:21:14PM +0200, Tomasz Duszynski wrote:
> Add MRVL CRYPTO PMD to meson build system.
> 
> Signed-off-by: Tomasz Duszynski <tdu@semihalf.com>
> ---
> v2:
> - Get lib path from meson option instead of env variable
> 
>  drivers/crypto/meson.build      |  2 +-
>  drivers/crypto/mrvl/meson.build | 21 +++++++++++++++++++++
>  2 files changed, 22 insertions(+), 1 deletion(-)
>  create mode 100644 drivers/crypto/mrvl/meson.build
> 
Acked-by: Bruce Richardson <bruce.richardson@intel.com>

Applied to dpdk-next-build