[dpdk-dev] [PATCH v1 0/2] armada: introduce musdk pkg-config

[dpdk-dev] [PATCH v1 0/2] armada: introduce musdk pkg-config

[lironh]

From: Liron Himi <lironh@marvell.com>

- update meson files to use the musdk pkg-config
- update armada docs

Liron Himi (2):
  meson: update meson build for armada drivers
  doc: update armada docs

 doc/guides/cryptodevs/mvsam.rst    | 61 +++++++++++++++++++++++-------
 doc/guides/nics/mvneta.rst         | 45 +++++++++++-----------
 doc/guides/nics/mvpp2.rst          | 43 +++++++--------------
 drivers/common/mvep/meson.build    | 14 +++----
 drivers/crypto/mvsam/meson.build   | 15 +++-----
 drivers/net/mvneta/meson.build     | 19 +++-------
 drivers/net/mvneta/mvneta_ethdev.h |  1 +
 drivers/net/mvpp2/meson.build      | 15 +++-----
 meson_options.txt                  |  2 -
 9 files changed, 104 insertions(+), 111 deletions(-)

-- 
2.28.0

[dpdk-dev] [PATCH v1 1/2] meson: update meson build for armada drivers

[lironh]

From: Liron Himi <lironh@marvell.com>

With pkg-config support available within musdk library,
meson option 'lib_musdk_dir' can be removed.
PKG_CONFIG_PATH environment variable should be set appropriately
to use the musdk library.

Signed-off-by: Liron Himi <lironh@marvell.com>
Reviewed-by: Liron Himi <lironh@marvell.com>
---
 drivers/common/mvep/meson.build    | 14 +++++---------
 drivers/crypto/mvsam/meson.build   | 15 +++++----------
 drivers/net/mvneta/meson.build     | 19 +++++--------------
 drivers/net/mvneta/mvneta_ethdev.h |  1 +
 drivers/net/mvpp2/meson.build      | 15 +++++----------
 meson_options.txt                  |  2 --
 6 files changed, 21 insertions(+), 45 deletions(-)

diff --git a/drivers/common/mvep/meson.build b/drivers/common/mvep/meson.build
index 8df4bc6e0..863a20ab9 100644
--- a/drivers/common/mvep/meson.build
+++ b/drivers/common/mvep/meson.build
@@ -3,18 +3,14 @@
 # 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()
+dep = dependency('libmusdk', required: false)
+if not dep.found()
 	build = false
 	reason = 'missing dependency, "libmusdk"'
-else
-	ext_deps += lib
-	includes += include_directories(inc_dir)
-	cflags += ['-DMVCONF_TYPES_PUBLIC', '-DMVCONF_DMA_PHYS_ADDR_T_PUBLIC']
+	subdir_done()
 endif
 
+ext_deps += dep
+
 sources = files('mvep_common.c')
diff --git a/drivers/crypto/mvsam/meson.build b/drivers/crypto/mvsam/meson.build
index 6d97dc8a2..384eacff0 100644
--- a/drivers/crypto/mvsam/meson.build
+++ b/drivers/crypto/mvsam/meson.build
@@ -3,20 +3,15 @@
 # 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()
+dep = dependency('libmusdk', required: false)
+if not dep.found()
 	build = false
 	reason = 'missing dependency, "libmusdk"'
-else
-	ext_deps += lib
-	includes += include_directories(inc_dir)
-	cflags += ['-DMVCONF_TYPES_PUBLIC', '-DMVCONF_DMA_PHYS_ADDR_T_PUBLIC']
+	subdir_done()
 endif
 
+ext_deps += dep
+
 sources = files('rte_mrvl_pmd.c', 'rte_mrvl_pmd_ops.c')
 
 deps += ['bus_vdev', 'common_mvep']
diff --git a/drivers/net/mvneta/meson.build b/drivers/net/mvneta/meson.build
index 8d7202788..c887ddc10 100644
--- a/drivers/net/mvneta/meson.build
+++ b/drivers/net/mvneta/meson.build
@@ -3,24 +3,15 @@
 # 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()
+dep = dependency('libmusdk', required: false)
+if not dep.found()
 	build = false
 	reason = 'missing dependency, "libmusdk"'
-else
-	ext_deps += lib
-	includes += include_directories(inc_dir)
-	cflags += [
-	  '-DMVCONF_TYPES_PUBLIC',
-	  '-DMVCONF_DMA_PHYS_ADDR_T_PUBLIC',
-	  '-DMVCONF_DMA_PHYS_ADDR_T_SIZE=64'
-	]
+	subdir_done()
 endif
 
+ext_deps += dep
+
 sources = files(
 	'mvneta_ethdev.c',
 	'mvneta_rxtx.c'
diff --git a/drivers/net/mvneta/mvneta_ethdev.h b/drivers/net/mvneta/mvneta_ethdev.h
index ef8067790..e090abc25 100644
--- a/drivers/net/mvneta/mvneta_ethdev.h
+++ b/drivers/net/mvneta/mvneta_ethdev.h
@@ -21,6 +21,7 @@
 #undef container_of
 #endif
 
+#include <env/mv_autogen_comp_flags.h>
 #include <drivers/mv_neta.h>
 #include <drivers/mv_neta_ppio.h>
 
diff --git a/drivers/net/mvpp2/meson.build b/drivers/net/mvpp2/meson.build
index e06eddaac..3015a5559 100644
--- a/drivers/net/mvpp2/meson.build
+++ b/drivers/net/mvpp2/meson.build
@@ -3,20 +3,15 @@
 # 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()
+dep = dependency('libmusdk', required: false)
+if not dep.found()
 	build = false
 	reason = 'missing dependency, "libmusdk"'
-else
-	ext_deps += lib
-	includes += include_directories(inc_dir)
-	cflags += ['-DMVCONF_TYPES_PUBLIC', '-DMVCONF_DMA_PHYS_ADDR_T_PUBLIC']
+	subdir_done()
 endif
 
+ext_deps += dep
+
 sources = files(
 	'mrvl_ethdev.c',
 	'mrvl_flow.c',
diff --git a/meson_options.txt b/meson_options.txt
index 9bf18ab6b..63245b95d 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -20,8 +20,6 @@ option('include_subdir_arch', type: 'string', value: '',
 	description: 'subdirectory where to install arch-dependent headers')
 option('kernel_dir', type: 'string', value: '',
 	description: 'Path to the kernel for building kernel modules. Headers must be in $kernel_dir/build. Modules will be installed in $DEST_DIR/$kernel_dir/extra/dpdk.')
-option('lib_musdk_dir', type: 'string', value: '',
-	description: 'path to the MUSDK library installation directory')
 option('machine', type: 'string', value: 'native',
 	description: 'set the target machine type')
 option('max_ethports', type: 'integer', value: 32,
-- 
2.28.0

[dpdk-dev] [PATCH v1 2/2] doc: update armada docs

[lironh]

From: Liron Himi <lironh@marvell.com>

- update musdk requirement branch
- add the use of PKG_CONFIG

Signed-off-by: Liron Himi <lironh@marvell.com>
Reviewed-by: Liron Himi <lironh@marvell.com>
---
 doc/guides/cryptodevs/mvsam.rst | 61 ++++++++++++++++++++++++++-------
 doc/guides/nics/mvneta.rst      | 45 ++++++++++++------------
 doc/guides/nics/mvpp2.rst       | 43 +++++++----------------
 3 files changed, 83 insertions(+), 66 deletions(-)

diff --git a/doc/guides/cryptodevs/mvsam.rst b/doc/guides/cryptodevs/mvsam.rst
index 6188c1248..6ea6d31b6 100644
--- a/doc/guides/cryptodevs/mvsam.rst
+++ b/doc/guides/cryptodevs/mvsam.rst
@@ -1,6 +1,7 @@
 ..  SPDX-License-Identifier: BSD-3-Clause
-    Copyright(c) 2017 Marvell International Ltd.
-    Copyright(c) 2017 Semihalf.
+    Copyright(c) 2018 Marvell International Ltd.
+    Copyright(c) 2018 Semihalf.
+    All rights reserved.
 
 MVSAM Crypto Poll Mode Driver
 =============================
@@ -22,6 +23,12 @@ Features
 
 MVSAM CRYPTO PMD has support for:
 
+* Symmetric crypto operations: encryption/description and authentication
+* Symmetric chaining crypto operations
+* HW Accelerated using EIP97/EIP197b/EIP197d
+* Out-of-place Scatter-gather list Input, Linear Buffers Output
+* Out-of-place Linear Buffers Input, Linear Buffers Output
+
 Cipher algorithms:
 
 * ``RTE_CRYPTO_CIPHER_NULL``
@@ -61,6 +68,27 @@ Limitations
 * Hardware only supports scenarios where ICV (digest buffer) is placed just
   after the authenticated data. Other placement will result in error.
 
+Prerequisites
+-------------
+
+- Custom Linux Kernel sources
+
+  .. code-block:: console
+
+     git clone https://github.com/MarvellEmbeddedProcessors/linux-marvell.git -b linux-4.4.120-armada-18.09
+
+- Out of tree `mvpp2x_sysfs` kernel module sources
+
+  .. code-block:: console
+
+     git clone https://github.com/MarvellEmbeddedProcessors/mvpp2x-marvell.git -b mvpp2x-armada-18.09
+
+- MUSDK (Marvell User-Space SDK) sources
+
+  .. code-block:: console
+
+     git clone https://github.com/MarvellEmbeddedProcessors/musdk-marvell.git -b musdk-release-SDK-10.3.5.0-PR2
+
 Installation
 ------------
 
@@ -74,23 +102,30 @@ extra option must be passed to the library configuration script:
 For instructions how to build required kernel modules please refer
 to `doc/musdk_get_started.txt`.
 
-Initialization
---------------
+Building DPDK
+-------------
+
+Driver needs precompiled MUSDK library during compilation.
+MUSDK will be installed to `usr/local` under current directory.
+For the detailed build instructions please consult ``doc/musdk_get_started.txt``.
+
+Add path to libmusdk.pc in PKG_CONFIG_PATH environment variable:
 
-After successfully building MVSAM CRYPTO PMD, the following modules need to be
-loaded:
+.. code-block:: console
+
+   export PKG_CONFIG_PATH=$<musdk_install_dir>/lib/pkgconfig/:$PKG_CONFIG_PATH
+
+Build DPDK:
 
 .. code-block:: console
 
-   insmod musdk_cma.ko
-   insmod crypto_safexcel.ko rings=0,0
-   insmod mv_sam_uio.ko
+   meson build --cross-file config/arm/arm64_armada_linux_gcc
+   ninja -C build
+
 
-The following parameters (all optional) are exported by the driver:
 
-- ``max_nb_queue_pairs``: maximum number of queue pairs in the device (default: 8 - A8K, 4 - A7K/A3K).
-- ``max_nb_sessions``: maximum number of sessions that can be created (default: 2048).
-- ``socket_id``: socket on which to allocate the device resources on.
+Usage Example
+-------------
 
 l2fwd-crypto example application can be used to verify MVSAM CRYPTO PMD
 operation:
diff --git a/doc/guides/nics/mvneta.rst b/doc/guides/nics/mvneta.rst
index e8abde42d..404998e62 100644
--- a/doc/guides/nics/mvneta.rst
+++ b/doc/guides/nics/mvneta.rst
@@ -3,6 +3,8 @@
     Copyright(c) 2018 Semihalf.
     All rights reserved.
 
+.. _mvneta_poll_mode_driver:
+
 MVNETA Poll Mode Driver
 =======================
 
@@ -25,6 +27,7 @@ Features of the MVNETA PMD are:
 - Speed capabilities
 - Jumbo frame
 - MTU update
+- Jumbo frame
 - Promiscuous mode
 - Unicast MAC filter
 - Link status
@@ -33,6 +36,8 @@ Features of the MVNETA PMD are:
 - L4 checksum offload
 - Packet type parsing
 - Basic stats
+- Multicast MAC filter
+- Scattered TX frames
 
 
 Limitations
@@ -42,6 +47,11 @@ Limitations
   functionality. Current workaround is to reset board so that NETA has a
   chance to start in a sane state.
 
+- MUSDK architecture does not support changing configuration in run time.
+  All nessesary configurations should be done before first dev_start().
+
+- Running more than one DPDK-MUSDK application simultaneously is not supported.
+
 Prerequisites
 -------------
 
@@ -56,7 +66,7 @@ Prerequisites
 
   .. code-block:: console
 
-     git clone https://github.com/MarvellEmbeddedProcessors/musdk-marvell.git -b musdk-armada-18.09
+     git clone https://github.com/MarvellEmbeddedProcessors/musdk-marvell.git -b musdk-release-SDK-10.3.5.0-PR2
 
   MUSDK is a light-weight library that provides direct access to Marvell's
   NETA. Alternatively prebuilt MUSDK library can be
@@ -64,11 +74,8 @@ Prerequisites
   approval has been granted, library can be found by typing ``musdk`` in
   the search box.
 
-  MUSDK must be configured with the following features:
-
-  .. code-block:: console
-
-     --enable-pp2=no --enable-neta
+  To better understand the library, please consult documentation
+  available in the ``doc`` top level directory of the MUSDK sources.
 
 - DPDK environment
 
@@ -98,36 +105,28 @@ Building DPDK
 -------------
 
 Driver needs precompiled MUSDK library during compilation.
+MUSDK will be installed to `usr/local` under current directory.
+For the detailed build instructions please consult ``doc/musdk_get_started.txt``.
 
-.. code-block:: console
+Add path to libmusdk.pc in PKG_CONFIG_PATH environment variable:
 
-   export CROSS_COMPILE=<toolchain>/bin/aarch64-linux-gnu-
-   ./bootstrap
-   ./configure --host=aarch64-linux-gnu --enable-pp2=no --enable-neta
-   make install
+.. code-block:: console
 
-MUSDK will be installed to `usr/local` under current directory.
-For the detailed build instructions please consult ``doc/musdk_get_started.txt``.
+   export PKG_CONFIG_PATH=$<musdk_install_dir>/lib/pkgconfig/:$PKG_CONFIG_PATH
 
-The path to the MUSDK installation directory needs to set in meson, shown in the
-following command:
+Build DPDK:
 
 .. code-block:: console
 
-   meson -Dlib_musdk_dir=/path/to/musdk build ninja -C build
+   meson build --cross-file config/arm/arm64_armada_linux_gcc
+   ninja -C build
 
 
 Usage Example
 -------------
 
 MVNETA PMD requires extra out of tree kernel modules to function properly.
-`musdk_uio` and `mv_neta_uio` sources are part of the MUSDK. Please consult
-``doc/musdk_get_started.txt`` for the detailed build instructions.
-
-.. code-block:: console
-
-   insmod musdk_uio.ko
-   insmod mv_neta_uio.ko
+Please consult ``doc/musdk_get_started.txt`` for the detailed build instructions.
 
 Additionally interfaces used by DPDK application need to be put up:
 
diff --git a/doc/guides/nics/mvpp2.rst b/doc/guides/nics/mvpp2.rst
index 6fbce8358..b151407ad 100644
--- a/doc/guides/nics/mvpp2.rst
+++ b/doc/guides/nics/mvpp2.rst
@@ -1,6 +1,7 @@
 ..  SPDX-License-Identifier: BSD-3-Clause
-    Copyright(c) 2017 Marvell International Ltd.
-    Copyright(c) 2017 Semihalf.
+    Copyright(c) 2018 Marvell International Ltd.
+    Copyright(c) 2018 Semihalf.
+    All rights reserved.
 
 .. _mvpp2_poll_mode_driver:
 
@@ -91,7 +92,7 @@ Prerequisites
 
   .. code-block:: console
 
-     git clone https://github.com/MarvellEmbeddedProcessors/musdk-marvell.git -b musdk-armada-18.09
+     git clone https://github.com/MarvellEmbeddedProcessors/musdk-marvell.git -b musdk-release-SDK-10.3.5.0-PR2
 
   MUSDK is a light-weight library that provides direct access to Marvell's
   PPv2 (Packet Processor v2). Alternatively prebuilt MUSDK library can be
@@ -112,47 +113,29 @@ Building DPDK
 -------------
 
 Driver needs precompiled MUSDK library during compilation.
-
-.. code-block:: console
-
-   export CROSS_COMPILE=<toolchain>/bin/aarch64-linux-gnu-
-   ./bootstrap
-   ./configure --host=aarch64-linux-gnu
-   make install
-
 MUSDK will be installed to `usr/local` under current directory.
 For the detailed build instructions please consult ``doc/musdk_get_started.txt``.
 
-The path to the MUSDK installation directory needs to set in meson, shown in the
-command below.
+Add path to libmusdk.pc in PKG_CONFIG_PATH environment variable:
+
+.. code-block:: console
+
+   export PKG_CONFIG_PATH=$<musdk_install_dir>/lib/pkgconfig/:$PKG_CONFIG_PATH
 
-For additional instructions regarding DPDK cross compilation please refer to :doc:`Cross compile DPDK for ARM64 <../linux_gsg/cross_build_dpdk_for_arm64>`.
+Build DPDK:
 
 .. code-block:: console
 
-   meson -Dlib_musdk_dir=/path/to/musdk build ninja -C build
+   meson build --cross-file config/arm/arm64_armada_linux_gcc
+   ninja -C build
 
 
 Usage Example
 -------------
 
 MVPP2 PMD requires extra out of tree kernel modules to function properly.
-`musdk_cma` sources are part of the MUSDK. Please consult
-``doc/musdk_get_started.txt`` for the detailed build instructions.
-For `mvpp2x_sysfs` please consult ``Documentation/pp22_sysfs.txt`` for the
-detailed build instructions.
-
-.. code-block:: console
-
-   insmod musdk_cma.ko
-   insmod mvpp2x_sysfs.ko
-
-Additionally interfaces used by DPDK application need to be put up:
-
-.. code-block:: console
+Please consult ``doc/musdk_get_started.txt`` for the detailed build instructions.
 
-   ip link set eth0 up
-   ip link set eth2 up
 
 In order to run testpmd example application following command can be used:
 
-- 
2.28.0

Re: [dpdk-dev] [PATCH v1 2/2] doc: update armada docs

[Ferruh Yigit]

On 12/2/2020 1:05 PM, lironh@marvell.com wrote:
> From: Liron Himi <lironh@marvell.com>
> 
> - update musdk requirement branch
> - add the use of PKG_CONFIG
> 
> Signed-off-by: Liron Himi <lironh@marvell.com>
> Reviewed-by: Liron Himi <lironh@marvell.com>
> ---
>   doc/guides/cryptodevs/mvsam.rst | 61 ++++++++++++++++++++++++++-------
>   doc/guides/nics/mvneta.rst      | 45 ++++++++++++------------
>   doc/guides/nics/mvpp2.rst       | 43 +++++++----------------
>   3 files changed, 83 insertions(+), 66 deletions(-)
> 
> diff --git a/doc/guides/cryptodevs/mvsam.rst b/doc/guides/cryptodevs/mvsam.rst
> index 6188c1248..6ea6d31b6 100644
> --- a/doc/guides/cryptodevs/mvsam.rst
> +++ b/doc/guides/cryptodevs/mvsam.rst
> @@ -1,6 +1,7 @@
>   ..  SPDX-License-Identifier: BSD-3-Clause
> -    Copyright(c) 2017 Marvell International Ltd.
> -    Copyright(c) 2017 Semihalf.
> +    Copyright(c) 2018 Marvell International Ltd.
> +    Copyright(c) 2018 Semihalf.
> +    All rights reserved.


When updating dates, it can be extended as 2017-2018, instead of replacing the 
start year.
Also why 2018 but not 2020?

"All rights reserved." seems added, does it really needed, or added by mistake?

>   
>   MVSAM Crypto Poll Mode Driver
>   =============================
> @@ -22,6 +23,12 @@ Features
>   
>   MVSAM CRYPTO PMD has support for:
>   
> +* Symmetric crypto operations: encryption/description and authentication
> +* Symmetric chaining crypto operations
> +* HW Accelerated using EIP97/EIP197b/EIP197d
> +* Out-of-place Scatter-gather list Input, Linear Buffers Output
> +* Out-of-place Linear Buffers Input, Linear Buffers Output
> +

Can you please send the crypto doc updates in a separate patch? That is better 
to go into crypto tree after Akhil's review.

>   Cipher algorithms:
>   
>   * ``RTE_CRYPTO_CIPHER_NULL``
> @@ -61,6 +68,27 @@ Limitations
>   * Hardware only supports scenarios where ICV (digest buffer) is placed just
>     after the authenticated data. Other placement will result in error.
>   
> +Prerequisites
> +-------------
> +
> +- Custom Linux Kernel sources
> +
> +  .. code-block:: console
> +
> +     git clone https://github.com/MarvellEmbeddedProcessors/linux-marvell.git -b linux-4.4.120-armada-18.09
> +
> +- Out of tree `mvpp2x_sysfs` kernel module sources
> +
> +  .. code-block:: console
> +
> +     git clone https://github.com/MarvellEmbeddedProcessors/mvpp2x-marvell.git -b mvpp2x-armada-18.09
> +
> +- MUSDK (Marvell User-Space SDK) sources
> +
> +  .. code-block:: console
> +
> +     git clone https://github.com/MarvellEmbeddedProcessors/musdk-marvell.git -b musdk-release-SDK-10.3.5.0-PR2
> +
>   Installation
>   ------------
>   
> @@ -74,23 +102,30 @@ extra option must be passed to the library configuration script:
>   For instructions how to build required kernel modules please refer
>   to `doc/musdk_get_started.txt`.
>   
> -Initialization
> ---------------
> +Building DPDK
> +-------------
> +
> +Driver needs precompiled MUSDK library during compilation.
> +MUSDK will be installed to `usr/local` under current directory.

Can't MUSDK be installed with a operating system packages? If so the path will 
be different.

> +For the detailed build instructions please consult ``doc/musdk_get_started.txt``.
> +

This ``doc/musdk_get_started.txt`` is under MUSDK, right? Can you please clarify 
where the document is. And it is not helpful to refer a document that is not 
accessible, can there be a way to provide a link for the document.

> +Add path to libmusdk.pc in PKG_CONFIG_PATH environment variable:
>   
> -After successfully building MVSAM CRYPTO PMD, the following modules need to be
> -loaded:
> +.. code-block:: console
> +
> +   export PKG_CONFIG_PATH=$<musdk_install_dir>/lib/pkgconfig/:$PKG_CONFIG_PATH
> +
> +Build DPDK:
>   
>   .. code-block:: console
>   
> -   insmod musdk_cma.ko
> -   insmod crypto_safexcel.ko rings=0,0
> -   insmod mv_sam_uio.ko
> +   meson build --cross-file config/arm/arm64_armada_linux_gcc
> +   ninja -C build
> +
>   
> -The following parameters (all optional) are exported by the driver:
>   
> -- ``max_nb_queue_pairs``: maximum number of queue pairs in the device (default: 8 - A8K, 4 - A7K/A3K).
> -- ``max_nb_sessions``: maximum number of sessions that can be created (default: 2048).
> -- ``socket_id``: socket on which to allocate the device resources on.

Why this information is removed?

> +Usage Example
> +-------------
>   
>   l2fwd-crypto example application can be used to verify MVSAM CRYPTO PMD
>   operation:
> diff --git a/doc/guides/nics/mvneta.rst b/doc/guides/nics/mvneta.rst
> index e8abde42d..404998e62 100644
> --- a/doc/guides/nics/mvneta.rst
> +++ b/doc/guides/nics/mvneta.rst
> @@ -3,6 +3,8 @@
>       Copyright(c) 2018 Semihalf.
>       All rights reserved.
>   
> +.. _mvneta_poll_mode_driver:
> +
>   MVNETA Poll Mode Driver
>   =======================
>   
> @@ -25,6 +27,7 @@ Features of the MVNETA PMD are:
>   - Speed capabilities
>   - Jumbo frame
>   - MTU update
> +- Jumbo frame
>   - Promiscuous mode
>   - Unicast MAC filter
>   - Link status
> @@ -33,6 +36,8 @@ Features of the MVNETA PMD are:
>   - L4 checksum offload
>   - Packet type parsing
>   - Basic stats
> +- Multicast MAC filter
> +- Scattered TX frames
>   
>   
>   Limitations
> @@ -42,6 +47,11 @@ Limitations
>     functionality. Current workaround is to reset board so that NETA has a
>     chance to start in a sane state.
>   
> +- MUSDK architecture does not support changing configuration in run time.
> +  All nessesary configurations should be done before first dev_start().

s/nessesary/necessary

> +
> +- Running more than one DPDK-MUSDK application simultaneously is not supported.
> +
>   Prerequisites
>   -------------
>   
> @@ -56,7 +66,7 @@ Prerequisites
>   
>     .. code-block:: console
>   
> -     git clone https://github.com/MarvellEmbeddedProcessors/musdk-marvell.git -b musdk-armada-18.09
> +     git clone https://github.com/MarvellEmbeddedProcessors/musdk-marvell.git -b musdk-release-SDK-10.3.5.0-PR2
>   

Do you need a matrix to show which DPDK version supports which musdk version, or 
can musdk version updated freely?

And above is a branch, which seems moving actively, would it be better to 
provide a tag which is fixed and tested point in the musdk?

>     MUSDK is a light-weight library that provides direct access to Marvell's
>     NETA. Alternatively prebuilt MUSDK library can be
> @@ -64,11 +74,8 @@ Prerequisites
>     approval has been granted, library can be found by typing ``musdk`` in
>     the search box.
>   
> -  MUSDK must be configured with the following features:
> -
> -  .. code-block:: console
> -
> -     --enable-pp2=no --enable-neta
> +  To better understand the library, please consult documentation
> +  available in the ``doc`` top level directory of the MUSDK sources.
>   

Again our documentation is referring a doc that is not accessible, can you 
provide a link here?

>   - DPDK environment
>   
> @@ -98,36 +105,28 @@ Building DPDK
>   -------------
>   
>   Driver needs precompiled MUSDK library during compilation.
> +MUSDK will be installed to `usr/local` under current directory.
> +For the detailed build instructions please consult ``doc/musdk_get_started.txt``.
>   
> -.. code-block:: console
> +Add path to libmusdk.pc in PKG_CONFIG_PATH environment variable:
>   
> -   export CROSS_COMPILE=<toolchain>/bin/aarch64-linux-gnu-
> -   ./bootstrap
> -   ./configure --host=aarch64-linux-gnu --enable-pp2=no --enable-neta
> -   make install
> +.. code-block:: console
>   
> -MUSDK will be installed to `usr/local` under current directory.
> -For the detailed build instructions please consult ``doc/musdk_get_started.txt``.
> +   export PKG_CONFIG_PATH=$<musdk_install_dir>/lib/pkgconfig/:$PKG_CONFIG_PATH
>   
> -The path to the MUSDK installation directory needs to set in meson, shown in the
> -following command:
> +Build DPDK:
>   
>   .. code-block:: console
>   
> -   meson -Dlib_musdk_dir=/path/to/musdk build ninja -C build
> +   meson build --cross-file config/arm/arm64_armada_linux_gcc
> +   ninja -C build
>   
>   
>   Usage Example
>   -------------
>   
>   MVNETA PMD requires extra out of tree kernel modules to function properly.
> -`musdk_uio` and `mv_neta_uio` sources are part of the MUSDK. Please consult
> -``doc/musdk_get_started.txt`` for the detailed build instructions.
> -
> -.. code-block:: console
> -
> -   insmod musdk_uio.ko
> -   insmod mv_neta_uio.ko
> +Please consult ``doc/musdk_get_started.txt`` for the detailed build instructions.
>   
>   Additionally interfaces used by DPDK application need to be put up:
>   
> diff --git a/doc/guides/nics/mvpp2.rst b/doc/guides/nics/mvpp2.rst
> index 6fbce8358..b151407ad 100644
> --- a/doc/guides/nics/mvpp2.rst
> +++ b/doc/guides/nics/mvpp2.rst
> @@ -1,6 +1,7 @@
>   ..  SPDX-License-Identifier: BSD-3-Clause
> -    Copyright(c) 2017 Marvell International Ltd.
> -    Copyright(c) 2017 Semihalf.
> +    Copyright(c) 2018 Marvell International Ltd.
> +    Copyright(c) 2018 Semihalf.
> +    All rights reserved.
>   

Same questions as above.

>   .. _mvpp2_poll_mode_driver:
>   
> @@ -91,7 +92,7 @@ Prerequisites
>   
>     .. code-block:: console
>   
> -     git clone https://github.com/MarvellEmbeddedProcessors/musdk-marvell.git -b musdk-armada-18.09
> +     git clone https://github.com/MarvellEmbeddedProcessors/musdk-marvell.git -b musdk-release-SDK-10.3.5.0-PR2
>   
>     MUSDK is a light-weight library that provides direct access to Marvell's
>     PPv2 (Packet Processor v2). Alternatively prebuilt MUSDK library can be
> @@ -112,47 +113,29 @@ Building DPDK
>   -------------
>   
>   Driver needs precompiled MUSDK library during compilation.
> -
> -.. code-block:: console
> -
> -   export CROSS_COMPILE=<toolchain>/bin/aarch64-linux-gnu-
> -   ./bootstrap
> -   ./configure --host=aarch64-linux-gnu
> -   make install
> -
>   MUSDK will be installed to `usr/local` under current directory.
>   For the detailed build instructions please consult ``doc/musdk_get_started.txt``.
>   
> -The path to the MUSDK installation directory needs to set in meson, shown in the
> -command below.
> +Add path to libmusdk.pc in PKG_CONFIG_PATH environment variable:
> +
> +.. code-block:: console
> +
> +   export PKG_CONFIG_PATH=$<musdk_install_dir>/lib/pkgconfig/:$PKG_CONFIG_PATH
>   
> -For additional instructions regarding DPDK cross compilation please refer to :doc:`Cross compile DPDK for ARM64 <../linux_gsg/cross_build_dpdk_for_arm64>`.
> +Build DPDK:
>   
>   .. code-block:: console
>   
> -   meson -Dlib_musdk_dir=/path/to/musdk build ninja -C build
> +   meson build --cross-file config/arm/arm64_armada_linux_gcc
> +   ninja -C build
>   
>   
>   Usage Example
>   -------------
>   
>   MVPP2 PMD requires extra out of tree kernel modules to function properly.
> -`musdk_cma` sources are part of the MUSDK. Please consult
> -``doc/musdk_get_started.txt`` for the detailed build instructions.
> -For `mvpp2x_sysfs` please consult ``Documentation/pp22_sysfs.txt`` for the
> -detailed build instructions.
> -
> -.. code-block:: console
> -
> -   insmod musdk_cma.ko
> -   insmod mvpp2x_sysfs.ko
> -
> -Additionally interfaces used by DPDK application need to be put up:
> -
> -.. code-block:: console
> +Please consult ``doc/musdk_get_started.txt`` for the detailed build instructions.
>   
> -   ip link set eth0 up
> -   ip link set eth2 up
>   
>   In order to run testpmd example application following command can be used:
>   
> 

Re: [dpdk-dev] [PATCH v1 1/2] meson: update meson build for armada drivers

[Ferruh Yigit]

On 12/2/2020 1:05 PM, lironh@marvell.com wrote:
> From: Liron Himi <lironh@marvell.com>
> 
> With pkg-config support available within musdk library,
> meson option 'lib_musdk_dir' can be removed.
> PKG_CONFIG_PATH environment variable should be set appropriately
> to use the musdk library.
> 
> Signed-off-by: Liron Himi <lironh@marvell.com>
> Reviewed-by: Liron Himi <lironh@marvell.com>
> ---
>   drivers/common/mvep/meson.build    | 14 +++++---------
>   drivers/crypto/mvsam/meson.build   | 15 +++++----------
>   drivers/net/mvneta/meson.build     | 19 +++++--------------
>   drivers/net/mvneta/mvneta_ethdev.h |  1 +
>   drivers/net/mvpp2/meson.build      | 15 +++++----------
>   meson_options.txt                  |  2 --
>   6 files changed, 21 insertions(+), 45 deletions(-)
> 

Hi Liron,

+1 to this change, but can you please make a new version to include build 
related document changes into this same patch?

Second patch updates document, both for this build related issues and other 
issues like new musdk version and supported features etc.. Instead you can move 
build related changes to this patch, and separate second patch for crypto and 
net, so that it can have proper commit logs for each and can be reviewed easier.

--
Thanks,
ferruh

Re: [dpdk-dev] [EXT] Re: [PATCH v1 1/2] meson: update meson build for armada drivers

[Liron Himi]

-----Original Message-----
From: Ferruh Yigit <ferruh.yigit@intel.com> 
Sent: Wednesday, 9 December 2020 12:50
To: Liron Himi <lironh@marvell.com>; bruce.richardson@intel.com
Cc: dev@dpdk.org; Akhil Goyal <akhil.goyal@nxp.com>
Subject: [EXT] Re: [dpdk-dev] [PATCH v1 1/2] meson: update meson build for armada drivers

External Email

----------------------------------------------------------------------
On 12/2/2020 1:05 PM, lironh@marvell.com wrote:
> From: Liron Himi <lironh@marvell.com>
> 
> With pkg-config support available within musdk library, meson option 
> 'lib_musdk_dir' can be removed.
> PKG_CONFIG_PATH environment variable should be set appropriately to 
> use the musdk library.
> 
> Signed-off-by: Liron Himi <lironh@marvell.com>
> Reviewed-by: Liron Himi <lironh@marvell.com>
> ---
>   drivers/common/mvep/meson.build    | 14 +++++---------
>   drivers/crypto/mvsam/meson.build   | 15 +++++----------
>   drivers/net/mvneta/meson.build     | 19 +++++--------------
>   drivers/net/mvneta/mvneta_ethdev.h |  1 +
>   drivers/net/mvpp2/meson.build      | 15 +++++----------
>   meson_options.txt                  |  2 --
>   6 files changed, 21 insertions(+), 45 deletions(-)
> 

Hi Liron,

+1 to this change, but can you please make a new version to include 
+build
related document changes into this same patch?

Second patch updates document, both for this build related issues and other issues like new musdk version and supported features etc.. Instead you can move build related changes to this patch, and separate second patch for crypto and net, so that it can have proper commit logs for each and can be reviewed easier.

[L.H.] the support for the pkg-config, which meson build relay on, requires newer musdk version. Can I create a platform doc for all Marvell ARMADA platforms? 
--
Thanks,
ferruh

Re: [dpdk-dev] [EXT] Re: [PATCH v1 1/2] meson: update meson build for armada drivers

[Ferruh Yigit]

On 12/13/2020 8:06 PM, Liron Himi wrote:
> 
> -----Original Message-----
> From: Ferruh Yigit <ferruh.yigit@intel.com>
> Sent: Wednesday, 9 December 2020 12:50
> To: Liron Himi <lironh@marvell.com>; bruce.richardson@intel.com
> Cc: dev@dpdk.org; Akhil Goyal <akhil.goyal@nxp.com>
> Subject: [EXT] Re: [dpdk-dev] [PATCH v1 1/2] meson: update meson build for armada drivers
> 
> External Email
> 
> ----------------------------------------------------------------------
> On 12/2/2020 1:05 PM, lironh@marvell.com wrote:
>> From: Liron Himi <lironh@marvell.com>
>>
>> With pkg-config support available within musdk library, meson option
>> 'lib_musdk_dir' can be removed.
>> PKG_CONFIG_PATH environment variable should be set appropriately to
>> use the musdk library.
>>
>> Signed-off-by: Liron Himi <lironh@marvell.com>
>> Reviewed-by: Liron Himi <lironh@marvell.com>
>> ---
>>    drivers/common/mvep/meson.build    | 14 +++++---------
>>    drivers/crypto/mvsam/meson.build   | 15 +++++----------
>>    drivers/net/mvneta/meson.build     | 19 +++++--------------
>>    drivers/net/mvneta/mvneta_ethdev.h |  1 +
>>    drivers/net/mvpp2/meson.build      | 15 +++++----------
>>    meson_options.txt                  |  2 --
>>    6 files changed, 21 insertions(+), 45 deletions(-)
>>
> 
> Hi Liron,
> 
> +1 to this change, but can you please make a new version to include
> +build
> related document changes into this same patch?
> 
> Second patch updates document, both for this build related issues and other issues like new musdk version and supported features etc.. Instead you can move build related changes to this patch, and separate second patch for crypto and net, so that it can have proper commit logs for each and can be reviewed easier.
> 
> [L.H.] the support for the pkg-config, which meson build relay on, requires newer musdk version. Can I create a platform doc for all Marvell ARMADA platforms?

Not sure if a platform doc is required just to document external library dependency.
But if there is more to add to platform document, can you sent it as separate 
patch so it can be reviewed without blocking this set?

Re: [dpdk-dev] [EXT] Re: [PATCH v1 1/2] meson: update meson build for armada drivers

[Liron Himi]

-----Original Message-----
From: Ferruh Yigit <ferruh.yigit@intel.com> 
Sent: Monday, 14 December 2020 11:57
To: Liron Himi <lironh@marvell.com>; bruce.richardson@intel.com
Cc: dev@dpdk.org; Akhil Goyal <akhil.goyal@nxp.com>
Subject: Re: [EXT] Re: [dpdk-dev] [PATCH v1 1/2] meson: update meson build for armada drivers

On 12/13/2020 8:06 PM, Liron Himi wrote:
> 
> -----Original Message-----
> From: Ferruh Yigit <ferruh.yigit@intel.com>
> Sent: Wednesday, 9 December 2020 12:50
> To: Liron Himi <lironh@marvell.com>; bruce.richardson@intel.com
> Cc: dev@dpdk.org; Akhil Goyal <akhil.goyal@nxp.com>
> Subject: [EXT] Re: [dpdk-dev] [PATCH v1 1/2] meson: update meson build 
> for armada drivers
> 
> External Email
> 
> ----------------------------------------------------------------------
> On 12/2/2020 1:05 PM, lironh@marvell.com wrote:
>> From: Liron Himi <lironh@marvell.com>
>>
>> With pkg-config support available within musdk library, meson option 
>> 'lib_musdk_dir' can be removed.
>> PKG_CONFIG_PATH environment variable should be set appropriately to 
>> use the musdk library.
>>
>> Signed-off-by: Liron Himi <lironh@marvell.com>
>> Reviewed-by: Liron Himi <lironh@marvell.com>
>> ---
>>    drivers/common/mvep/meson.build    | 14 +++++---------
>>    drivers/crypto/mvsam/meson.build   | 15 +++++----------
>>    drivers/net/mvneta/meson.build     | 19 +++++--------------
>>    drivers/net/mvneta/mvneta_ethdev.h |  1 +
>>    drivers/net/mvpp2/meson.build      | 15 +++++----------
>>    meson_options.txt                  |  2 --
>>    6 files changed, 21 insertions(+), 45 deletions(-)
>>
> 
> Hi Liron,
> 
> +1 to this change, but can you please make a new version to include 
> +build
> related document changes into this same patch?
> 
> Second patch updates document, both for this build related issues and other issues like new musdk version and supported features etc.. Instead you can move build related changes to this patch, and separate second patch for crypto and net, so that it can have proper commit logs for each and can be reviewed easier.
> 
> [L.H.] the support for the pkg-config, which meson build relay on, requires newer musdk version. Can I create a platform doc for all Marvell ARMADA platforms?

Not sure if a platform doc is required just to document external library dependency.
But if there is more to add to platform document, can you sent it as separate patch so it can be reviewed without blocking this set?

[L.H.] i can split the doc patch and add the meson part to this patch, but I will also need to include the musdk version as only in the new version the pkg-config support is included.
Is that fine?

Re: [dpdk-dev] [EXT] Re: [PATCH v1 1/2] meson: update meson build for armada drivers

[Ferruh Yigit]

On 12/15/2020 10:04 AM, Liron Himi wrote:
> 
> -----Original Message-----
> From: Ferruh Yigit <ferruh.yigit@intel.com>
> Sent: Monday, 14 December 2020 11:57
> To: Liron Himi <lironh@marvell.com>; bruce.richardson@intel.com
> Cc: dev@dpdk.org; Akhil Goyal <akhil.goyal@nxp.com>
> Subject: Re: [EXT] Re: [dpdk-dev] [PATCH v1 1/2] meson: update meson build for armada drivers
> 
> On 12/13/2020 8:06 PM, Liron Himi wrote:
>>
>> -----Original Message-----
>> From: Ferruh Yigit <ferruh.yigit@intel.com>
>> Sent: Wednesday, 9 December 2020 12:50
>> To: Liron Himi <lironh@marvell.com>; bruce.richardson@intel.com
>> Cc: dev@dpdk.org; Akhil Goyal <akhil.goyal@nxp.com>
>> Subject: [EXT] Re: [dpdk-dev] [PATCH v1 1/2] meson: update meson build
>> for armada drivers
>>
>> External Email
>>
>> ----------------------------------------------------------------------
>> On 12/2/2020 1:05 PM, lironh@marvell.com wrote:
>>> From: Liron Himi <lironh@marvell.com>
>>>
>>> With pkg-config support available within musdk library, meson option
>>> 'lib_musdk_dir' can be removed.
>>> PKG_CONFIG_PATH environment variable should be set appropriately to
>>> use the musdk library.
>>>
>>> Signed-off-by: Liron Himi <lironh@marvell.com>
>>> Reviewed-by: Liron Himi <lironh@marvell.com>
>>> ---
>>>     drivers/common/mvep/meson.build    | 14 +++++---------
>>>     drivers/crypto/mvsam/meson.build   | 15 +++++----------
>>>     drivers/net/mvneta/meson.build     | 19 +++++--------------
>>>     drivers/net/mvneta/mvneta_ethdev.h |  1 +
>>>     drivers/net/mvpp2/meson.build      | 15 +++++----------
>>>     meson_options.txt                  |  2 --
>>>     6 files changed, 21 insertions(+), 45 deletions(-)
>>>
>>
>> Hi Liron,
>>
>> +1 to this change, but can you please make a new version to include
>> +build
>> related document changes into this same patch?
>>
>> Second patch updates document, both for this build related issues and other issues like new musdk version and supported features etc.. Instead you can move build related changes to this patch, and separate second patch for crypto and net, so that it can have proper commit logs for each and can be reviewed easier.
>>
>> [L.H.] the support for the pkg-config, which meson build relay on, requires newer musdk version. Can I create a platform doc for all Marvell ARMADA platforms?
> 
> Not sure if a platform doc is required just to document external library dependency.
> But if there is more to add to platform document, can you sent it as separate patch so it can be reviewed without blocking this set?
> 
> [L.H.] i can split the doc patch and add the meson part to this patch, but I will also need to include the musdk version as only in the new version the pkg-config support is included.
> Is that fine?
> 

Got it, that is fine but can you please highlight this in the commit log? (That 
only new specific version of the musdk supports pkg-config)

[dpdk-dev] [PATCH v2] meson: update meson build for armada drivers

[lironh]

From: Liron Himi <lironh@marvell.com>

With pkg-config support available within musdk library
(from musdk-release-SDK-10.3.5.0-PR2 version),
meson option 'lib_musdk_dir' can be removed.
PKG_CONFIG_PATH environment variable should be set appropriately
to use the musdk library.

docs are updated with new musdk version and meson instructions.

Signed-off-by: Liron Himi <lironh@marvell.com>
Reviewed-by: Liron Himi <lironh@marvell.com>
---
 doc/guides/nics/mvneta.rst         | 13 ++++++++-----
 doc/guides/nics/mvpp2.rst          | 15 +++++++++------
 drivers/common/mvep/meson.build    | 14 +++++---------
 drivers/crypto/mvsam/meson.build   | 15 +++++----------
 drivers/net/mvneta/meson.build     | 19 +++++--------------
 drivers/net/mvneta/mvneta_ethdev.h |  1 +
 drivers/net/mvpp2/meson.build      | 15 +++++----------
 meson_options.txt                  |  2 --
 8 files changed, 38 insertions(+), 56 deletions(-)

diff --git a/doc/guides/nics/mvneta.rst b/doc/guides/nics/mvneta.rst
index e8abde42d..56a555bd2 100644
--- a/doc/guides/nics/mvneta.rst
+++ b/doc/guides/nics/mvneta.rst
@@ -56,7 +56,7 @@ Prerequisites
 
   .. code-block:: console
 
-     git clone https://github.com/MarvellEmbeddedProcessors/musdk-marvell.git -b musdk-armada-18.09
+     git clone https://github.com/MarvellEmbeddedProcessors/musdk-marvell.git -b musdk-release-SDK-10.3.5.0-PR2
 
   MUSDK is a light-weight library that provides direct access to Marvell's
   NETA. Alternatively prebuilt MUSDK library can be
@@ -94,7 +94,7 @@ be passed as part of EAL arguments.
     -c 3 -- -i --p 3 -a
 
 
-Building DPDK
+Building MUSDK
 -------------
 
 Driver needs precompiled MUSDK library during compilation.
@@ -109,12 +109,15 @@ Driver needs precompiled MUSDK library during compilation.
 MUSDK will be installed to `usr/local` under current directory.
 For the detailed build instructions please consult ``doc/musdk_get_started.txt``.
 
-The path to the MUSDK installation directory needs to set in meson, shown in the
-following command:
+Building DPDK:
+
+Add path to libmusdk.pc in PKG_CONFIG_PATH environment variable.
 
 .. code-block:: console
 
-   meson -Dlib_musdk_dir=/path/to/musdk build ninja -C build
+   export PKG_CONFIG_PATH=$<musdk_install_dir>/lib/pkgconfig/:$PKG_CONFIG_PATH
+   meson build --cross-file config/arm/arm64_armada_linux_gcc
+   ninja -C build
 
 
 Usage Example
diff --git a/doc/guides/nics/mvpp2.rst b/doc/guides/nics/mvpp2.rst
index 6fbce8358..69724bdf9 100644
--- a/doc/guides/nics/mvpp2.rst
+++ b/doc/guides/nics/mvpp2.rst
@@ -91,7 +91,7 @@ Prerequisites
 
   .. code-block:: console
 
-     git clone https://github.com/MarvellEmbeddedProcessors/musdk-marvell.git -b musdk-armada-18.09
+     git clone https://github.com/MarvellEmbeddedProcessors/musdk-marvell.git -b musdk-release-SDK-10.3.5.0-PR2
 
   MUSDK is a light-weight library that provides direct access to Marvell's
   PPv2 (Packet Processor v2). Alternatively prebuilt MUSDK library can be
@@ -108,7 +108,7 @@ Prerequisites
   DPDK environment.
 
 
-Building DPDK
+Building MUSDK
 -------------
 
 Driver needs precompiled MUSDK library during compilation.
@@ -123,14 +123,17 @@ Driver needs precompiled MUSDK library during compilation.
 MUSDK will be installed to `usr/local` under current directory.
 For the detailed build instructions please consult ``doc/musdk_get_started.txt``.
 
-The path to the MUSDK installation directory needs to set in meson, shown in the
-command below.
 
-For additional instructions regarding DPDK cross compilation please refer to :doc:`Cross compile DPDK for ARM64 <../linux_gsg/cross_build_dpdk_for_arm64>`.
+Building DPDK:
+
+Add path to libmusdk.pc in PKG_CONFIG_PATH environment variable.
 
 .. code-block:: console
 
-   meson -Dlib_musdk_dir=/path/to/musdk build ninja -C build
+   export PKG_CONFIG_PATH=$<musdk_install_dir>/lib/pkgconfig/:$PKG_CONFIG_PATH
+
+   meson build --cross-file config/arm/arm64_armada_linux_gcc
+   ninja -C build
 
 
 Usage Example
diff --git a/drivers/common/mvep/meson.build b/drivers/common/mvep/meson.build
index 8df4bc6e0..863a20ab9 100644
--- a/drivers/common/mvep/meson.build
+++ b/drivers/common/mvep/meson.build
@@ -3,18 +3,14 @@
 # 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()
+dep = dependency('libmusdk', required: false)
+if not dep.found()
 	build = false
 	reason = 'missing dependency, "libmusdk"'
-else
-	ext_deps += lib
-	includes += include_directories(inc_dir)
-	cflags += ['-DMVCONF_TYPES_PUBLIC', '-DMVCONF_DMA_PHYS_ADDR_T_PUBLIC']
+	subdir_done()
 endif
 
+ext_deps += dep
+
 sources = files('mvep_common.c')
diff --git a/drivers/crypto/mvsam/meson.build b/drivers/crypto/mvsam/meson.build
index 6d97dc8a2..384eacff0 100644
--- a/drivers/crypto/mvsam/meson.build
+++ b/drivers/crypto/mvsam/meson.build
@@ -3,20 +3,15 @@
 # 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()
+dep = dependency('libmusdk', required: false)
+if not dep.found()
 	build = false
 	reason = 'missing dependency, "libmusdk"'
-else
-	ext_deps += lib
-	includes += include_directories(inc_dir)
-	cflags += ['-DMVCONF_TYPES_PUBLIC', '-DMVCONF_DMA_PHYS_ADDR_T_PUBLIC']
+	subdir_done()
 endif
 
+ext_deps += dep
+
 sources = files('rte_mrvl_pmd.c', 'rte_mrvl_pmd_ops.c')
 
 deps += ['bus_vdev', 'common_mvep']
diff --git a/drivers/net/mvneta/meson.build b/drivers/net/mvneta/meson.build
index 8d7202788..c887ddc10 100644
--- a/drivers/net/mvneta/meson.build
+++ b/drivers/net/mvneta/meson.build
@@ -3,24 +3,15 @@
 # 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()
+dep = dependency('libmusdk', required: false)
+if not dep.found()
 	build = false
 	reason = 'missing dependency, "libmusdk"'
-else
-	ext_deps += lib
-	includes += include_directories(inc_dir)
-	cflags += [
-	  '-DMVCONF_TYPES_PUBLIC',
-	  '-DMVCONF_DMA_PHYS_ADDR_T_PUBLIC',
-	  '-DMVCONF_DMA_PHYS_ADDR_T_SIZE=64'
-	]
+	subdir_done()
 endif
 
+ext_deps += dep
+
 sources = files(
 	'mvneta_ethdev.c',
 	'mvneta_rxtx.c'
diff --git a/drivers/net/mvneta/mvneta_ethdev.h b/drivers/net/mvneta/mvneta_ethdev.h
index ef8067790..e090abc25 100644
--- a/drivers/net/mvneta/mvneta_ethdev.h
+++ b/drivers/net/mvneta/mvneta_ethdev.h
@@ -21,6 +21,7 @@
 #undef container_of
 #endif
 
+#include <env/mv_autogen_comp_flags.h>
 #include <drivers/mv_neta.h>
 #include <drivers/mv_neta_ppio.h>
 
diff --git a/drivers/net/mvpp2/meson.build b/drivers/net/mvpp2/meson.build
index e06eddaac..3015a5559 100644
--- a/drivers/net/mvpp2/meson.build
+++ b/drivers/net/mvpp2/meson.build
@@ -3,20 +3,15 @@
 # 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()
+dep = dependency('libmusdk', required: false)
+if not dep.found()
 	build = false
 	reason = 'missing dependency, "libmusdk"'
-else
-	ext_deps += lib
-	includes += include_directories(inc_dir)
-	cflags += ['-DMVCONF_TYPES_PUBLIC', '-DMVCONF_DMA_PHYS_ADDR_T_PUBLIC']
+	subdir_done()
 endif
 
+ext_deps += dep
+
 sources = files(
 	'mrvl_ethdev.c',
 	'mrvl_flow.c',
diff --git a/meson_options.txt b/meson_options.txt
index 9bf18ab6b..63245b95d 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -20,8 +20,6 @@ option('include_subdir_arch', type: 'string', value: '',
 	description: 'subdirectory where to install arch-dependent headers')
 option('kernel_dir', type: 'string', value: '',
 	description: 'Path to the kernel for building kernel modules. Headers must be in $kernel_dir/build. Modules will be installed in $DEST_DIR/$kernel_dir/extra/dpdk.')
-option('lib_musdk_dir', type: 'string', value: '',
-	description: 'path to the MUSDK library installation directory')
 option('machine', type: 'string', value: 'native',
 	description: 'set the target machine type')
 option('max_ethports', type: 'integer', value: 32,
-- 
2.28.0

[dpdk-dev] [PATCH v2] meson: update meson build for armada drivers

[lironh]

From: Liron Himi <lironh@marvell.com>

With pkg-config support available within musdk library
(from musdk-release-SDK-10.3.5.0-PR2 version),
meson option 'lib_musdk_dir' can be removed.
PKG_CONFIG_PATH environment variable should be set appropriately
to use the musdk library.

docs are updated with new musdk version and meson instructions.

Signed-off-by: Liron Himi <lironh@marvell.com>
Reviewed-by: Liron Himi <lironh@marvell.com>
---
v2:
* include updated docs in this patch
* add musdk version in commit message
---
 doc/guides/nics/mvneta.rst         | 13 ++++++++-----
 doc/guides/nics/mvpp2.rst          | 15 +++++++++------
 drivers/common/mvep/meson.build    | 14 +++++---------
 drivers/crypto/mvsam/meson.build   | 15 +++++----------
 drivers/net/mvneta/meson.build     | 19 +++++--------------
 drivers/net/mvneta/mvneta_ethdev.h |  1 +
 drivers/net/mvpp2/meson.build      | 15 +++++----------
 meson_options.txt                  |  2 --
 8 files changed, 38 insertions(+), 56 deletions(-)

diff --git a/doc/guides/nics/mvneta.rst b/doc/guides/nics/mvneta.rst
index e8abde42d..56a555bd2 100644
--- a/doc/guides/nics/mvneta.rst
+++ b/doc/guides/nics/mvneta.rst
@@ -56,7 +56,7 @@ Prerequisites
 
   .. code-block:: console
 
-     git clone https://github.com/MarvellEmbeddedProcessors/musdk-marvell.git -b musdk-armada-18.09
+     git clone https://github.com/MarvellEmbeddedProcessors/musdk-marvell.git -b musdk-release-SDK-10.3.5.0-PR2
 
   MUSDK is a light-weight library that provides direct access to Marvell's
   NETA. Alternatively prebuilt MUSDK library can be
@@ -94,7 +94,7 @@ be passed as part of EAL arguments.
     -c 3 -- -i --p 3 -a
 
 
-Building DPDK
+Building MUSDK
 -------------
 
 Driver needs precompiled MUSDK library during compilation.
@@ -109,12 +109,15 @@ Driver needs precompiled MUSDK library during compilation.
 MUSDK will be installed to `usr/local` under current directory.
 For the detailed build instructions please consult ``doc/musdk_get_started.txt``.
 
-The path to the MUSDK installation directory needs to set in meson, shown in the
-following command:
+Building DPDK:
+
+Add path to libmusdk.pc in PKG_CONFIG_PATH environment variable.
 
 .. code-block:: console
 
-   meson -Dlib_musdk_dir=/path/to/musdk build ninja -C build
+   export PKG_CONFIG_PATH=$<musdk_install_dir>/lib/pkgconfig/:$PKG_CONFIG_PATH
+   meson build --cross-file config/arm/arm64_armada_linux_gcc
+   ninja -C build
 
 
 Usage Example
diff --git a/doc/guides/nics/mvpp2.rst b/doc/guides/nics/mvpp2.rst
index 6fbce8358..69724bdf9 100644
--- a/doc/guides/nics/mvpp2.rst
+++ b/doc/guides/nics/mvpp2.rst
@@ -91,7 +91,7 @@ Prerequisites
 
   .. code-block:: console
 
-     git clone https://github.com/MarvellEmbeddedProcessors/musdk-marvell.git -b musdk-armada-18.09
+     git clone https://github.com/MarvellEmbeddedProcessors/musdk-marvell.git -b musdk-release-SDK-10.3.5.0-PR2
 
   MUSDK is a light-weight library that provides direct access to Marvell's
   PPv2 (Packet Processor v2). Alternatively prebuilt MUSDK library can be
@@ -108,7 +108,7 @@ Prerequisites
   DPDK environment.
 
 
-Building DPDK
+Building MUSDK
 -------------
 
 Driver needs precompiled MUSDK library during compilation.
@@ -123,14 +123,17 @@ Driver needs precompiled MUSDK library during compilation.
 MUSDK will be installed to `usr/local` under current directory.
 For the detailed build instructions please consult ``doc/musdk_get_started.txt``.
 
-The path to the MUSDK installation directory needs to set in meson, shown in the
-command below.
 
-For additional instructions regarding DPDK cross compilation please refer to :doc:`Cross compile DPDK for ARM64 <../linux_gsg/cross_build_dpdk_for_arm64>`.
+Building DPDK:
+
+Add path to libmusdk.pc in PKG_CONFIG_PATH environment variable.
 
 .. code-block:: console
 
-   meson -Dlib_musdk_dir=/path/to/musdk build ninja -C build
+   export PKG_CONFIG_PATH=$<musdk_install_dir>/lib/pkgconfig/:$PKG_CONFIG_PATH
+
+   meson build --cross-file config/arm/arm64_armada_linux_gcc
+   ninja -C build
 
 
 Usage Example
diff --git a/drivers/common/mvep/meson.build b/drivers/common/mvep/meson.build
index 8df4bc6e0..863a20ab9 100644
--- a/drivers/common/mvep/meson.build
+++ b/drivers/common/mvep/meson.build
@@ -3,18 +3,14 @@
 # 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()
+dep = dependency('libmusdk', required: false)
+if not dep.found()
 	build = false
 	reason = 'missing dependency, "libmusdk"'
-else
-	ext_deps += lib
-	includes += include_directories(inc_dir)
-	cflags += ['-DMVCONF_TYPES_PUBLIC', '-DMVCONF_DMA_PHYS_ADDR_T_PUBLIC']
+	subdir_done()
 endif
 
+ext_deps += dep
+
 sources = files('mvep_common.c')
diff --git a/drivers/crypto/mvsam/meson.build b/drivers/crypto/mvsam/meson.build
index 6d97dc8a2..384eacff0 100644
--- a/drivers/crypto/mvsam/meson.build
+++ b/drivers/crypto/mvsam/meson.build
@@ -3,20 +3,15 @@
 # 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()
+dep = dependency('libmusdk', required: false)
+if not dep.found()
 	build = false
 	reason = 'missing dependency, "libmusdk"'
-else
-	ext_deps += lib
-	includes += include_directories(inc_dir)
-	cflags += ['-DMVCONF_TYPES_PUBLIC', '-DMVCONF_DMA_PHYS_ADDR_T_PUBLIC']
+	subdir_done()
 endif
 
+ext_deps += dep
+
 sources = files('rte_mrvl_pmd.c', 'rte_mrvl_pmd_ops.c')
 
 deps += ['bus_vdev', 'common_mvep']
diff --git a/drivers/net/mvneta/meson.build b/drivers/net/mvneta/meson.build
index 8d7202788..c887ddc10 100644
--- a/drivers/net/mvneta/meson.build
+++ b/drivers/net/mvneta/meson.build
@@ -3,24 +3,15 @@
 # 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()
+dep = dependency('libmusdk', required: false)
+if not dep.found()
 	build = false
 	reason = 'missing dependency, "libmusdk"'
-else
-	ext_deps += lib
-	includes += include_directories(inc_dir)
-	cflags += [
-	  '-DMVCONF_TYPES_PUBLIC',
-	  '-DMVCONF_DMA_PHYS_ADDR_T_PUBLIC',
-	  '-DMVCONF_DMA_PHYS_ADDR_T_SIZE=64'
-	]
+	subdir_done()
 endif
 
+ext_deps += dep
+
 sources = files(
 	'mvneta_ethdev.c',
 	'mvneta_rxtx.c'
diff --git a/drivers/net/mvneta/mvneta_ethdev.h b/drivers/net/mvneta/mvneta_ethdev.h
index ef8067790..e090abc25 100644
--- a/drivers/net/mvneta/mvneta_ethdev.h
+++ b/drivers/net/mvneta/mvneta_ethdev.h
@@ -21,6 +21,7 @@
 #undef container_of
 #endif
 
+#include <env/mv_autogen_comp_flags.h>
 #include <drivers/mv_neta.h>
 #include <drivers/mv_neta_ppio.h>
 
diff --git a/drivers/net/mvpp2/meson.build b/drivers/net/mvpp2/meson.build
index e06eddaac..3015a5559 100644
--- a/drivers/net/mvpp2/meson.build
+++ b/drivers/net/mvpp2/meson.build
@@ -3,20 +3,15 @@
 # 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()
+dep = dependency('libmusdk', required: false)
+if not dep.found()
 	build = false
 	reason = 'missing dependency, "libmusdk"'
-else
-	ext_deps += lib
-	includes += include_directories(inc_dir)
-	cflags += ['-DMVCONF_TYPES_PUBLIC', '-DMVCONF_DMA_PHYS_ADDR_T_PUBLIC']
+	subdir_done()
 endif
 
+ext_deps += dep
+
 sources = files(
 	'mrvl_ethdev.c',
 	'mrvl_flow.c',
diff --git a/meson_options.txt b/meson_options.txt
index 9bf18ab6b..63245b95d 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -20,8 +20,6 @@ option('include_subdir_arch', type: 'string', value: '',
 	description: 'subdirectory where to install arch-dependent headers')
 option('kernel_dir', type: 'string', value: '',
 	description: 'Path to the kernel for building kernel modules. Headers must be in $kernel_dir/build. Modules will be installed in $DEST_DIR/$kernel_dir/extra/dpdk.')
-option('lib_musdk_dir', type: 'string', value: '',
-	description: 'path to the MUSDK library installation directory')
 option('machine', type: 'string', value: 'native',
 	description: 'set the target machine type')
 option('max_ethports', type: 'integer', value: 32,
-- 
2.28.0

Re: [dpdk-dev] [PATCH v2] meson: update meson build for armada drivers

[Ferruh Yigit]

On 12/15/2020 10:23 PM, lironh@marvell.com wrote:
> From: Liron Himi <lironh@marvell.com>
> 
> With pkg-config support available within musdk library
> (from musdk-release-SDK-10.3.5.0-PR2 version),
> meson option 'lib_musdk_dir' can be removed.
> PKG_CONFIG_PATH environment variable should be set appropriately
> to use the musdk library.

Hi Liron,

It is good change to get rid of an custom meson option, can we or should we 
backport this to the v20.11?

> 
> docs are updated with new musdk version and meson instructions.
> 
> Signed-off-by: Liron Himi <lironh@marvell.com>
> Reviewed-by: Liron Himi <lironh@marvell.com>
> ---
> v2:
> * include updated docs in this patch
> * add musdk version in commit message
> ---
>   doc/guides/nics/mvneta.rst         | 13 ++++++++-----
>   doc/guides/nics/mvpp2.rst          | 15 +++++++++------
>   drivers/common/mvep/meson.build    | 14 +++++---------
>   drivers/crypto/mvsam/meson.build   | 15 +++++----------

@Ahil, is it OK if I get this to the next-net, since logically related?

>   drivers/net/mvneta/meson.build     | 19 +++++--------------
>   drivers/net/mvneta/mvneta_ethdev.h |  1 +
>   drivers/net/mvpp2/meson.build      | 15 +++++----------
>   meson_options.txt                  |  2 --
>   8 files changed, 38 insertions(+), 56 deletions(-)
> 

<...>

> @@ -94,7 +94,7 @@ be passed as part of EAL arguments.
>       -c 3 -- -i --p 3 -a
>   
>   
> -Building DPDK
> +Building MUSDK
>   -------------
>   

This is giving doc warning because of "Title underline too short".

<...>

> @@ -108,7 +108,7 @@ Prerequisites
>     DPDK environment.
>   
>   
> -Building DPDK
> +Building MUSDK
>   -------------
>   

Ditto.

<...>

> diff --git a/drivers/net/mvneta/mvneta_ethdev.h b/drivers/net/mvneta/mvneta_ethdev.h
> index ef8067790..e090abc25 100644
> --- a/drivers/net/mvneta/mvneta_ethdev.h
> +++ b/drivers/net/mvneta/mvneta_ethdev.h
> @@ -21,6 +21,7 @@
>   #undef container_of
>   #endif
>   
> +#include <env/mv_autogen_comp_flags.h>

Is this include related with this patch?

Re: [dpdk-dev] [EXT] Re: [PATCH v2] meson: update meson build for armada drivers

[Liron Himi]

-----Original Message-----
From: Ferruh Yigit <ferruh.yigit@intel.com> 
Sent: Wednesday, 16 December 2020 15:37
To: Liron Himi <lironh@marvell.com>
Cc: dev@dpdk.org; Luca Boccassi <bluca@debian.org>; Kevin Traynor <ktraynor@redhat.com>; Akhil Goyal <akhil.goyal@nxp.com>
Subject: [EXT] Re: [PATCH v2] meson: update meson build for armada drivers

External Email

----------------------------------------------------------------------
On 12/15/2020 10:23 PM, lironh@marvell.com wrote:
> From: Liron Himi <lironh@marvell.com>
> 
> With pkg-config support available within musdk library (from 
> musdk-release-SDK-10.3.5.0-PR2 version), meson option 'lib_musdk_dir' 
> can be removed.
> PKG_CONFIG_PATH environment variable should be set appropriately to 
> use the musdk library.

Hi Liron,

It is good change to get rid of an custom meson option, can we or should we backport this to the v20.11?
[L.H.] yes, it can be backported.

> 
> docs are updated with new musdk version and meson instructions.
> 
> Signed-off-by: Liron Himi <lironh@marvell.com>
> Reviewed-by: Liron Himi <lironh@marvell.com>
> ---
> v2:
> * include updated docs in this patch
> * add musdk version in commit message
> ---
>   doc/guides/nics/mvneta.rst         | 13 ++++++++-----
>   doc/guides/nics/mvpp2.rst          | 15 +++++++++------
>   drivers/common/mvep/meson.build    | 14 +++++---------
>   drivers/crypto/mvsam/meson.build   | 15 +++++----------

@Ahil, is it OK if I get this to the next-net, since logically related?

>   drivers/net/mvneta/meson.build     | 19 +++++--------------
>   drivers/net/mvneta/mvneta_ethdev.h |  1 +
>   drivers/net/mvpp2/meson.build      | 15 +++++----------
>   meson_options.txt                  |  2 --
>   8 files changed, 38 insertions(+), 56 deletions(-)
> 

<...>

> @@ -94,7 +94,7 @@ be passed as part of EAL arguments.
>       -c 3 -- -i --p 3 -a
>   
>   
> -Building DPDK
> +Building MUSDK
>   -------------
>   

This is giving doc warning because of "Title underline too short".
[L.H.] okay, will fix in v3

<...>

> @@ -108,7 +108,7 @@ Prerequisites
>     DPDK environment.
>   
>   
> -Building DPDK
> +Building MUSDK
>   -------------
>   

Ditto.
[L.H.] same

<...>

> diff --git a/drivers/net/mvneta/mvneta_ethdev.h 
> b/drivers/net/mvneta/mvneta_ethdev.h
> index ef8067790..e090abc25 100644
> --- a/drivers/net/mvneta/mvneta_ethdev.h
> +++ b/drivers/net/mvneta/mvneta_ethdev.h
> @@ -21,6 +21,7 @@
>   #undef container_of
>   #endif
>   
> +#include <env/mv_autogen_comp_flags.h>

Is this include related with this patch?
[L.H.] yes, without it meson build will fail

Re: [dpdk-dev] [EXT] Re: [PATCH v2] meson: update meson build for armada drivers

[Ferruh Yigit]

On 12/16/2020 1:41 PM, Liron Himi wrote:
> 
> -----Original Message-----
> From: Ferruh Yigit <ferruh.yigit@intel.com>
> Sent: Wednesday, 16 December 2020 15:37
> To: Liron Himi <lironh@marvell.com>
> Cc: dev@dpdk.org; Luca Boccassi <bluca@debian.org>; Kevin Traynor <ktraynor@redhat.com>; Akhil Goyal <akhil.goyal@nxp.com>
> Subject: [EXT] Re: [PATCH v2] meson: update meson build for armada drivers
> 
> External Email
> 
> ----------------------------------------------------------------------
> On 12/15/2020 10:23 PM, lironh@marvell.com wrote:
>> From: Liron Himi <lironh@marvell.com>
>>
>> With pkg-config support available within musdk library (from
>> musdk-release-SDK-10.3.5.0-PR2 version), meson option 'lib_musdk_dir'
>> can be removed.
>> PKG_CONFIG_PATH environment variable should be set appropriately to
>> use the musdk library.
> 
> Hi Liron,
> 
> It is good change to get rid of an custom meson option, can we or should we backport this to the v20.11?
> [L.H.] yes, it can be backported.
> 
>>
>> docs are updated with new musdk version and meson instructions.
>>
>> Signed-off-by: Liron Himi <lironh@marvell.com>
>> Reviewed-by: Liron Himi <lironh@marvell.com>
>> ---
>> v2:
>> * include updated docs in this patch
>> * add musdk version in commit message
>> ---
>>    doc/guides/nics/mvneta.rst         | 13 ++++++++-----
>>    doc/guides/nics/mvpp2.rst          | 15 +++++++++------
>>    drivers/common/mvep/meson.build    | 14 +++++---------
>>    drivers/crypto/mvsam/meson.build   | 15 +++++----------
> 
> @Ahil, is it OK if I get this to the next-net, since logically related?
> 
>>    drivers/net/mvneta/meson.build     | 19 +++++--------------
>>    drivers/net/mvneta/mvneta_ethdev.h |  1 +
>>    drivers/net/mvpp2/meson.build      | 15 +++++----------
>>    meson_options.txt                  |  2 --
>>    8 files changed, 38 insertions(+), 56 deletions(-)
>>
> 
> <...>
> 
>> @@ -94,7 +94,7 @@ be passed as part of EAL arguments.
>>        -c 3 -- -i --p 3 -a
>>    
>>    
>> -Building DPDK
>> +Building MUSDK
>>    -------------
>>    
> 
> This is giving doc warning because of "Title underline too short".
> [L.H.] okay, will fix in v3
> 
> <...>
> 
>> @@ -108,7 +108,7 @@ Prerequisites
>>      DPDK environment.
>>    
>>    
>> -Building DPDK
>> +Building MUSDK
>>    -------------
>>    
> 
> Ditto.
> [L.H.] same
> 
> <...>
> 
>> diff --git a/drivers/net/mvneta/mvneta_ethdev.h
>> b/drivers/net/mvneta/mvneta_ethdev.h
>> index ef8067790..e090abc25 100644
>> --- a/drivers/net/mvneta/mvneta_ethdev.h
>> +++ b/drivers/net/mvneta/mvneta_ethdev.h
>> @@ -21,6 +21,7 @@
>>    #undef container_of
>>    #endif
>>    
>> +#include <env/mv_autogen_comp_flags.h>
> 
> Is this include related with this patch?
> [L.H.] yes, without it meson build will fail
> 

There is no change in the code, how it was working before but failing now? Can 
you please give more details why it is needed?

Re: [dpdk-dev] [EXT] Re: [PATCH v2] meson: update meson build for armada drivers

[Ferruh Yigit]

On 12/16/2020 1:41 PM, Liron Himi wrote:
> 
> -----Original Message-----
> From: Ferruh Yigit <ferruh.yigit@intel.com>
> Sent: Wednesday, 16 December 2020 15:37
> To: Liron Himi <lironh@marvell.com>
> Cc: dev@dpdk.org; Luca Boccassi <bluca@debian.org>; Kevin Traynor <ktraynor@redhat.com>; Akhil Goyal <akhil.goyal@nxp.com>
> Subject: [EXT] Re: [PATCH v2] meson: update meson build for armada drivers
> 
> External Email
> 
> ----------------------------------------------------------------------
> On 12/15/2020 10:23 PM, lironh@marvell.com wrote:
>> From: Liron Himi <lironh@marvell.com>
>>
>> With pkg-config support available within musdk library (from
>> musdk-release-SDK-10.3.5.0-PR2 version), meson option 'lib_musdk_dir'
>> can be removed.
>> PKG_CONFIG_PATH environment variable should be set appropriately to
>> use the musdk library.
> 
> Hi Liron,
> 
> It is good change to get rid of an custom meson option, can we or should we backport this to the v20.11?
> [L.H.] yes, it can be backported.
> 

Kevin, Luca,

What do you think about backporting this patch to 19.11 & 20.11, it removes 
'lib_musdk_dir' custom meson config option and uses pkg-config to find the musdk 
libraries.

It looks good change but not sure if it is a regression to remove a build option.

Thanks,
ferruh

Re: [dpdk-dev] [EXT] Re: [PATCH v2] meson: update meson build for armada drivers

[Liron Himi]

-----Original Message-----
From: Ferruh Yigit <ferruh.yigit@intel.com> 
Sent: Wednesday, 16 December 2020 15:49
To: Liron Himi <lironh@marvell.com>
Cc: dev@dpdk.org; Luca Boccassi <bluca@debian.org>; Kevin Traynor <ktraynor@redhat.com>; Akhil Goyal <akhil.goyal@nxp.com>
Subject: Re: [EXT] Re: [PATCH v2] meson: update meson build for armada drivers

On 12/16/2020 1:41 PM, Liron Himi wrote:
> 
> -----Original Message-----
> From: Ferruh Yigit <ferruh.yigit@intel.com>
> Sent: Wednesday, 16 December 2020 15:37
> To: Liron Himi <lironh@marvell.com>
> Cc: dev@dpdk.org; Luca Boccassi <bluca@debian.org>; Kevin Traynor 
> <ktraynor@redhat.com>; Akhil Goyal <akhil.goyal@nxp.com>
> Subject: [EXT] Re: [PATCH v2] meson: update meson build for armada 
> drivers
> 
> External Email
> 
> ----------------------------------------------------------------------
> On 12/15/2020 10:23 PM, lironh@marvell.com wrote:
>> From: Liron Himi <lironh@marvell.com>
>>
>> With pkg-config support available within musdk library (from
>> musdk-release-SDK-10.3.5.0-PR2 version), meson option 'lib_musdk_dir'
>> can be removed.
>> PKG_CONFIG_PATH environment variable should be set appropriately to 
>> use the musdk library.
> 
> Hi Liron,
> 
> It is good change to get rid of an custom meson option, can we or should we backport this to the v20.11?
> [L.H.] yes, it can be backported.
> 
>>
>> docs are updated with new musdk version and meson instructions.
>>
>> Signed-off-by: Liron Himi <lironh@marvell.com>
>> Reviewed-by: Liron Himi <lironh@marvell.com>
>> ---
>> v2:
>> * include updated docs in this patch
>> * add musdk version in commit message
>> ---
>>    doc/guides/nics/mvneta.rst         | 13 ++++++++-----
>>    doc/guides/nics/mvpp2.rst          | 15 +++++++++------
>>    drivers/common/mvep/meson.build    | 14 +++++---------
>>    drivers/crypto/mvsam/meson.build   | 15 +++++----------
> 
> @Ahil, is it OK if I get this to the next-net, since logically related?
> 
>>    drivers/net/mvneta/meson.build     | 19 +++++--------------
>>    drivers/net/mvneta/mvneta_ethdev.h |  1 +
>>    drivers/net/mvpp2/meson.build      | 15 +++++----------
>>    meson_options.txt                  |  2 --
>>    8 files changed, 38 insertions(+), 56 deletions(-)
>>
> 
> <...>
> 
>> @@ -94,7 +94,7 @@ be passed as part of EAL arguments.
>>        -c 3 -- -i --p 3 -a
>>    
>>    
>> -Building DPDK
>> +Building MUSDK
>>    -------------
>>    
> 
> This is giving doc warning because of "Title underline too short".
> [L.H.] okay, will fix in v3
> 
> <...>
> 
>> @@ -108,7 +108,7 @@ Prerequisites
>>      DPDK environment.
>>    
>>    
>> -Building DPDK
>> +Building MUSDK
>>    -------------
>>    
> 
> Ditto.
> [L.H.] same
> 
> <...>
> 
>> diff --git a/drivers/net/mvneta/mvneta_ethdev.h
>> b/drivers/net/mvneta/mvneta_ethdev.h
>> index ef8067790..e090abc25 100644
>> --- a/drivers/net/mvneta/mvneta_ethdev.h
>> +++ b/drivers/net/mvneta/mvneta_ethdev.h
>> @@ -21,6 +21,7 @@
>>    #undef container_of
>>    #endif
>>    
>> +#include <env/mv_autogen_comp_flags.h>
> 
> Is this include related with this patch?
> [L.H.] yes, without it meson build will fail
> 

There is no change in the code, how it was working before but failing now? Can you please give more details why it is needed?
[L.H.] I have updated the musdk pkg-config, so this change is not needed.  Will be removed in v3

[dpdk-dev] [PATCH v3] meson: update meson build for armada drivers

[lironh]

From: Liron Himi <lironh@marvell.com>

With pkg-config support available within musdk library
(from musdk-release-SDK-10.3.5.0-PR2 version),
meson option 'lib_musdk_dir' can be removed.
PKG_CONFIG_PATH environment variable should be set appropriately
to use the musdk library.

docs are updated with new musdk version and meson instructions.

Signed-off-by: Liron Himi <lironh@marvell.com>
Reviewed-by: Liron Himi <lironh@marvell.com>
---
v3:
* fix sphinx warnings
* remove mvneta_ethdev.h

v2:
* include updated docs in this patch
* add musdk version in commit message
---
 doc/guides/nics/mvneta.rst       | 16 ++++++++++------
 doc/guides/nics/mvpp2.rst        | 18 +++++++++++-------
 drivers/common/mvep/meson.build  | 14 +++++---------
 drivers/crypto/mvsam/meson.build | 15 +++++----------
 drivers/net/mvneta/meson.build   | 19 +++++--------------
 drivers/net/mvpp2/meson.build    | 15 +++++----------
 meson_options.txt                |  2 --
 7 files changed, 41 insertions(+), 58 deletions(-)

diff --git a/doc/guides/nics/mvneta.rst b/doc/guides/nics/mvneta.rst
index e8abde42d..3124cc944 100644
--- a/doc/guides/nics/mvneta.rst
+++ b/doc/guides/nics/mvneta.rst
@@ -56,7 +56,7 @@ Prerequisites
 
   .. code-block:: console
 
-     git clone https://github.com/MarvellEmbeddedProcessors/musdk-marvell.git -b musdk-armada-18.09
+     git clone https://github.com/MarvellEmbeddedProcessors/musdk-marvell.git -b musdk-release-SDK-10.3.5.0-PR2
 
   MUSDK is a light-weight library that provides direct access to Marvell's
   NETA. Alternatively prebuilt MUSDK library can be
@@ -94,8 +94,8 @@ be passed as part of EAL arguments.
     -c 3 -- -i --p 3 -a
 
 
-Building DPDK
--------------
+Building MUSDK
+--------------
 
 Driver needs precompiled MUSDK library during compilation.
 
@@ -109,12 +109,16 @@ Driver needs precompiled MUSDK library during compilation.
 MUSDK will be installed to `usr/local` under current directory.
 For the detailed build instructions please consult ``doc/musdk_get_started.txt``.
 
-The path to the MUSDK installation directory needs to set in meson, shown in the
-following command:
+Building DPDK
+-------------
+
+Add path to libmusdk.pc in PKG_CONFIG_PATH environment variable.
 
 .. code-block:: console
 
-   meson -Dlib_musdk_dir=/path/to/musdk build ninja -C build
+   export PKG_CONFIG_PATH=$<musdk_install_dir>/lib/pkgconfig/:$PKG_CONFIG_PATH
+   meson build --cross-file config/arm/arm64_armada_linux_gcc
+   ninja -C build
 
 
 Usage Example
diff --git a/doc/guides/nics/mvpp2.rst b/doc/guides/nics/mvpp2.rst
index 6fbce8358..f290d36a0 100644
--- a/doc/guides/nics/mvpp2.rst
+++ b/doc/guides/nics/mvpp2.rst
@@ -91,7 +91,7 @@ Prerequisites
 
   .. code-block:: console
 
-     git clone https://github.com/MarvellEmbeddedProcessors/musdk-marvell.git -b musdk-armada-18.09
+     git clone https://github.com/MarvellEmbeddedProcessors/musdk-marvell.git -b musdk-release-SDK-10.3.5.0-PR2
 
   MUSDK is a light-weight library that provides direct access to Marvell's
   PPv2 (Packet Processor v2). Alternatively prebuilt MUSDK library can be
@@ -108,8 +108,8 @@ Prerequisites
   DPDK environment.
 
 
-Building DPDK
--------------
+Building MUSDK
+--------------
 
 Driver needs precompiled MUSDK library during compilation.
 
@@ -123,14 +123,18 @@ Driver needs precompiled MUSDK library during compilation.
 MUSDK will be installed to `usr/local` under current directory.
 For the detailed build instructions please consult ``doc/musdk_get_started.txt``.
 
-The path to the MUSDK installation directory needs to set in meson, shown in the
-command below.
 
-For additional instructions regarding DPDK cross compilation please refer to :doc:`Cross compile DPDK for ARM64 <../linux_gsg/cross_build_dpdk_for_arm64>`.
+Building DPDK
+-------------
+
+Add path to libmusdk.pc in PKG_CONFIG_PATH environment variable.
 
 .. code-block:: console
 
-   meson -Dlib_musdk_dir=/path/to/musdk build ninja -C build
+   export PKG_CONFIG_PATH=$<musdk_install_dir>/lib/pkgconfig/:$PKG_CONFIG_PATH
+
+   meson build --cross-file config/arm/arm64_armada_linux_gcc
+   ninja -C build
 
 
 Usage Example
diff --git a/drivers/common/mvep/meson.build b/drivers/common/mvep/meson.build
index 8df4bc6e0..863a20ab9 100644
--- a/drivers/common/mvep/meson.build
+++ b/drivers/common/mvep/meson.build
@@ -3,18 +3,14 @@
 # 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()
+dep = dependency('libmusdk', required: false)
+if not dep.found()
 	build = false
 	reason = 'missing dependency, "libmusdk"'
-else
-	ext_deps += lib
-	includes += include_directories(inc_dir)
-	cflags += ['-DMVCONF_TYPES_PUBLIC', '-DMVCONF_DMA_PHYS_ADDR_T_PUBLIC']
+	subdir_done()
 endif
 
+ext_deps += dep
+
 sources = files('mvep_common.c')
diff --git a/drivers/crypto/mvsam/meson.build b/drivers/crypto/mvsam/meson.build
index 6d97dc8a2..384eacff0 100644
--- a/drivers/crypto/mvsam/meson.build
+++ b/drivers/crypto/mvsam/meson.build
@@ -3,20 +3,15 @@
 # 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()
+dep = dependency('libmusdk', required: false)
+if not dep.found()
 	build = false
 	reason = 'missing dependency, "libmusdk"'
-else
-	ext_deps += lib
-	includes += include_directories(inc_dir)
-	cflags += ['-DMVCONF_TYPES_PUBLIC', '-DMVCONF_DMA_PHYS_ADDR_T_PUBLIC']
+	subdir_done()
 endif
 
+ext_deps += dep
+
 sources = files('rte_mrvl_pmd.c', 'rte_mrvl_pmd_ops.c')
 
 deps += ['bus_vdev', 'common_mvep']
diff --git a/drivers/net/mvneta/meson.build b/drivers/net/mvneta/meson.build
index 8d7202788..c887ddc10 100644
--- a/drivers/net/mvneta/meson.build
+++ b/drivers/net/mvneta/meson.build
@@ -3,24 +3,15 @@
 # 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()
+dep = dependency('libmusdk', required: false)
+if not dep.found()
 	build = false
 	reason = 'missing dependency, "libmusdk"'
-else
-	ext_deps += lib
-	includes += include_directories(inc_dir)
-	cflags += [
-	  '-DMVCONF_TYPES_PUBLIC',
-	  '-DMVCONF_DMA_PHYS_ADDR_T_PUBLIC',
-	  '-DMVCONF_DMA_PHYS_ADDR_T_SIZE=64'
-	]
+	subdir_done()
 endif
 
+ext_deps += dep
+
 sources = files(
 	'mvneta_ethdev.c',
 	'mvneta_rxtx.c'
diff --git a/drivers/net/mvpp2/meson.build b/drivers/net/mvpp2/meson.build
index e06eddaac..3015a5559 100644
--- a/drivers/net/mvpp2/meson.build
+++ b/drivers/net/mvpp2/meson.build
@@ -3,20 +3,15 @@
 # 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()
+dep = dependency('libmusdk', required: false)
+if not dep.found()
 	build = false
 	reason = 'missing dependency, "libmusdk"'
-else
-	ext_deps += lib
-	includes += include_directories(inc_dir)
-	cflags += ['-DMVCONF_TYPES_PUBLIC', '-DMVCONF_DMA_PHYS_ADDR_T_PUBLIC']
+	subdir_done()
 endif
 
+ext_deps += dep
+
 sources = files(
 	'mrvl_ethdev.c',
 	'mrvl_flow.c',
diff --git a/meson_options.txt b/meson_options.txt
index 9bf18ab6b..63245b95d 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -20,8 +20,6 @@ option('include_subdir_arch', type: 'string', value: '',
 	description: 'subdirectory where to install arch-dependent headers')
 option('kernel_dir', type: 'string', value: '',
 	description: 'Path to the kernel for building kernel modules. Headers must be in $kernel_dir/build. Modules will be installed in $DEST_DIR/$kernel_dir/extra/dpdk.')
-option('lib_musdk_dir', type: 'string', value: '',
-	description: 'path to the MUSDK library installation directory')
 option('machine', type: 'string', value: 'native',
 	description: 'set the target machine type')
 option('max_ethports', type: 'integer', value: 32,
-- 
2.28.0

Re: [dpdk-dev] [EXT] Re: [PATCH v2] meson: update meson build for armada drivers

[Luca Boccassi]

On Wed, 2020-12-16 at 13:52 +0000, Ferruh Yigit wrote:
> On 12/16/2020 1:41 PM, Liron Himi wrote:
> > -----Original Message-----
> > From: Ferruh Yigit <ferruh.yigit@intel.com>
> > Sent: Wednesday, 16 December 2020 15:37
> > To: Liron Himi <lironh@marvell.com>
> > Cc: dev@dpdk.org; Luca Boccassi <bluca@debian.org>; Kevin Traynor <ktraynor@redhat.com>; Akhil Goyal <akhil.goyal@nxp.com>
> > Subject: [EXT] Re: [PATCH v2] meson: update meson build for armada drivers
> > 
> > External Email
> > 
> > ----------------------------------------------------------------------
> > On 12/15/2020 10:23 PM, lironh@marvell.com wrote:
> > > From: Liron Himi <lironh@marvell.com>
> > > 
> > > With pkg-config support available within musdk library (from
> > > musdk-release-SDK-10.3.5.0-PR2 version), meson option 'lib_musdk_dir'
> > > can be removed.
> > > PKG_CONFIG_PATH environment variable should be set appropriately to
> > > use the musdk library.
> > 
> > Hi Liron,
> > 
> > It is good change to get rid of an custom meson option, can we or should we backport this to the v20.11?
> > [L.H.] yes, it can be backported.
> > 
> 
> Kevin, Luca,
> 
> What do you think about backporting this patch to 19.11 & 20.11, it removes 
> 'lib_musdk_dir' custom meson config option and uses pkg-config to find the musdk 
> libraries.
> 
> It looks good change but not sure if it is a regression to remove a build option.
> 
> Thanks,
> ferruh

I don't know how used it is, but removing a meson_option is no good for
LTS. If there is no functionality/build breakage and it's 100%
compatible, it could be made a no-op - that would be acceptable for me.

-- 
Kind regards,
Luca Boccassi

Re: [dpdk-dev] [EXT] Re: [PATCH v2] meson: update meson build for armada drivers

[Ferruh Yigit]

On 12/17/2020 10:06 AM, Luca Boccassi wrote:
> On Wed, 2020-12-16 at 13:52 +0000, Ferruh Yigit wrote:
>> On 12/16/2020 1:41 PM, Liron Himi wrote:
>>> -----Original Message-----
>>> From: Ferruh Yigit <ferruh.yigit@intel.com>
>>> Sent: Wednesday, 16 December 2020 15:37
>>> To: Liron Himi <lironh@marvell.com>
>>> Cc: dev@dpdk.org; Luca Boccassi <bluca@debian.org>; Kevin Traynor <ktraynor@redhat.com>; Akhil Goyal <akhil.goyal@nxp.com>
>>> Subject: [EXT] Re: [PATCH v2] meson: update meson build for armada drivers
>>>
>>> External Email
>>>
>>> ----------------------------------------------------------------------
>>> On 12/15/2020 10:23 PM, lironh@marvell.com wrote:
>>>> From: Liron Himi <lironh@marvell.com>
>>>>
>>>> With pkg-config support available within musdk library (from
>>>> musdk-release-SDK-10.3.5.0-PR2 version), meson option 'lib_musdk_dir'
>>>> can be removed.
>>>> PKG_CONFIG_PATH environment variable should be set appropriately to
>>>> use the musdk library.
>>>
>>> Hi Liron,
>>>
>>> It is good change to get rid of an custom meson option, can we or should we backport this to the v20.11?
>>> [L.H.] yes, it can be backported.
>>>
>>
>> Kevin, Luca,
>>
>> What do you think about backporting this patch to 19.11 & 20.11, it removes
>> 'lib_musdk_dir' custom meson config option and uses pkg-config to find the musdk
>> libraries.
>>
>> It looks good change but not sure if it is a regression to remove a build option.
>>
>> Thanks,
>> ferruh
> 
> I don't know how used it is, but removing a meson_option is no good for
> LTS. If there is no functionality/build breakage and it's 100%
> compatible, it could be made a no-op - that would be acceptable for me.
> 

It may affect the ones using 'lib_musdk_dir' meson config, if the removing a 
meson_option is not wanted, perhaps better to not backport this. Thanks.

Re: [dpdk-dev] [PATCH v3] meson: update meson build for armada drivers

[Ferruh Yigit]

On 12/16/2020 9:36 PM, lironh@marvell.com wrote:
> From: Liron Himi <lironh@marvell.com>
> 
> With pkg-config support available within musdk library
> (from musdk-release-SDK-10.3.5.0-PR2 version),
> meson option 'lib_musdk_dir' can be removed.
> PKG_CONFIG_PATH environment variable should be set appropriately
> to use the musdk library.
> 
> docs are updated with new musdk version and meson instructions.
> 
> Signed-off-by: Liron Himi <lironh@marvell.com>

Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>

Applied to dpdk-next-net/main, thanks.

Re: [dpdk-dev] [PATCH v3] meson: update meson build for armada drivers

[Thomas Monjalon]

16/12/2020 22:36, lironh@marvell.com:
> From: Liron Himi <lironh@marvell.com>
> 
> With pkg-config support available within musdk library
> (from musdk-release-SDK-10.3.5.0-PR2 version),
> meson option 'lib_musdk_dir' can be removed.
> PKG_CONFIG_PATH environment variable should be set appropriately
> to use the musdk library.

Sorry, it does not work.

First, when installing MUSDK, the .pc file is not updated
with the correct prefix path:
	make install DESTDIR=$(readlink -f install)
In install/mv/lib/pkgconfig/libmusdk.pc:
	prefix=/mv
instead of:
	prefix=/musdk_path/install/mv

Second, after manually fixing the prefix path and compiling DPDK:

In file included from musdk/install/mv/include/mv_std.h:101,
                 from musdk/install/mv/include/drivers/mv_neta.h:100,
                 from dpdk/drivers/net/mvneta/mvneta_ethdev.h:24,
                 from dpdk/drivers/net/mvneta/mvneta_rxtx.h:10,
                 from dpdk/drivers/net/mvneta/mvneta_rxtx.c:7:
musdk/install/mv/include/env/mv_autogen_build_assert.h:43:5: error:
"MVCONF_DMA_PHYS_ADDR_T_SIZE" is not defined, evaluates to 0 [-Werror=undef]
musdk/install/mv/include/env/mv_autogen_build_assert.h:44:2: error:
#error "MVCONF_DMA_PHYS_ADDR_T_SIZE must match size used during musdk_lib compilation."

The CFLAGS may be incomplete:
	Cflags: -I${includedir} -DMVCONF_TYPES_PUBLIC -DMVCONF_DMA_PHYS_ADDR_T_PUBLIC
I fixed it by adding:
	-DMVCONF_DMA_PHYS_ADDR_T_SIZE=64

Please could you fix MUSDK quickly?

I think I will pull next-net as is, but I consider it is broken.

Re: [dpdk-dev] [EXT] Re: [PATCH v3] meson: update meson build for armada drivers

[Liron Himi]

Hi Thomas,

When did you take this MUSDK version?
Is this your head "pkg-config: expose dma-add-size"?
If not, this explain the mvneta issue. I already noticed that and pushed a fixed to the github.

As for the prefix issue,
The prefix is being set in the 'configure' phase by using the '--prefix' variable. Have you tried that?

Liron Himi

-----Original Message-----
From: Thomas Monjalon <thomas@monjalon.net> 
Sent: Monday, 11 January 2021 13:28
To: Liron Himi <lironh@marvell.com>
Cc: ferruh.yigit@intel.com; dev@dpdk.org; Jerin Jacob Kollanukkaran <jerinj@marvell.com>
Subject: [EXT] Re: [dpdk-dev] [PATCH v3] meson: update meson build for armada drivers

External Email

----------------------------------------------------------------------
16/12/2020 22:36, lironh@marvell.com:
> From: Liron Himi <lironh@marvell.com>
> 
> With pkg-config support available within musdk library (from 
> musdk-release-SDK-10.3.5.0-PR2 version), meson option 'lib_musdk_dir' 
> can be removed.
> PKG_CONFIG_PATH environment variable should be set appropriately to 
> use the musdk library.

Sorry, it does not work.

First, when installing MUSDK, the .pc file is not updated with the correct prefix path:
	make install DESTDIR=$(readlink -f install) In install/mv/lib/pkgconfig/libmusdk.pc:
	prefix=/mv
instead of:
	prefix=/musdk_path/install/mv

Second, after manually fixing the prefix path and compiling DPDK:

In file included from musdk/install/mv/include/mv_std.h:101,
                 from musdk/install/mv/include/drivers/mv_neta.h:100,
                 from dpdk/drivers/net/mvneta/mvneta_ethdev.h:24,
                 from dpdk/drivers/net/mvneta/mvneta_rxtx.h:10,
                 from dpdk/drivers/net/mvneta/mvneta_rxtx.c:7:
musdk/install/mv/include/env/mv_autogen_build_assert.h:43:5: error:
"MVCONF_DMA_PHYS_ADDR_T_SIZE" is not defined, evaluates to 0 [-Werror=undef]
musdk/install/mv/include/env/mv_autogen_build_assert.h:44:2: error:
#error "MVCONF_DMA_PHYS_ADDR_T_SIZE must match size used during musdk_lib compilation."

The CFLAGS may be incomplete:
	Cflags: -I${includedir} -DMVCONF_TYPES_PUBLIC -DMVCONF_DMA_PHYS_ADDR_T_PUBLIC I fixed it by adding:
	-DMVCONF_DMA_PHYS_ADDR_T_SIZE=64

Please could you fix MUSDK quickly?

I think I will pull next-net as is, but I consider it is broken.

Re: [dpdk-dev] [EXT] Re: [PATCH v3] meson: update meson build for armada drivers

[Thomas Monjalon]

11/01/2021 16:29, Liron Himi:
> Hi Thomas,
> 
> When did you take this MUSDK version?
> Is this your head "pkg-config: expose dma-add-size"?

I'm using musdk-SDK-10.3.5.0-PR2 as recommended in the doc.

> If not, this explain the mvneta issue.
> I already noticed that and pushed a fixed to the github.

I see. So it may need a doc update.

> As for the prefix issue,
> The prefix is being set in the 'configure' phase by using the '--prefix' variable. Have you tried that?

No I didn't try that, and I'm using DESTDIR variable when installing.
Whould it be possible to update the prefix with DESTDIR when installing?



> -----Original Message-----
> From: Thomas Monjalon <thomas@monjalon.net> 
> Sent: Monday, 11 January 2021 13:28
> To: Liron Himi <lironh@marvell.com>
> Cc: ferruh.yigit@intel.com; dev@dpdk.org; Jerin Jacob Kollanukkaran <jerinj@marvell.com>
> Subject: [EXT] Re: [dpdk-dev] [PATCH v3] meson: update meson build for armada drivers
> 
> External Email
> 
> ----------------------------------------------------------------------
> 16/12/2020 22:36, lironh@marvell.com:
> > From: Liron Himi <lironh@marvell.com>
> > 
> > With pkg-config support available within musdk library (from 
> > musdk-release-SDK-10.3.5.0-PR2 version), meson option 'lib_musdk_dir' 
> > can be removed.
> > PKG_CONFIG_PATH environment variable should be set appropriately to 
> > use the musdk library.
> 
> Sorry, it does not work.
> 
> First, when installing MUSDK, the .pc file is not updated with the correct prefix path:
> 	make install DESTDIR=$(readlink -f install) In install/mv/lib/pkgconfig/libmusdk.pc:
> 	prefix=/mv
> instead of:
> 	prefix=/musdk_path/install/mv
> 
> Second, after manually fixing the prefix path and compiling DPDK:
> 
> In file included from musdk/install/mv/include/mv_std.h:101,
>                  from musdk/install/mv/include/drivers/mv_neta.h:100,
>                  from dpdk/drivers/net/mvneta/mvneta_ethdev.h:24,
>                  from dpdk/drivers/net/mvneta/mvneta_rxtx.h:10,
>                  from dpdk/drivers/net/mvneta/mvneta_rxtx.c:7:
> musdk/install/mv/include/env/mv_autogen_build_assert.h:43:5: error:
> "MVCONF_DMA_PHYS_ADDR_T_SIZE" is not defined, evaluates to 0 [-Werror=undef]
> musdk/install/mv/include/env/mv_autogen_build_assert.h:44:2: error:
> #error "MVCONF_DMA_PHYS_ADDR_T_SIZE must match size used during musdk_lib compilation."
> 
> The CFLAGS may be incomplete:
> 	Cflags: -I${includedir} -DMVCONF_TYPES_PUBLIC -DMVCONF_DMA_PHYS_ADDR_T_PUBLIC I fixed it by adding:
> 	-DMVCONF_DMA_PHYS_ADDR_T_SIZE=64
> 
> Please could you fix MUSDK quickly?
> 
> I think I will pull next-net as is, but I consider it is broken.
> 
> 
> 

Re: [dpdk-dev] [EXT] Re: [PATCH v3] meson: update meson build for armada drivers

[Liron Himi]

-----Original Message-----
From: Thomas Monjalon <thomas@monjalon.net> 
Sent: Monday, 11 January 2021 18:05
To: Liron Himi <lironh@marvell.com>
Cc: ferruh.yigit@intel.com; dev@dpdk.org; Jerin Jacob Kollanukkaran <jerinj@marvell.com>; Liron Himi <lironh@marvell.com>
Subject: Re: [EXT] Re: [dpdk-dev] [PATCH v3] meson: update meson build for armada drivers

11/01/2021 16:29, Liron Himi:
> Hi Thomas,
> 
> When did you take this MUSDK version?
> Is this your head "pkg-config: expose dma-add-size"?

I'm using musdk-SDK-10.3.5.0-PR2 as recommended in the doc.

> If not, this explain the mvneta issue.
> I already noticed that and pushed a fixed to the github.

I see. So it may need a doc update.
[L.H.] why need to update the doc? It is still the same release branch, I just added a fix patch to it.

> As for the prefix issue,
> The prefix is being set in the 'configure' phase by using the '--prefix' variable. Have you tried that?

No I didn't try that, and I'm using DESTDIR variable when installing.
Whould it be possible to update the prefix with DESTDIR when installing?
[L.H.] need to explore this option. But for now use 'prefix', as this is what supported by MUSDK



> -----Original Message-----
> From: Thomas Monjalon <thomas@monjalon.net>
> Sent: Monday, 11 January 2021 13:28
> To: Liron Himi <lironh@marvell.com>
> Cc: ferruh.yigit@intel.com; dev@dpdk.org; Jerin Jacob Kollanukkaran 
> <jerinj@marvell.com>
> Subject: [EXT] Re: [dpdk-dev] [PATCH v3] meson: update meson build for 
> armada drivers
> 
> External Email
> 
> ----------------------------------------------------------------------
> 16/12/2020 22:36, lironh@marvell.com:
> > From: Liron Himi <lironh@marvell.com>
> > 
> > With pkg-config support available within musdk library (from
> > musdk-release-SDK-10.3.5.0-PR2 version), meson option 'lib_musdk_dir' 
> > can be removed.
> > PKG_CONFIG_PATH environment variable should be set appropriately to 
> > use the musdk library.
> 
> Sorry, it does not work.
> 
> First, when installing MUSDK, the .pc file is not updated with the correct prefix path:
> 	make install DESTDIR=$(readlink -f install) In install/mv/lib/pkgconfig/libmusdk.pc:
> 	prefix=/mv
> instead of:
> 	prefix=/musdk_path/install/mv
> 
> Second, after manually fixing the prefix path and compiling DPDK:
> 
> In file included from musdk/install/mv/include/mv_std.h:101,
>                  from musdk/install/mv/include/drivers/mv_neta.h:100,
>                  from dpdk/drivers/net/mvneta/mvneta_ethdev.h:24,
>                  from dpdk/drivers/net/mvneta/mvneta_rxtx.h:10,
>                  from dpdk/drivers/net/mvneta/mvneta_rxtx.c:7:
> musdk/install/mv/include/env/mv_autogen_build_assert.h:43:5: error:
> "MVCONF_DMA_PHYS_ADDR_T_SIZE" is not defined, evaluates to 0 
> [-Werror=undef]
> musdk/install/mv/include/env/mv_autogen_build_assert.h:44:2: error:
> #error "MVCONF_DMA_PHYS_ADDR_T_SIZE must match size used during musdk_lib compilation."
> 
> The CFLAGS may be incomplete:
> 	Cflags: -I${includedir} -DMVCONF_TYPES_PUBLIC -DMVCONF_DMA_PHYS_ADDR_T_PUBLIC I fixed it by adding:
> 	-DMVCONF_DMA_PHYS_ADDR_T_SIZE=64
> 
> Please could you fix MUSDK quickly?
> 
> I think I will pull next-net as is, but I consider it is broken.
> 
> 
> 

Re: [dpdk-dev] [EXT] Re: [PATCH v3] meson: update meson build for armada drivers

[Thomas Monjalon]

11/01/2021 17:08, Liron Himi:
> From: Thomas Monjalon <thomas@monjalon.net> 
> Sent: Monday, 11 January 2021 18:05
> To: Liron Himi <lironh@marvell.com>
> Cc: ferruh.yigit@intel.com; dev@dpdk.org; Jerin Jacob Kollanukkaran <jerinj@marvell.com>; Liron Himi <lironh@marvell.com>
> Subject: Re: [EXT] Re: [dpdk-dev] [PATCH v3] meson: update meson build for armada drivers
> 
> 11/01/2021 16:29, Liron Himi:
> > Hi Thomas,
> > 
> > When did you take this MUSDK version?
> > Is this your head "pkg-config: expose dma-add-size"?
> 
> I'm using musdk-SDK-10.3.5.0-PR2 as recommended in the doc.
> 
> > If not, this explain the mvneta issue.
> > I already noticed that and pushed a fixed to the github.
> 
> I see. So it may need a doc update.
> [L.H.] why need to update the doc? It is still the same release branch, I just added a fix patch to it.

Yes, my bad: I used the tag musdk-SDK-10.3.5.0-PR2
instead of the branch musdk-release-SDK-10.3.5.0-PR2.

> > As for the prefix issue,
> > The prefix is being set in the 'configure' phase by using the '--prefix' variable. Have you tried that?
> 
> No I didn't try that, and I'm using DESTDIR variable when installing.
> Whould it be possible to update the prefix with DESTDIR when installing?
> [L.H.] need to explore this option. But for now use 'prefix', as this is what supported by MUSDK

OK


> > -----Original Message-----
> > From: Thomas Monjalon <thomas@monjalon.net>
> > Sent: Monday, 11 January 2021 13:28
> > To: Liron Himi <lironh@marvell.com>
> > Cc: ferruh.yigit@intel.com; dev@dpdk.org; Jerin Jacob Kollanukkaran 
> > <jerinj@marvell.com>
> > Subject: [EXT] Re: [dpdk-dev] [PATCH v3] meson: update meson build for 
> > armada drivers
> > 
> > External Email
> > 
> > ----------------------------------------------------------------------
> > 16/12/2020 22:36, lironh@marvell.com:
> > > From: Liron Himi <lironh@marvell.com>
> > > 
> > > With pkg-config support available within musdk library (from
> > > musdk-release-SDK-10.3.5.0-PR2 version), meson option 'lib_musdk_dir' 
> > > can be removed.
> > > PKG_CONFIG_PATH environment variable should be set appropriately to 
> > > use the musdk library.
> > 
> > Sorry, it does not work.
> > 
> > First, when installing MUSDK, the .pc file is not updated with the correct prefix path:
> > 	make install DESTDIR=$(readlink -f install) In install/mv/lib/pkgconfig/libmusdk.pc:
> > 	prefix=/mv
> > instead of:
> > 	prefix=/musdk_path/install/mv
> > 
> > Second, after manually fixing the prefix path and compiling DPDK:
> > 
> > In file included from musdk/install/mv/include/mv_std.h:101,
> >                  from musdk/install/mv/include/drivers/mv_neta.h:100,
> >                  from dpdk/drivers/net/mvneta/mvneta_ethdev.h:24,
> >                  from dpdk/drivers/net/mvneta/mvneta_rxtx.h:10,
> >                  from dpdk/drivers/net/mvneta/mvneta_rxtx.c:7:
> > musdk/install/mv/include/env/mv_autogen_build_assert.h:43:5: error:
> > "MVCONF_DMA_PHYS_ADDR_T_SIZE" is not defined, evaluates to 0 
> > [-Werror=undef]
> > musdk/install/mv/include/env/mv_autogen_build_assert.h:44:2: error:
> > #error "MVCONF_DMA_PHYS_ADDR_T_SIZE must match size used during musdk_lib compilation."
> > 
> > The CFLAGS may be incomplete:
> > 	Cflags: -I${includedir} -DMVCONF_TYPES_PUBLIC -DMVCONF_DMA_PHYS_ADDR_T_PUBLIC I fixed it by adding:
> > 	-DMVCONF_DMA_PHYS_ADDR_T_SIZE=64
> > 
> > Please could you fix MUSDK quickly?
> > 
> > I think I will pull next-net as is, but I consider it is broken.
> > 
> > 
> > 
> 
> 
> 
> 
> 
> 

Re: [dpdk-dev] [EXT] Re: [PATCH v3] meson: update meson build for armada drivers

[Bruce Richardson]

On Mon, Jan 11, 2021 at 05:05:27PM +0100, Thomas Monjalon wrote:
> 11/01/2021 16:29, Liron Himi:
> > Hi Thomas,
> > 
> > When did you take this MUSDK version?
> > Is this your head "pkg-config: expose dma-add-size"?
> 
> I'm using musdk-SDK-10.3.5.0-PR2 as recommended in the doc.
> 
> > If not, this explain the mvneta issue.
> > I already noticed that and pushed a fixed to the github.
> 
> I see. So it may need a doc update.
> 
> > As for the prefix issue,
> > The prefix is being set in the 'configure' phase by using the '--prefix' variable. Have you tried that?
> 
> No I didn't try that, and I'm using DESTDIR variable when installing.
> Whould it be possible to update the prefix with DESTDIR when installing?
> 
DESTDIR won't affect the .pc for any package installation AFAIK, prefix is
the method to use. If you use DESTDIR you need to call pkg-config with
"--define-prefix" argument to get the relocation.

/Bruce

Re: [dpdk-dev] [EXT] Re: [PATCH v3] meson: update meson build for armada drivers

[Thomas Monjalon]

11/01/2021 18:04, Bruce Richardson:
> On Mon, Jan 11, 2021 at 05:05:27PM +0100, Thomas Monjalon wrote:
> > 11/01/2021 16:29, Liron Himi:
> > > Hi Thomas,
> > > 
> > > When did you take this MUSDK version?
> > > Is this your head "pkg-config: expose dma-add-size"?
> > 
> > I'm using musdk-SDK-10.3.5.0-PR2 as recommended in the doc.
> > 
> > > If not, this explain the mvneta issue.
> > > I already noticed that and pushed a fixed to the github.
> > 
> > I see. So it may need a doc update.
> > 
> > > As for the prefix issue,
> > > The prefix is being set in the 'configure' phase by using the '--prefix' variable. Have you tried that?
> > 
> > No I didn't try that, and I'm using DESTDIR variable when installing.
> > Whould it be possible to update the prefix with DESTDIR when installing?
> > 
> DESTDIR won't affect the .pc for any package installation AFAIK, prefix is
> the method to use. If you use DESTDIR you need to call pkg-config with
> "--define-prefix" argument to get the relocation.

OK thanks for the info.

Re: [dpdk-dev] [EXT] Re: [PATCH v3] meson: update meson build for armada drivers

[Bruce Richardson]

On Mon, Jan 11, 2021 at 05:17:01PM +0100, Thomas Monjalon wrote:
> 11/01/2021 17:08, Liron Himi:
> > From: Thomas Monjalon <thomas@monjalon.net> 
> > Sent: Monday, 11 January 2021 18:05
> > To: Liron Himi <lironh@marvell.com>
> > Cc: ferruh.yigit@intel.com; dev@dpdk.org; Jerin Jacob Kollanukkaran <jerinj@marvell.com>; Liron Himi <lironh@marvell.com>
> > Subject: Re: [EXT] Re: [dpdk-dev] [PATCH v3] meson: update meson build for armada drivers
> > 
> > 11/01/2021 16:29, Liron Himi:
> > > Hi Thomas,
> > > 
> > > When did you take this MUSDK version?
> > > Is this your head "pkg-config: expose dma-add-size"?
> > 
> > I'm using musdk-SDK-10.3.5.0-PR2 as recommended in the doc.
> > 
> > > If not, this explain the mvneta issue.
> > > I already noticed that and pushed a fixed to the github.
> > 
> > I see. So it may need a doc update.
> > [L.H.] why need to update the doc? It is still the same release branch, I just added a fix patch to it.
> 
> Yes, my bad: I used the tag musdk-SDK-10.3.5.0-PR2
> instead of the branch musdk-release-SDK-10.3.5.0-PR2.
> 
> > > As for the prefix issue,
> > > The prefix is being set in the 'configure' phase by using the '--prefix' variable. Have you tried that?
> > 
> > No I didn't try that, and I'm using DESTDIR variable when installing.
> > Whould it be possible to update the prefix with DESTDIR when installing?
> > [L.H.] need to explore this option. But for now use 'prefix', as this is what supported by MUSDK
> 
> OK
> 
[+Luca]

I think it would be wrong to update the .pc file based on DESTDIR, as I
believe DESTDIR is used by packaging to produce the actual package layout
in a non-root path. To change the default installation path for a package
on the current system, "--prefix" is the correct parameter to use.

/Bruce

Re: [dpdk-dev] [EXT] Re: [PATCH v3] meson: update meson build for armada drivers

[Thomas Monjalon]

11/01/2021 18:07, Bruce Richardson:
> On Mon, Jan 11, 2021 at 05:17:01PM +0100, Thomas Monjalon wrote:
> > 11/01/2021 17:08, Liron Himi:
> > > From: Thomas Monjalon <thomas@monjalon.net> 
> > > Sent: Monday, 11 January 2021 18:05
> > > To: Liron Himi <lironh@marvell.com>
> > > Cc: ferruh.yigit@intel.com; dev@dpdk.org; Jerin Jacob Kollanukkaran <jerinj@marvell.com>; Liron Himi <lironh@marvell.com>
> > > Subject: Re: [EXT] Re: [dpdk-dev] [PATCH v3] meson: update meson build for armada drivers
> > > 
> > > 11/01/2021 16:29, Liron Himi:
> > > > Hi Thomas,
> > > > 
> > > > When did you take this MUSDK version?
> > > > Is this your head "pkg-config: expose dma-add-size"?
> > > 
> > > I'm using musdk-SDK-10.3.5.0-PR2 as recommended in the doc.
> > > 
> > > > If not, this explain the mvneta issue.
> > > > I already noticed that and pushed a fixed to the github.
> > > 
> > > I see. So it may need a doc update.
> > > [L.H.] why need to update the doc? It is still the same release branch, I just added a fix patch to it.
> > 
> > Yes, my bad: I used the tag musdk-SDK-10.3.5.0-PR2
> > instead of the branch musdk-release-SDK-10.3.5.0-PR2.
> > 
> > > > As for the prefix issue,
> > > > The prefix is being set in the 'configure' phase by using the '--prefix' variable. Have you tried that?
> > > 
> > > No I didn't try that, and I'm using DESTDIR variable when installing.
> > > Whould it be possible to update the prefix with DESTDIR when installing?
> > > [L.H.] need to explore this option. But for now use 'prefix', as this is what supported by MUSDK
> > 
> > OK
> > 
> [+Luca]
> 
> I think it would be wrong to update the .pc file based on DESTDIR, as I
> believe DESTDIR is used by packaging to produce the actual package layout
> in a non-root path. To change the default installation path for a package
> on the current system, "--prefix" is the correct parameter to use.

Yes you're right, it makes sense.

Re: [dpdk-dev] [EXT] Re: [PATCH v3] meson: update meson build for armada drivers

[Luca Boccassi]

On Mon, 2021-01-11 at 17:07 +0000, Bruce Richardson wrote:
> On Mon, Jan 11, 2021 at 05:17:01PM +0100, Thomas Monjalon wrote:
> > 11/01/2021 17:08, Liron Himi:
> > > From: Thomas Monjalon <thomas@monjalon.net> 
> > > Sent: Monday, 11 January 2021 18:05
> > > To: Liron Himi <lironh@marvell.com>
> > > Cc: ferruh.yigit@intel.com; dev@dpdk.org; Jerin Jacob Kollanukkaran <jerinj@marvell.com>; Liron Himi <lironh@marvell.com>
> > > Subject: Re: [EXT] Re: [dpdk-dev] [PATCH v3] meson: update meson build for armada drivers
> > > 
> > > 11/01/2021 16:29, Liron Himi:
> > > > Hi Thomas,
> > > > 
> > > > When did you take this MUSDK version?
> > > > Is this your head "pkg-config: expose dma-add-size"?
> > > 
> > > I'm using musdk-SDK-10.3.5.0-PR2 as recommended in the doc.
> > > 
> > > > If not, this explain the mvneta issue.
> > > > I already noticed that and pushed a fixed to the github.
> > > 
> > > I see. So it may need a doc update.
> > > [L.H.] why need to update the doc? It is still the same release branch, I just added a fix patch to it.
> > 
> > Yes, my bad: I used the tag musdk-SDK-10.3.5.0-PR2
> > instead of the branch musdk-release-SDK-10.3.5.0-PR2.
> > 
> > > > As for the prefix issue,
> > > > The prefix is being set in the 'configure' phase by using the '--prefix' variable. Have you tried that?
> > > 
> > > No I didn't try that, and I'm using DESTDIR variable when installing.
> > > Whould it be possible to update the prefix with DESTDIR when installing?
> > > [L.H.] need to explore this option. But for now use 'prefix', as this is what supported by MUSDK
> > 
> > OK
> > 
> [+Luca]
> 
> I think it would be wrong to update the .pc file based on DESTDIR, as I
> believe DESTDIR is used by packaging to produce the actual package layout
> in a non-root path. To change the default installation path for a package
> on the current system, "--prefix" is the correct parameter to use.
> 
> /Bruce

+1

-- 
Kind regards,
Luca Boccassi