[dpdk-dev] [PATCH-18.08 00/15] add meson support for more net drivers

[dpdk-dev] [PATCH-18.08 00/15] add meson support for more net drivers

[Bruce Richardson]

A number of net drivers require pretty minimal meson.build files to build
successfully with meson. This set adds support for 14 net drivers to the
build.

Bruce Richardson (15):
  net/ark: add to meson build
  net/avp: add to meson build
  net/bnx2x: add to meson build
  net/bnxt: add to meson build
  net/cxgbe: add to meson build
  net/ena: add to meson build
  net/failsafe: add to meson build
  net/ifc: rename to ifcvf
  net/ifcvf: add to meson build
  net/kni: add to meson build
  net/liquidio: add to meson build
  net/nfp: add to meson build
  net/softnic: add to meson build
  net/szedata2: add to meson build
  net/vhost: add to meson build

 MAINTAINERS                                        |  4 ++--
 app/test-pmd/meson.build                           |  3 +++
 drivers/net/Makefile                               |  2 +-
 drivers/net/ark/meson.build                        | 13 ++++++++++++
 drivers/net/avp/meson.build                        |  5 +++++
 drivers/net/bnx2x/meson.build                      | 14 +++++++++++++
 drivers/net/bnxt/meson.build                       | 18 +++++++++++++++++
 drivers/net/cxgbe/meson.build                      | 11 +++++++++++
 drivers/net/ena/meson.build                        |  8 ++++++++
 drivers/net/failsafe/meson.build                   | 23 ++++++++++++++++++++++
 drivers/net/{ifc => ifcvf}/Makefile                |  2 +-
 drivers/net/{ifc => ifcvf}/base/ifcvf.c            |  0
 drivers/net/{ifc => ifcvf}/base/ifcvf.h            |  0
 drivers/net/{ifc => ifcvf}/base/ifcvf_osdep.h      |  0
 drivers/net/{ifc => ifcvf}/ifcvf_vdpa.c            |  0
 drivers/net/ifcvf/meson.build                      |  7 +++++++
 .../rte_pmd_ifcvf_version.map}                     |  0
 drivers/net/kni/meson.build                        |  6 ++++++
 drivers/net/liquidio/Makefile                      |  2 +-
 drivers/net/liquidio/meson.build                   |  8 ++++++++
 ...io_version.map => rte_pmd_liquidio_version.map} |  0
 drivers/net/meson.build                            | 13 ++++++++----
 drivers/net/nfp/meson.build                        | 16 +++++++++++++++
 drivers/net/softnic/Makefile                       |  2 +-
 drivers/net/softnic/meson.build                    |  7 +++++++
 ...nic_version.map => rte_pmd_softnic_version.map} |  0
 drivers/net/szedata2/meson.build                   |  7 +++++++
 drivers/net/vhost/meson.build                      |  7 +++++++
 28 files changed, 168 insertions(+), 10 deletions(-)
 create mode 100644 drivers/net/ark/meson.build
 create mode 100644 drivers/net/avp/meson.build
 create mode 100644 drivers/net/bnx2x/meson.build
 create mode 100644 drivers/net/bnxt/meson.build
 create mode 100644 drivers/net/cxgbe/meson.build
 create mode 100644 drivers/net/ena/meson.build
 create mode 100644 drivers/net/failsafe/meson.build
 rename drivers/net/{ifc => ifcvf}/Makefile (94%)
 rename drivers/net/{ifc => ifcvf}/base/ifcvf.c (100%)
 rename drivers/net/{ifc => ifcvf}/base/ifcvf.h (100%)
 rename drivers/net/{ifc => ifcvf}/base/ifcvf_osdep.h (100%)
 rename drivers/net/{ifc => ifcvf}/ifcvf_vdpa.c (100%)
 create mode 100644 drivers/net/ifcvf/meson.build
 rename drivers/net/{ifc/rte_ifcvf_version.map => ifcvf/rte_pmd_ifcvf_version.map} (100%)
 create mode 100644 drivers/net/kni/meson.build
 create mode 100644 drivers/net/liquidio/meson.build
 rename drivers/net/liquidio/{rte_pmd_lio_version.map => rte_pmd_liquidio_version.map} (100%)
 create mode 100644 drivers/net/nfp/meson.build
 create mode 100644 drivers/net/softnic/meson.build
 rename drivers/net/softnic/{rte_pmd_eth_softnic_version.map => rte_pmd_softnic_version.map} (100%)
 create mode 100644 drivers/net/szedata2/meson.build
 create mode 100644 drivers/net/vhost/meson.build

-- 
2.11.0

[dpdk-dev] [PATCH-18.08 01/15] net/ark: add to meson build

[Bruce Richardson]

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
CC: Shepard Siegel <shepard.siegel@atomicrules.com>
CC: Ed Czeck <ed.czeck@atomicrules.com>
CC: John Miller <john.miller@atomicrules.com>
---
 drivers/net/ark/meson.build | 13 +++++++++++++
 drivers/net/meson.build     |  3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 drivers/net/ark/meson.build

diff --git a/drivers/net/ark/meson.build b/drivers/net/ark/meson.build
new file mode 100644
index 000000000..99151bba1
--- /dev/null
+++ b/drivers/net/ark/meson.build
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Intel Corporation
+
+sources = files('ark_ddm.c',
+	'ark_ethdev.c',
+	'ark_ethdev_rx.c',
+	'ark_ethdev_tx.c',
+	'ark_mpu.c',
+	'ark_pktchkr.c',
+	'ark_pktdir.c',
+	'ark_pktgen.c',
+	'ark_rqp.c',
+	'ark_udm.c')
diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index b7d00a04c..d0ae7c34b 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -1,7 +1,8 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-drivers = ['af_packet', 'axgbe', 'bonding', 'dpaa', 'dpaa2',
+drivers = ['ark',
+	'af_packet', 'axgbe', 'bonding', 'dpaa', 'dpaa2',
 	'e1000', 'enic', 'fm10k', 'i40e', 'ixgbe',
 	'mvpp2', 'null', 'octeontx', 'pcap', 'ring',
 	'sfc', 'thunderx', 'virtio']
-- 
2.11.0

[dpdk-dev] [PATCH-18.08 02/15] net/avp: add to meson build

[Bruce Richardson]

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
CC: Allain Legacy <allain.legacy@windriver.com>
CC: Matt Peters <matt.peters@windriver.com>
---
 drivers/net/avp/meson.build | 5 +++++
 drivers/net/meson.build     | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 drivers/net/avp/meson.build

diff --git a/drivers/net/avp/meson.build b/drivers/net/avp/meson.build
new file mode 100644
index 000000000..6076c31b9
--- /dev/null
+++ b/drivers/net/avp/meson.build
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Intel Corporation
+
+sources = files('avp_ethdev.c')
+install_headers('rte_avp_common.h', 'rte_avp_fifo.h')
diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index d0ae7c34b..76bf48f3e 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -1,8 +1,8 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-drivers = ['ark',
-	'af_packet', 'axgbe', 'bonding', 'dpaa', 'dpaa2',
+drivers = ['af_packet', 'ark', 'avp',
+	'axgbe', 'bonding', 'dpaa', 'dpaa2',
 	'e1000', 'enic', 'fm10k', 'i40e', 'ixgbe',
 	'mvpp2', 'null', 'octeontx', 'pcap', 'ring',
 	'sfc', 'thunderx', 'virtio']
-- 
2.11.0

[dpdk-dev] [PATCH-18.08 03/15] net/bnx2x: add to meson build

[Bruce Richardson]

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
CC: Harish Patil <harish.patil@cavium.com>
CC: Rasesh Mody <rasesh.mody@cavium.com>
---
 drivers/net/bnx2x/meson.build | 14 ++++++++++++++
 drivers/net/meson.build       |  3 ++-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 drivers/net/bnx2x/meson.build

diff --git a/drivers/net/bnx2x/meson.build b/drivers/net/bnx2x/meson.build
new file mode 100644
index 000000000..e3c688869
--- /dev/null
+++ b/drivers/net/bnx2x/meson.build
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Intel Corporation
+
+dep = cc.find_library('z', required: false)
+build = dep.found()
+ext_deps += dep
+cflags += '-DZLIB_CONST'
+sources = files('bnx2x.c',
+	'bnx2x_ethdev.c',
+	'bnx2x_rxtx.c',
+	'bnx2x_stats.c',
+	'bnx2x_vfpf.c',
+	'ecore_sp.c',
+	'elink.c')
diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index 76bf48f3e..143355458 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -2,7 +2,8 @@
 # Copyright(c) 2017 Intel Corporation
 
 drivers = ['af_packet', 'ark', 'avp',
-	'axgbe', 'bonding', 'dpaa', 'dpaa2',
+	'axgbe', 'bonding', 'bnx2x',
+	'dpaa', 'dpaa2',
 	'e1000', 'enic', 'fm10k', 'i40e', 'ixgbe',
 	'mvpp2', 'null', 'octeontx', 'pcap', 'ring',
 	'sfc', 'thunderx', 'virtio']
-- 
2.11.0

[dpdk-dev] [PATCH-18.08 04/15] net/bnxt: add to meson build

[Bruce Richardson]

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
CC: Ajit Khaparde <ajit.khaparde@broadcom.com>
CC: Somnath Kotur <somnath.kotur@broadcom.com>
---
 app/test-pmd/meson.build     |  3 +++
 drivers/net/bnxt/meson.build | 18 ++++++++++++++++++
 drivers/net/meson.build      |  2 +-
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 drivers/net/bnxt/meson.build

diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build
index a51514b03..4c9fbbfda 100644
--- a/app/test-pmd/meson.build
+++ b/app/test-pmd/meson.build
@@ -25,6 +25,9 @@ deps = ['ethdev', 'gro', 'gso', 'cmdline', 'metrics', 'meter', 'bus_pci']
 if dpdk_conf.has('RTE_LIBRTE_PDUMP')
 	deps += 'pdump'
 endif
+if dpdk_conf.has('RTE_LIBRTE_BNXT_PMD')
+	deps += 'pmd_bnxt'
+endif
 if dpdk_conf.has('RTE_LIBRTE_I40E_PMD')
 	deps += 'pmd_i40e'
 endif
diff --git a/drivers/net/bnxt/meson.build b/drivers/net/bnxt/meson.build
new file mode 100644
index 000000000..486bf0fd3
--- /dev/null
+++ b/drivers/net/bnxt/meson.build
@@ -0,0 +1,18 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Intel Corporation
+
+install_headers('rte_pmd_bnxt.h')
+version = 2
+sources = files('bnxt_cpr.c',
+	'bnxt_ethdev.c',
+	'bnxt_filter.c',
+	'bnxt_hwrm.c',
+	'bnxt_irq.c',
+	'bnxt_ring.c',
+	'bnxt_rxq.c',
+	'bnxt_rxr.c',
+	'bnxt_stats.c',
+	'bnxt_txq.c',
+	'bnxt_txr.c',
+	'bnxt_vnic.c',
+	'rte_pmd_bnxt.c')
diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index 143355458..d012c62fe 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -3,7 +3,7 @@
 
 drivers = ['af_packet', 'ark', 'avp',
 	'axgbe', 'bonding', 'bnx2x',
-	'dpaa', 'dpaa2',
+	'bnxt', 'dpaa', 'dpaa2',
 	'e1000', 'enic', 'fm10k', 'i40e', 'ixgbe',
 	'mvpp2', 'null', 'octeontx', 'pcap', 'ring',
 	'sfc', 'thunderx', 'virtio']
-- 
2.11.0

[dpdk-dev] [PATCH-18.08 05/15] net/cxgbe: add to meson build

[Bruce Richardson]

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
CC: Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>
---
 drivers/net/cxgbe/meson.build | 11 +++++++++++
 drivers/net/meson.build       |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 drivers/net/cxgbe/meson.build

diff --git a/drivers/net/cxgbe/meson.build b/drivers/net/cxgbe/meson.build
new file mode 100644
index 000000000..8196e8afb
--- /dev/null
+++ b/drivers/net/cxgbe/meson.build
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Intel Corporation
+
+sources = files('cxgbe_ethdev.c',
+	'cxgbe_main.c',
+	'cxgbevf_ethdev.c',
+	'cxgbevf_main.c',
+	'sge.c',
+	'base/t4_hw.c',
+	'base/t4vf_hw.c')
+includes += include_directories('base')
diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index d012c62fe..c55ca65a5 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -3,7 +3,7 @@
 
 drivers = ['af_packet', 'ark', 'avp',
 	'axgbe', 'bonding', 'bnx2x',
-	'bnxt', 'dpaa', 'dpaa2',
+	'bnxt', 'cxgbe', 'dpaa', 'dpaa2',
 	'e1000', 'enic', 'fm10k', 'i40e', 'ixgbe',
 	'mvpp2', 'null', 'octeontx', 'pcap', 'ring',
 	'sfc', 'thunderx', 'virtio']
-- 
2.11.0

[dpdk-dev] [PATCH-18.08 06/15] net/ena: add to meson build

[Bruce Richardson]

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
CC: Marcin Wojtas <mw@semihalf.com>
CC: Michal Krawczyk <mk@semihalf.com>
CC: Guy Tzalik <gtzalik@amazon.com>
CC: Evgeny Schemeilin <evgenys@amazon.com>
---
 drivers/net/ena/meson.build | 8 ++++++++
 drivers/net/meson.build     | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 drivers/net/ena/meson.build

diff --git a/drivers/net/ena/meson.build b/drivers/net/ena/meson.build
new file mode 100644
index 000000000..542f29567
--- /dev/null
+++ b/drivers/net/ena/meson.build
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Intel Corporation
+
+allow_experimental_apis = true
+sources = files('ena_ethdev.c',
+	'base/ena_com.c',
+	'base/ena_eth_com.c')
+includes += include_directories('base', 'base/ena_defs')
diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index c55ca65a5..d4c7d58ab 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -4,7 +4,8 @@
 drivers = ['af_packet', 'ark', 'avp',
 	'axgbe', 'bonding', 'bnx2x',
 	'bnxt', 'cxgbe', 'dpaa', 'dpaa2',
-	'e1000', 'enic', 'fm10k', 'i40e', 'ixgbe',
+	'e1000', 'ena', 'enic',
+	'fm10k', 'i40e', 'ixgbe',
 	'mvpp2', 'null', 'octeontx', 'pcap', 'ring',
 	'sfc', 'thunderx', 'virtio']
 std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc
-- 
2.11.0

[dpdk-dev] [PATCH-18.08 07/15] net/failsafe: add to meson build

[Bruce Richardson]

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
CC: Gaetan Rivet <gaetan.rivet@6wind.com>
---
 drivers/net/failsafe/meson.build | 23 +++++++++++++++++++++++
 drivers/net/meson.build          |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 drivers/net/failsafe/meson.build

diff --git a/drivers/net/failsafe/meson.build b/drivers/net/failsafe/meson.build
new file mode 100644
index 000000000..a249ff4af
--- /dev/null
+++ b/drivers/net/failsafe/meson.build
@@ -0,0 +1,23 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Intel Corporation
+
+cflags += '-std=gnu99'
+cflags += '-D_DEFAULT_SOURCE'
+cflags += '-D_XOPEN_SOURCE=700'
+cflags += '-pedantic'
+if host_machine.system() == 'linux'
+	cflags += '-DLINUX'
+else
+	cflags += '-DBSD'
+endif
+
+allow_experimental_apis = true
+
+sources = files('failsafe_args.c',
+	'failsafe.c',
+	'failsafe_eal.c',
+	'failsafe_ether.c',
+	'failsafe_flow.c',
+	'failsafe_intr.c',
+	'failsafe_ops.c',
+	'failsafe_rxtx.c')
diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index d4c7d58ab..decb1519a 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -4,7 +4,7 @@
 drivers = ['af_packet', 'ark', 'avp',
 	'axgbe', 'bonding', 'bnx2x',
 	'bnxt', 'cxgbe', 'dpaa', 'dpaa2',
-	'e1000', 'ena', 'enic',
+	'e1000', 'ena', 'enic', 'failsafe',
 	'fm10k', 'i40e', 'ixgbe',
 	'mvpp2', 'null', 'octeontx', 'pcap', 'ring',
 	'sfc', 'thunderx', 'virtio']
-- 
2.11.0

[dpdk-dev] [PATCH-18.08 08/15] net/ifc: rename to ifcvf

[Bruce Richardson]

All files in the directory and the resulting driver have prefix of ifcvf,
not just ifc, so rename directory for accuracy. Also rename the map file
to standard name for meson build in the process.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
CC: Xiao Wang <xiao.w.wang@intel.com>
---
 MAINTAINERS                                                           | 4 ++--
 drivers/net/Makefile                                                  | 2 +-
 drivers/net/{ifc => ifcvf}/Makefile                                   | 2 +-
 drivers/net/{ifc => ifcvf}/base/ifcvf.c                               | 0
 drivers/net/{ifc => ifcvf}/base/ifcvf.h                               | 0
 drivers/net/{ifc => ifcvf}/base/ifcvf_osdep.h                         | 0
 drivers/net/{ifc => ifcvf}/ifcvf_vdpa.c                               | 0
 .../{ifc/rte_ifcvf_version.map => ifcvf/rte_pmd_ifcvf_version.map}    | 0
 8 files changed, 4 insertions(+), 4 deletions(-)
 rename drivers/net/{ifc => ifcvf}/Makefile (94%)
 rename drivers/net/{ifc => ifcvf}/base/ifcvf.c (100%)
 rename drivers/net/{ifc => ifcvf}/base/ifcvf.h (100%)
 rename drivers/net/{ifc => ifcvf}/base/ifcvf_osdep.h (100%)
 rename drivers/net/{ifc => ifcvf}/ifcvf_vdpa.c (100%)
 rename drivers/net/{ifc/rte_ifcvf_version.map => ifcvf/rte_pmd_ifcvf_version.map} (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 2663f1c03..6f587477c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -553,10 +553,10 @@ T: git://dpdk.org/next/dpdk-next-net-intel
 F: drivers/net/avf/
 F: doc/guides/nics/features/avf*.ini
 
-Intel ifc
+Intel ifcvf
 M: Xiao Wang <xiao.w.wang@intel.com>
 T: git://dpdk.org/next/dpdk-next-net-intel
-F: drivers/net/ifc/
+F: drivers/net/ifcvf/
 F: doc/guides/nics/ifcvf.rst
 F: doc/guides/nics/features/ifcvf.ini
 
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 9f9da6651..9308f9a7b 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -59,7 +59,7 @@ endif # $(CONFIG_RTE_LIBRTE_SCHED)
 ifeq ($(CONFIG_RTE_LIBRTE_VHOST),y)
 DIRS-$(CONFIG_RTE_LIBRTE_PMD_VHOST) += vhost
 ifeq ($(CONFIG_RTE_EAL_VFIO),y)
-DIRS-$(CONFIG_RTE_LIBRTE_IFCVF_VDPA_PMD) += ifc
+DIRS-$(CONFIG_RTE_LIBRTE_IFCVF_VDPA_PMD) += ifcvf
 endif
 endif # $(CONFIG_RTE_LIBRTE_VHOST)
 
diff --git a/drivers/net/ifc/Makefile b/drivers/net/ifcvf/Makefile
similarity index 94%
rename from drivers/net/ifc/Makefile
rename to drivers/net/ifcvf/Makefile
index 1011995bc..a022faaad 100644
--- a/drivers/net/ifc/Makefile
+++ b/drivers/net/ifcvf/Makefile
@@ -22,7 +22,7 @@ BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.
 
 VPATH += $(SRCDIR)/base
 
-EXPORT_MAP := rte_ifcvf_version.map
+EXPORT_MAP := rte_pmd_ifcvf_version.map
 
 LIBABIVER := 1
 
diff --git a/drivers/net/ifc/base/ifcvf.c b/drivers/net/ifcvf/base/ifcvf.c
similarity index 100%
rename from drivers/net/ifc/base/ifcvf.c
rename to drivers/net/ifcvf/base/ifcvf.c
diff --git a/drivers/net/ifc/base/ifcvf.h b/drivers/net/ifcvf/base/ifcvf.h
similarity index 100%
rename from drivers/net/ifc/base/ifcvf.h
rename to drivers/net/ifcvf/base/ifcvf.h
diff --git a/drivers/net/ifc/base/ifcvf_osdep.h b/drivers/net/ifcvf/base/ifcvf_osdep.h
similarity index 100%
rename from drivers/net/ifc/base/ifcvf_osdep.h
rename to drivers/net/ifcvf/base/ifcvf_osdep.h
diff --git a/drivers/net/ifc/ifcvf_vdpa.c b/drivers/net/ifcvf/ifcvf_vdpa.c
similarity index 100%
rename from drivers/net/ifc/ifcvf_vdpa.c
rename to drivers/net/ifcvf/ifcvf_vdpa.c
diff --git a/drivers/net/ifc/rte_ifcvf_version.map b/drivers/net/ifcvf/rte_pmd_ifcvf_version.map
similarity index 100%
rename from drivers/net/ifc/rte_ifcvf_version.map
rename to drivers/net/ifcvf/rte_pmd_ifcvf_version.map
-- 
2.11.0

[dpdk-dev] [PATCH-18.08 09/15] net/ifcvf: add to meson build

[Bruce Richardson]

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
CC: Xiao Wang <xiao.w.wang@intel.com>
---
 drivers/net/ifcvf/meson.build | 7 +++++++
 drivers/net/meson.build       | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 drivers/net/ifcvf/meson.build

diff --git a/drivers/net/ifcvf/meson.build b/drivers/net/ifcvf/meson.build
new file mode 100644
index 000000000..a30aa09e6
--- /dev/null
+++ b/drivers/net/ifcvf/meson.build
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Intel Corporation
+
+allow_experimental_apis = true
+sources = files('ifcvf_vdpa.c', 'base/ifcvf.c')
+includes += include_directories('base')
+deps += 'vhost'
diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index decb1519a..c983f90b1 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -5,7 +5,7 @@ drivers = ['af_packet', 'ark', 'avp',
 	'axgbe', 'bonding', 'bnx2x',
 	'bnxt', 'cxgbe', 'dpaa', 'dpaa2',
 	'e1000', 'ena', 'enic', 'failsafe',
-	'fm10k', 'i40e', 'ixgbe',
+	'fm10k', 'i40e', 'ifcvf', 'ixgbe',
 	'mvpp2', 'null', 'octeontx', 'pcap', 'ring',
 	'sfc', 'thunderx', 'virtio']
 std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc
-- 
2.11.0

[dpdk-dev] [PATCH-18.08 10/15] net/kni: add to meson build

[Bruce Richardson]

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
CC: Ferruh Yigit <ferruh.yigit@intel.com>
---
 drivers/net/kni/meson.build | 6 ++++++
 drivers/net/meson.build     | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 drivers/net/kni/meson.build

diff --git a/drivers/net/kni/meson.build b/drivers/net/kni/meson.build
new file mode 100644
index 000000000..2406cc5ea
--- /dev/null
+++ b/drivers/net/kni/meson.build
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Intel Corporation
+
+allow_experimental_apis = true
+sources = files('rte_eth_kni.c')
+deps += 'kni'
diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index c983f90b1..213fe734c 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -6,7 +6,8 @@ drivers = ['af_packet', 'ark', 'avp',
 	'bnxt', 'cxgbe', 'dpaa', 'dpaa2',
 	'e1000', 'ena', 'enic', 'failsafe',
 	'fm10k', 'i40e', 'ifcvf', 'ixgbe',
-	'mvpp2', 'null', 'octeontx', 'pcap', 'ring',
+	'kni', 'mvpp2', 'null',
+	'octeontx', 'pcap', 'ring',
 	'sfc', 'thunderx', 'virtio']
 std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc
 std_deps += ['bus_pci']         # very many PMDs depend on PCI, so make std
-- 
2.11.0

[dpdk-dev] [PATCH-18.08 11/15] net/liquidio: add to meson build

[Bruce Richardson]

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>

---
CC: Shijith Thotton <shijith.thotton@cavium.com>
CC: Srisivasubramanian Srinivasan <ssrinivasan@cavium.com>
---
 drivers/net/liquidio/Makefile                                     | 2 +-
 drivers/net/liquidio/meson.build                                  | 8 ++++++++
 .../{rte_pmd_lio_version.map => rte_pmd_liquidio_version.map}     | 0
 drivers/net/meson.build                                           | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 drivers/net/liquidio/meson.build
 rename drivers/net/liquidio/{rte_pmd_lio_version.map => rte_pmd_liquidio_version.map} (100%)

diff --git a/drivers/net/liquidio/Makefile b/drivers/net/liquidio/Makefile
index fc5f18ad6..f1092851a 100644
--- a/drivers/net/liquidio/Makefile
+++ b/drivers/net/liquidio/Makefile
@@ -15,7 +15,7 @@ LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
 LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
 LDLIBS += -lrte_bus_pci
 
-EXPORT_MAP := rte_pmd_lio_version.map
+EXPORT_MAP := rte_pmd_liquidio_version.map
 
 LIBABIVER := 1
 
diff --git a/drivers/net/liquidio/meson.build b/drivers/net/liquidio/meson.build
new file mode 100644
index 000000000..9ae48e213
--- /dev/null
+++ b/drivers/net/liquidio/meson.build
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Intel Corporation
+
+sources = files('base/lio_23xx_vf.c',
+	'base/lio_mbox.c',
+	'lio_ethdev.c',
+	'lio_rxtx.c')
+includes += include_directories('base')
diff --git a/drivers/net/liquidio/rte_pmd_lio_version.map b/drivers/net/liquidio/rte_pmd_liquidio_version.map
similarity index 100%
rename from drivers/net/liquidio/rte_pmd_lio_version.map
rename to drivers/net/liquidio/rte_pmd_liquidio_version.map
diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index 213fe734c..9faed7d61 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -6,7 +6,7 @@ drivers = ['af_packet', 'ark', 'avp',
 	'bnxt', 'cxgbe', 'dpaa', 'dpaa2',
 	'e1000', 'ena', 'enic', 'failsafe',
 	'fm10k', 'i40e', 'ifcvf', 'ixgbe',
-	'kni', 'mvpp2', 'null',
+	'kni', 'liquidio', 'mvpp2', 'null',
 	'octeontx', 'pcap', 'ring',
 	'sfc', 'thunderx', 'virtio']
 std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc
-- 
2.11.0

[dpdk-dev] [PATCH-18.08 12/15] net/nfp: add to meson build

[Bruce Richardson]

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
CC: Alejandro Lucero <alejandro.lucero@netronome.com>
---
 drivers/net/meson.build     |  2 +-
 drivers/net/nfp/meson.build | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 drivers/net/nfp/meson.build

diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index 9faed7d61..9714491d1 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -6,7 +6,7 @@ drivers = ['af_packet', 'ark', 'avp',
 	'bnxt', 'cxgbe', 'dpaa', 'dpaa2',
 	'e1000', 'ena', 'enic', 'failsafe',
 	'fm10k', 'i40e', 'ifcvf', 'ixgbe',
-	'kni', 'liquidio', 'mvpp2', 'null',
+	'kni', 'liquidio', 'mvpp2', 'nfp', 'null',
 	'octeontx', 'pcap', 'ring',
 	'sfc', 'thunderx', 'virtio']
 std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc
diff --git a/drivers/net/nfp/meson.build b/drivers/net/nfp/meson.build
new file mode 100644
index 000000000..3ba37e279
--- /dev/null
+++ b/drivers/net/nfp/meson.build
@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Intel Corporation
+
+sources = files('nfpcore/nfp_cpp_pcie_ops.c',
+	'nfpcore/nfp_nsp.c',
+	'nfpcore/nfp_cppcore.c',
+	'nfpcore/nfp_resource.c',
+	'nfpcore/nfp_mip.c',
+	'nfpcore/nfp_nffw.c',
+	'nfpcore/nfp_rtsym.c',
+	'nfpcore/nfp_nsp_cmds.c',
+	'nfpcore/nfp_crc.c',
+	'nfpcore/nfp_mutex.c',
+	'nfpcore/nfp_nsp_eth.c',
+	'nfpcore/nfp_hwinfo.c',
+	'nfp_net.c')
-- 
2.11.0

[dpdk-dev] [PATCH-18.08 13/15] net/softnic: add to meson build

[Bruce Richardson]

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
CC: Jasvinder Singh <jasvinder.singh@intel.com>
CC: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
---
 drivers/net/meson.build                                            | 3 ++-
 drivers/net/softnic/Makefile                                       | 2 +-
 drivers/net/softnic/meson.build                                    | 7 +++++++
 ...rte_pmd_eth_softnic_version.map => rte_pmd_softnic_version.map} | 0
 4 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 drivers/net/softnic/meson.build
 rename drivers/net/softnic/{rte_pmd_eth_softnic_version.map => rte_pmd_softnic_version.map} (100%)

diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index 9714491d1..9cec3f884 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -8,7 +8,8 @@ drivers = ['af_packet', 'ark', 'avp',
 	'fm10k', 'i40e', 'ifcvf', 'ixgbe',
 	'kni', 'liquidio', 'mvpp2', 'nfp', 'null',
 	'octeontx', 'pcap', 'ring',
-	'sfc', 'thunderx', 'virtio']
+	'sfc', 'softnic',
+	'thunderx', 'virtio']
 std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc
 std_deps += ['bus_pci']         # very many PMDs depend on PCI, so make std
 std_deps += ['bus_vdev']        # same with vdev bus
diff --git a/drivers/net/softnic/Makefile b/drivers/net/softnic/Makefile
index d56fecd62..97ac88411 100644
--- a/drivers/net/softnic/Makefile
+++ b/drivers/net/softnic/Makefile
@@ -14,7 +14,7 @@ LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
 LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_sched
 LDLIBS += -lrte_bus_vdev
 
-EXPORT_MAP := rte_pmd_eth_softnic_version.map
+EXPORT_MAP := rte_pmd_softnic_version.map
 
 LIBABIVER := 1
 
diff --git a/drivers/net/softnic/meson.build b/drivers/net/softnic/meson.build
new file mode 100644
index 000000000..41059da8b
--- /dev/null
+++ b/drivers/net/softnic/meson.build
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Intel Corporation
+
+install_headers('rte_eth_softnic.h')
+sources = files('rte_eth_softnic_tm.c',
+	'rte_eth_softnic.c')
+deps += 'sched'
diff --git a/drivers/net/softnic/rte_pmd_eth_softnic_version.map b/drivers/net/softnic/rte_pmd_softnic_version.map
similarity index 100%
rename from drivers/net/softnic/rte_pmd_eth_softnic_version.map
rename to drivers/net/softnic/rte_pmd_softnic_version.map
-- 
2.11.0

[dpdk-dev] [PATCH-18.08 14/15] net/szedata2: add to meson build

[Bruce Richardson]

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
CC: Matej Vido <vido@cesnet.cz>
---
 drivers/net/meson.build          | 2 +-
 drivers/net/szedata2/meson.build | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 drivers/net/szedata2/meson.build

diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index 9cec3f884..c7e18a696 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -8,7 +8,7 @@ drivers = ['af_packet', 'ark', 'avp',
 	'fm10k', 'i40e', 'ifcvf', 'ixgbe',
 	'kni', 'liquidio', 'mvpp2', 'nfp', 'null',
 	'octeontx', 'pcap', 'ring',
-	'sfc', 'softnic',
+	'sfc', 'softnic', 'szedata2',
 	'thunderx', 'virtio']
 std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc
 std_deps += ['bus_pci']         # very many PMDs depend on PCI, so make std
diff --git a/drivers/net/szedata2/meson.build b/drivers/net/szedata2/meson.build
new file mode 100644
index 000000000..da3733743
--- /dev/null
+++ b/drivers/net/szedata2/meson.build
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Intel Corporation
+
+dep = cc.find_library('sze2', required: false)
+build = dep.found()
+ext_deps += dep
+sources = files('rte_eth_szedata2.c')
-- 
2.11.0

[dpdk-dev] [PATCH-18.08 15/15] net/vhost: add to meson build

[Bruce Richardson]

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
CC: Tetsuya Mukawa <mtetsuyah@gmail.com>
CC: Maxime Coquelin <maxime.coquelin@redhat.com>
---
 drivers/net/meson.build       | 2 +-
 drivers/net/vhost/meson.build | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 drivers/net/vhost/meson.build

diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index c7e18a696..aef5ef6c0 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -9,7 +9,7 @@ drivers = ['af_packet', 'ark', 'avp',
 	'kni', 'liquidio', 'mvpp2', 'nfp', 'null',
 	'octeontx', 'pcap', 'ring',
 	'sfc', 'softnic', 'szedata2',
-	'thunderx', 'virtio']
+	'thunderx', 'vhost', 'virtio']
 std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc
 std_deps += ['bus_pci']         # very many PMDs depend on PCI, so make std
 std_deps += ['bus_vdev']        # same with vdev bus
diff --git a/drivers/net/vhost/meson.build b/drivers/net/vhost/meson.build
new file mode 100644
index 000000000..a8f77e1ab
--- /dev/null
+++ b/drivers/net/vhost/meson.build
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Intel Corporation
+
+version = 2
+sources = files('rte_eth_vhost.c')
+install_headers('rte_eth_vhost.h')
+deps += 'vhost'
-- 
2.11.0

Re: [dpdk-dev] [PATCH-18.08 08/15] net/ifc: rename to ifcvf

[Wang, Xiao W]

Hi Bruce,

> -----Original Message-----
> From: Richardson, Bruce
> Sent: Friday, May 18, 2018 4:15 AM
> To: dev@dpdk.org
> Cc: Richardson, Bruce <bruce.richardson@intel.com>; Wang, Xiao W
> <xiao.w.wang@intel.com>
> Subject: [PATCH-18.08 08/15] net/ifc: rename to ifcvf
> 
> All files in the directory and the resulting driver have prefix of ifcvf,
> not just ifc, so rename directory for accuracy. Also rename the map file
> to standard name for meson build in the process.

Naming the directory as "ifc" allows us to add ifcpf driver into it in the future.

BRs,
Xiao

> 
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
> CC: Xiao Wang <xiao.w.wang@intel.com>
> ---
>  MAINTAINERS                                                           | 4 ++--
>  drivers/net/Makefile                                                  | 2 +-
>  drivers/net/{ifc => ifcvf}/Makefile                                   | 2 +-
>  drivers/net/{ifc => ifcvf}/base/ifcvf.c                               | 0
>  drivers/net/{ifc => ifcvf}/base/ifcvf.h                               | 0
>  drivers/net/{ifc => ifcvf}/base/ifcvf_osdep.h                         | 0
>  drivers/net/{ifc => ifcvf}/ifcvf_vdpa.c                               | 0
>  .../{ifc/rte_ifcvf_version.map => ifcvf/rte_pmd_ifcvf_version.map}    | 0
>  8 files changed, 4 insertions(+), 4 deletions(-)
>  rename drivers/net/{ifc => ifcvf}/Makefile (94%)
>  rename drivers/net/{ifc => ifcvf}/base/ifcvf.c (100%)
>  rename drivers/net/{ifc => ifcvf}/base/ifcvf.h (100%)
>  rename drivers/net/{ifc => ifcvf}/base/ifcvf_osdep.h (100%)
>  rename drivers/net/{ifc => ifcvf}/ifcvf_vdpa.c (100%)
>  rename drivers/net/{ifc/rte_ifcvf_version.map =>
> ifcvf/rte_pmd_ifcvf_version.map} (100%)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 2663f1c03..6f587477c 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -553,10 +553,10 @@ T: git://dpdk.org/next/dpdk-next-net-intel
>  F: drivers/net/avf/
>  F: doc/guides/nics/features/avf*.ini
> 
> -Intel ifc
> +Intel ifcvf
>  M: Xiao Wang <xiao.w.wang@intel.com>
>  T: git://dpdk.org/next/dpdk-next-net-intel
> -F: drivers/net/ifc/
> +F: drivers/net/ifcvf/
>  F: doc/guides/nics/ifcvf.rst
>  F: doc/guides/nics/features/ifcvf.ini
> 
> diff --git a/drivers/net/Makefile b/drivers/net/Makefile
> index 9f9da6651..9308f9a7b 100644
> --- a/drivers/net/Makefile
> +++ b/drivers/net/Makefile
> @@ -59,7 +59,7 @@ endif # $(CONFIG_RTE_LIBRTE_SCHED)
>  ifeq ($(CONFIG_RTE_LIBRTE_VHOST),y)
>  DIRS-$(CONFIG_RTE_LIBRTE_PMD_VHOST) += vhost
>  ifeq ($(CONFIG_RTE_EAL_VFIO),y)
> -DIRS-$(CONFIG_RTE_LIBRTE_IFCVF_VDPA_PMD) += ifc
> +DIRS-$(CONFIG_RTE_LIBRTE_IFCVF_VDPA_PMD) += ifcvf
>  endif
>  endif # $(CONFIG_RTE_LIBRTE_VHOST)
> 
> diff --git a/drivers/net/ifc/Makefile b/drivers/net/ifcvf/Makefile
> similarity index 94%
> rename from drivers/net/ifc/Makefile
> rename to drivers/net/ifcvf/Makefile
> index 1011995bc..a022faaad 100644
> --- a/drivers/net/ifc/Makefile
> +++ b/drivers/net/ifcvf/Makefile
> @@ -22,7 +22,7 @@ BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir
> $(wildcard $(SRCDIR)/base/*.
> 
>  VPATH += $(SRCDIR)/base
> 
> -EXPORT_MAP := rte_ifcvf_version.map
> +EXPORT_MAP := rte_pmd_ifcvf_version.map
> 
>  LIBABIVER := 1
> 
> diff --git a/drivers/net/ifc/base/ifcvf.c b/drivers/net/ifcvf/base/ifcvf.c
> similarity index 100%
> rename from drivers/net/ifc/base/ifcvf.c
> rename to drivers/net/ifcvf/base/ifcvf.c
> diff --git a/drivers/net/ifc/base/ifcvf.h b/drivers/net/ifcvf/base/ifcvf.h
> similarity index 100%
> rename from drivers/net/ifc/base/ifcvf.h
> rename to drivers/net/ifcvf/base/ifcvf.h
> diff --git a/drivers/net/ifc/base/ifcvf_osdep.h
> b/drivers/net/ifcvf/base/ifcvf_osdep.h
> similarity index 100%
> rename from drivers/net/ifc/base/ifcvf_osdep.h
> rename to drivers/net/ifcvf/base/ifcvf_osdep.h
> diff --git a/drivers/net/ifc/ifcvf_vdpa.c b/drivers/net/ifcvf/ifcvf_vdpa.c
> similarity index 100%
> rename from drivers/net/ifc/ifcvf_vdpa.c
> rename to drivers/net/ifcvf/ifcvf_vdpa.c
> diff --git a/drivers/net/ifc/rte_ifcvf_version.map
> b/drivers/net/ifcvf/rte_pmd_ifcvf_version.map
> similarity index 100%
> rename from drivers/net/ifc/rte_ifcvf_version.map
> rename to drivers/net/ifcvf/rte_pmd_ifcvf_version.map
> --
> 2.11.0

Re: [dpdk-dev] [PATCH-18.08 08/15] net/ifc: rename to ifcvf

[Bruce Richardson]

On Fri, May 18, 2018 at 02:52:36AM +0100, Wang, Xiao W wrote:
> Hi Bruce,
> 
> > -----Original Message-----
> > From: Richardson, Bruce
> > Sent: Friday, May 18, 2018 4:15 AM
> > To: dev@dpdk.org
> > Cc: Richardson, Bruce <bruce.richardson@intel.com>; Wang, Xiao W
> > <xiao.w.wang@intel.com>
> > Subject: [PATCH-18.08 08/15] net/ifc: rename to ifcvf
> > 
> > All files in the directory and the resulting driver have prefix of ifcvf,
> > not just ifc, so rename directory for accuracy. Also rename the map file
> > to standard name for meson build in the process.
> 
> Naming the directory as "ifc" allows us to add ifcpf driver into it in the future.
> 
> BRs,
> Xiao
> 

At which point you will have to rename the version file, the rst
documentation file, the resulting shared library file etc. Right now, most
of the references are to ifcvf, with the only exception being the folder
name. This patch makes things consistent by having everything refer to
ifcvf.

If you prefer, I can do a v2 of this set renaming everything to ifc, but
that would be a lot bigger a job, and would also result in the driver file
itself getting a new name too. Unless there are immediate plans to add an
ifcpf driver, I think this change makes more sense.

/Bruce

Re: [dpdk-dev] [PATCH-18.08 02/15] net/avp: add to meson build

[Legacy, Allain]

> -----Original Message-----
> From: Bruce Richardson [mailto:bruce.richardson@intel.com]
> Sent: Thursday, May 17, 2018 4:15 PM
> To: dev@dpdk.org
> Cc: RICHARDSON, BRUCE; Legacy, Allain; Peters, Matt
> Subject: [PATCH-18.08 02/15] net/avp: add to meson build
> 
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
> CC: Allain Legacy <allain.legacy@windriver.com>
> CC: Matt Peters <matt.peters@windriver.com>
> ---
>  drivers/net/avp/meson.build | 5 +++++
>  drivers/net/meson.build     | 4 ++--
>  2 files changed, 7 insertions(+), 2 deletions(-)  create mode 100644
> drivers/net/avp/meson.build
> 
Thanks.


Acked-by:  Allain Legacy <allain.legacy@windriver.com>

Re: [dpdk-dev] [PATCH-18.08 08/15] net/ifc: rename to ifcvf

[Wang, Xiao W]

Hi,

> -----Original Message-----
> From: Richardson, Bruce
> Sent: Friday, May 18, 2018 4:13 PM
> To: Wang, Xiao W <xiao.w.wang@intel.com>
> Cc: dev@dpdk.org
> Subject: Re: [PATCH-18.08 08/15] net/ifc: rename to ifcvf
> 
> On Fri, May 18, 2018 at 02:52:36AM +0100, Wang, Xiao W wrote:
> > Hi Bruce,
> >
> > > -----Original Message-----
> > > From: Richardson, Bruce
> > > Sent: Friday, May 18, 2018 4:15 AM
> > > To: dev@dpdk.org
> > > Cc: Richardson, Bruce <bruce.richardson@intel.com>; Wang, Xiao W
> > > <xiao.w.wang@intel.com>
> > > Subject: [PATCH-18.08 08/15] net/ifc: rename to ifcvf
> > >
> > > All files in the directory and the resulting driver have prefix of ifcvf,
> > > not just ifc, so rename directory for accuracy. Also rename the map file
> > > to standard name for meson build in the process.
> >
> > Naming the directory as "ifc" allows us to add ifcpf driver into it in the future.
> >
> > BRs,
> > Xiao
> >
> 
> At which point you will have to rename the version file, the rst
> documentation file, the resulting shared library file etc. Right now, most
> of the references are to ifcvf, with the only exception being the folder
> name. This patch makes things consistent by having everything refer to
> ifcvf.

OK.

> 
> If you prefer, I can do a v2 of this set renaming everything to ifc, but
> that would be a lot bigger a job, and would also result in the driver file
> itself getting a new name too. Unless there are immediate plans to add an
> ifcpf driver, I think this change makes more sense.

No need for that.

BRs,
Xiao
> 
> /Bruce

Re: [dpdk-dev] [PATCH-18.08 11/15] net/liquidio: add to meson build

[Shijith Thotton]

On Thu, May 17, 2018 at 09:15:22PM +0100, Bruce Richardson wrote:
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> 
> ---
> CC: Shijith Thotton <shijith.thotton@cavium.com>
> CC: Srisivasubramanian Srinivasan <ssrinivasan@cavium.com>
> ---
>  drivers/net/liquidio/Makefile                                     | 2 +-
>  drivers/net/liquidio/meson.build                                  | 8 ++++++++
>  .../{rte_pmd_lio_version.map => rte_pmd_liquidio_version.map}     | 0
>  drivers/net/meson.build                                           | 2 +-
>  4 files changed, 10 insertions(+), 2 deletions(-)
>  create mode 100644 drivers/net/liquidio/meson.build
>  rename drivers/net/liquidio/{rte_pmd_lio_version.map => rte_pmd_liquidio_version.map} (100%)
> 
> diff --git a/drivers/net/liquidio/Makefile b/drivers/net/liquidio/Makefile
> index fc5f18ad6..f1092851a 100644
> --- a/drivers/net/liquidio/Makefile
> +++ b/drivers/net/liquidio/Makefile
> @@ -15,7 +15,7 @@ LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
>  LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
>  LDLIBS += -lrte_bus_pci
>  
> -EXPORT_MAP := rte_pmd_lio_version.map
> +EXPORT_MAP := rte_pmd_liquidio_version.map
>  
>  LIBABIVER := 1
>  
> diff --git a/drivers/net/liquidio/meson.build b/drivers/net/liquidio/meson.build
> new file mode 100644
> index 000000000..9ae48e213
> --- /dev/null
> +++ b/drivers/net/liquidio/meson.build
> @@ -0,0 +1,8 @@
> +# SPDX-License-Identifier: BSD-3-Clause
> +# Copyright(c) 2018 Intel Corporation
> +
> +sources = files('base/lio_23xx_vf.c',
> +	'base/lio_mbox.c',
> +	'lio_ethdev.c',
> +	'lio_rxtx.c')
> +includes += include_directories('base')
> diff --git a/drivers/net/liquidio/rte_pmd_lio_version.map b/drivers/net/liquidio/rte_pmd_liquidio_version.map
> similarity index 100%
> rename from drivers/net/liquidio/rte_pmd_lio_version.map
> rename to drivers/net/liquidio/rte_pmd_liquidio_version.map
> diff --git a/drivers/net/meson.build b/drivers/net/meson.build
> index 213fe734c..9faed7d61 100644
> --- a/drivers/net/meson.build
> +++ b/drivers/net/meson.build
> @@ -6,7 +6,7 @@ drivers = ['af_packet', 'ark', 'avp',
>  	'bnxt', 'cxgbe', 'dpaa', 'dpaa2',
>  	'e1000', 'ena', 'enic', 'failsafe',
>  	'fm10k', 'i40e', 'ifcvf', 'ixgbe',
> -	'kni', 'mvpp2', 'null',
> +	'kni', 'liquidio', 'mvpp2', 'null',
>  	'octeontx', 'pcap', 'ring',
>  	'sfc', 'thunderx', 'virtio']
>  std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc
> -- 
> 2.11.0
> 

Thanks.

Acked-by: Shijith Thotton <shijith.thotton@caviumnetworks.com>

[dpdk-dev] [PATCH v2 00/15] add meson support for more net drivers

[Bruce Richardson]

A number of net drivers require pretty minimal meson.build files to build
successfully with meson. This set adds support for 14 net drivers to the
build.

V2: Small change to net/kni patch to ensure 32-bit builds ok.

Bruce Richardson (15):
  net/ark: add to meson build
  net/avp: add to meson build
  net/bnx2x: add to meson build
  net/bnxt: add to meson build
  net/cxgbe: add to meson build
  net/ena: add to meson build
  net/failsafe: add to meson build
  net/ifc: rename to ifcvf
  net/ifcvf: add to meson build
  net/kni: add to meson build
  net/liquidio: add to meson build
  net/nfp: add to meson build
  net/softnic: add to meson build
  net/szedata2: add to meson build
  net/vhost: add to meson build

 MAINTAINERS                                   |  4 ++--
 app/test-pmd/meson.build                      |  3 +++
 drivers/net/Makefile                          |  2 +-
 drivers/net/ark/meson.build                   | 13 +++++++++++
 drivers/net/avp/meson.build                   |  5 ++++
 drivers/net/bnx2x/meson.build                 | 14 +++++++++++
 drivers/net/bnxt/meson.build                  | 18 +++++++++++++++
 drivers/net/cxgbe/meson.build                 | 11 +++++++++
 drivers/net/ena/meson.build                   |  8 +++++++
 drivers/net/failsafe/meson.build              | 23 +++++++++++++++++++
 drivers/net/{ifc => ifcvf}/Makefile           |  2 +-
 drivers/net/{ifc => ifcvf}/base/ifcvf.c       |  0
 drivers/net/{ifc => ifcvf}/base/ifcvf.h       |  0
 drivers/net/{ifc => ifcvf}/base/ifcvf_osdep.h |  0
 drivers/net/{ifc => ifcvf}/ifcvf_vdpa.c       |  0
 drivers/net/ifcvf/meson.build                 |  7 ++++++
 .../rte_pmd_ifcvf_version.map}                |  0
 drivers/net/kni/meson.build                   |  8 +++++++
 drivers/net/liquidio/Makefile                 |  2 +-
 drivers/net/liquidio/meson.build              |  8 +++++++
 ...rsion.map => rte_pmd_liquidio_version.map} |  0
 drivers/net/meson.build                       | 13 +++++++----
 drivers/net/nfp/meson.build                   | 16 +++++++++++++
 drivers/net/softnic/Makefile                  |  2 +-
 drivers/net/softnic/meson.build               |  7 ++++++
 ...ersion.map => rte_pmd_softnic_version.map} |  0
 drivers/net/szedata2/meson.build              |  7 ++++++
 drivers/net/vhost/meson.build                 |  7 ++++++
 28 files changed, 170 insertions(+), 10 deletions(-)
 create mode 100644 drivers/net/ark/meson.build
 create mode 100644 drivers/net/avp/meson.build
 create mode 100644 drivers/net/bnx2x/meson.build
 create mode 100644 drivers/net/bnxt/meson.build
 create mode 100644 drivers/net/cxgbe/meson.build
 create mode 100644 drivers/net/ena/meson.build
 create mode 100644 drivers/net/failsafe/meson.build
 rename drivers/net/{ifc => ifcvf}/Makefile (94%)
 rename drivers/net/{ifc => ifcvf}/base/ifcvf.c (100%)
 rename drivers/net/{ifc => ifcvf}/base/ifcvf.h (100%)
 rename drivers/net/{ifc => ifcvf}/base/ifcvf_osdep.h (100%)
 rename drivers/net/{ifc => ifcvf}/ifcvf_vdpa.c (100%)
 create mode 100644 drivers/net/ifcvf/meson.build
 rename drivers/net/{ifc/rte_ifcvf_version.map => ifcvf/rte_pmd_ifcvf_version.map} (100%)
 create mode 100644 drivers/net/kni/meson.build
 create mode 100644 drivers/net/liquidio/meson.build
 rename drivers/net/liquidio/{rte_pmd_lio_version.map => rte_pmd_liquidio_version.map} (100%)
 create mode 100644 drivers/net/nfp/meson.build
 create mode 100644 drivers/net/softnic/meson.build
 rename drivers/net/softnic/{rte_pmd_eth_softnic_version.map => rte_pmd_softnic_version.map} (100%)
 create mode 100644 drivers/net/szedata2/meson.build
 create mode 100644 drivers/net/vhost/meson.build

-- 
2.17.1

[dpdk-dev] [PATCH v2 01/15] net/ark: add to meson build

[Bruce Richardson]

CC: Shepard Siegel <shepard.siegel@atomicrules.com>
CC: Ed Czeck <ed.czeck@atomicrules.com>
CC: John Miller <john.miller@atomicrules.com>
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 drivers/net/ark/meson.build | 13 +++++++++++++
 drivers/net/meson.build     |  3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 drivers/net/ark/meson.build

diff --git a/drivers/net/ark/meson.build b/drivers/net/ark/meson.build
new file mode 100644
index 000000000..99151bba1
--- /dev/null
+++ b/drivers/net/ark/meson.build
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Intel Corporation
+
+sources = files('ark_ddm.c',
+	'ark_ethdev.c',
+	'ark_ethdev_rx.c',
+	'ark_ethdev_tx.c',
+	'ark_mpu.c',
+	'ark_pktchkr.c',
+	'ark_pktdir.c',
+	'ark_pktgen.c',
+	'ark_rqp.c',
+	'ark_udm.c')
diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index b7d00a04c..d0ae7c34b 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -1,7 +1,8 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-drivers = ['af_packet', 'axgbe', 'bonding', 'dpaa', 'dpaa2',
+drivers = ['ark',
+	'af_packet', 'axgbe', 'bonding', 'dpaa', 'dpaa2',
 	'e1000', 'enic', 'fm10k', 'i40e', 'ixgbe',
 	'mvpp2', 'null', 'octeontx', 'pcap', 'ring',
 	'sfc', 'thunderx', 'virtio']
-- 
2.17.1

[dpdk-dev] [PATCH v2 02/15] net/avp: add to meson build

[Bruce Richardson]

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by:  Allain Legacy <allain.legacy@windriver.com>
---
 drivers/net/avp/meson.build | 5 +++++
 drivers/net/meson.build     | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 drivers/net/avp/meson.build

diff --git a/drivers/net/avp/meson.build b/drivers/net/avp/meson.build
new file mode 100644
index 000000000..6076c31b9
--- /dev/null
+++ b/drivers/net/avp/meson.build
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Intel Corporation
+
+sources = files('avp_ethdev.c')
+install_headers('rte_avp_common.h', 'rte_avp_fifo.h')
diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index d0ae7c34b..76bf48f3e 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -1,8 +1,8 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-drivers = ['ark',
-	'af_packet', 'axgbe', 'bonding', 'dpaa', 'dpaa2',
+drivers = ['af_packet', 'ark', 'avp',
+	'axgbe', 'bonding', 'dpaa', 'dpaa2',
 	'e1000', 'enic', 'fm10k', 'i40e', 'ixgbe',
 	'mvpp2', 'null', 'octeontx', 'pcap', 'ring',
 	'sfc', 'thunderx', 'virtio']
-- 
2.17.1

[dpdk-dev] [PATCH v2 03/15] net/bnx2x: add to meson build

[Bruce Richardson]

CC: Harish Patil <harish.patil@cavium.com>
CC: Rasesh Mody <rasesh.mody@cavium.com>
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 drivers/net/bnx2x/meson.build | 14 ++++++++++++++
 drivers/net/meson.build       |  3 ++-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 drivers/net/bnx2x/meson.build

diff --git a/drivers/net/bnx2x/meson.build b/drivers/net/bnx2x/meson.build
new file mode 100644
index 000000000..e3c688869
--- /dev/null
+++ b/drivers/net/bnx2x/meson.build
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Intel Corporation
+
+dep = cc.find_library('z', required: false)
+build = dep.found()
+ext_deps += dep
+cflags += '-DZLIB_CONST'
+sources = files('bnx2x.c',
+	'bnx2x_ethdev.c',
+	'bnx2x_rxtx.c',
+	'bnx2x_stats.c',
+	'bnx2x_vfpf.c',
+	'ecore_sp.c',
+	'elink.c')
diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index 76bf48f3e..143355458 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -2,7 +2,8 @@
 # Copyright(c) 2017 Intel Corporation
 
 drivers = ['af_packet', 'ark', 'avp',
-	'axgbe', 'bonding', 'dpaa', 'dpaa2',
+	'axgbe', 'bonding', 'bnx2x',
+	'dpaa', 'dpaa2',
 	'e1000', 'enic', 'fm10k', 'i40e', 'ixgbe',
 	'mvpp2', 'null', 'octeontx', 'pcap', 'ring',
 	'sfc', 'thunderx', 'virtio']
-- 
2.17.1

[dpdk-dev] [PATCH v2 04/15] net/bnxt: add to meson build

[Bruce Richardson]

CC: Ajit Khaparde <ajit.khaparde@broadcom.com>
CC: Somnath Kotur <somnath.kotur@broadcom.com>
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 app/test-pmd/meson.build     |  3 +++
 drivers/net/bnxt/meson.build | 18 ++++++++++++++++++
 drivers/net/meson.build      |  2 +-
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 drivers/net/bnxt/meson.build

diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build
index a51514b03..4c9fbbfda 100644
--- a/app/test-pmd/meson.build
+++ b/app/test-pmd/meson.build
@@ -25,6 +25,9 @@ deps = ['ethdev', 'gro', 'gso', 'cmdline', 'metrics', 'meter', 'bus_pci']
 if dpdk_conf.has('RTE_LIBRTE_PDUMP')
 	deps += 'pdump'
 endif
+if dpdk_conf.has('RTE_LIBRTE_BNXT_PMD')
+	deps += 'pmd_bnxt'
+endif
 if dpdk_conf.has('RTE_LIBRTE_I40E_PMD')
 	deps += 'pmd_i40e'
 endif
diff --git a/drivers/net/bnxt/meson.build b/drivers/net/bnxt/meson.build
new file mode 100644
index 000000000..486bf0fd3
--- /dev/null
+++ b/drivers/net/bnxt/meson.build
@@ -0,0 +1,18 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Intel Corporation
+
+install_headers('rte_pmd_bnxt.h')
+version = 2
+sources = files('bnxt_cpr.c',
+	'bnxt_ethdev.c',
+	'bnxt_filter.c',
+	'bnxt_hwrm.c',
+	'bnxt_irq.c',
+	'bnxt_ring.c',
+	'bnxt_rxq.c',
+	'bnxt_rxr.c',
+	'bnxt_stats.c',
+	'bnxt_txq.c',
+	'bnxt_txr.c',
+	'bnxt_vnic.c',
+	'rte_pmd_bnxt.c')
diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index 143355458..d012c62fe 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -3,7 +3,7 @@
 
 drivers = ['af_packet', 'ark', 'avp',
 	'axgbe', 'bonding', 'bnx2x',
-	'dpaa', 'dpaa2',
+	'bnxt', 'dpaa', 'dpaa2',
 	'e1000', 'enic', 'fm10k', 'i40e', 'ixgbe',
 	'mvpp2', 'null', 'octeontx', 'pcap', 'ring',
 	'sfc', 'thunderx', 'virtio']
-- 
2.17.1

[dpdk-dev] [PATCH v2 05/15] net/cxgbe: add to meson build

[Bruce Richardson]

CC: Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 drivers/net/cxgbe/meson.build | 11 +++++++++++
 drivers/net/meson.build       |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 drivers/net/cxgbe/meson.build

diff --git a/drivers/net/cxgbe/meson.build b/drivers/net/cxgbe/meson.build
new file mode 100644
index 000000000..8196e8afb
--- /dev/null
+++ b/drivers/net/cxgbe/meson.build
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Intel Corporation
+
+sources = files('cxgbe_ethdev.c',
+	'cxgbe_main.c',
+	'cxgbevf_ethdev.c',
+	'cxgbevf_main.c',
+	'sge.c',
+	'base/t4_hw.c',
+	'base/t4vf_hw.c')
+includes += include_directories('base')
diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index d012c62fe..c55ca65a5 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -3,7 +3,7 @@
 
 drivers = ['af_packet', 'ark', 'avp',
 	'axgbe', 'bonding', 'bnx2x',
-	'bnxt', 'dpaa', 'dpaa2',
+	'bnxt', 'cxgbe', 'dpaa', 'dpaa2',
 	'e1000', 'enic', 'fm10k', 'i40e', 'ixgbe',
 	'mvpp2', 'null', 'octeontx', 'pcap', 'ring',
 	'sfc', 'thunderx', 'virtio']
-- 
2.17.1

[dpdk-dev] [PATCH v2 06/15] net/ena: add to meson build

[Bruce Richardson]

CC: Marcin Wojtas <mw@semihalf.com>
CC: Michal Krawczyk <mk@semihalf.com>
CC: Guy Tzalik <gtzalik@amazon.com>
CC: Evgeny Schemeilin <evgenys@amazon.com>
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 drivers/net/ena/meson.build | 8 ++++++++
 drivers/net/meson.build     | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 drivers/net/ena/meson.build

diff --git a/drivers/net/ena/meson.build b/drivers/net/ena/meson.build
new file mode 100644
index 000000000..542f29567
--- /dev/null
+++ b/drivers/net/ena/meson.build
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Intel Corporation
+
+allow_experimental_apis = true
+sources = files('ena_ethdev.c',
+	'base/ena_com.c',
+	'base/ena_eth_com.c')
+includes += include_directories('base', 'base/ena_defs')
diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index c55ca65a5..d4c7d58ab 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -4,7 +4,8 @@
 drivers = ['af_packet', 'ark', 'avp',
 	'axgbe', 'bonding', 'bnx2x',
 	'bnxt', 'cxgbe', 'dpaa', 'dpaa2',
-	'e1000', 'enic', 'fm10k', 'i40e', 'ixgbe',
+	'e1000', 'ena', 'enic',
+	'fm10k', 'i40e', 'ixgbe',
 	'mvpp2', 'null', 'octeontx', 'pcap', 'ring',
 	'sfc', 'thunderx', 'virtio']
 std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc
-- 
2.17.1

[dpdk-dev] [PATCH v2 07/15] net/failsafe: add to meson build

[Bruce Richardson]

CC: Gaetan Rivet <gaetan.rivet@6wind.com>
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 drivers/net/failsafe/meson.build | 23 +++++++++++++++++++++++
 drivers/net/meson.build          |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 drivers/net/failsafe/meson.build

diff --git a/drivers/net/failsafe/meson.build b/drivers/net/failsafe/meson.build
new file mode 100644
index 000000000..a249ff4af
--- /dev/null
+++ b/drivers/net/failsafe/meson.build
@@ -0,0 +1,23 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Intel Corporation
+
+cflags += '-std=gnu99'
+cflags += '-D_DEFAULT_SOURCE'
+cflags += '-D_XOPEN_SOURCE=700'
+cflags += '-pedantic'
+if host_machine.system() == 'linux'
+	cflags += '-DLINUX'
+else
+	cflags += '-DBSD'
+endif
+
+allow_experimental_apis = true
+
+sources = files('failsafe_args.c',
+	'failsafe.c',
+	'failsafe_eal.c',
+	'failsafe_ether.c',
+	'failsafe_flow.c',
+	'failsafe_intr.c',
+	'failsafe_ops.c',
+	'failsafe_rxtx.c')
diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index d4c7d58ab..decb1519a 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -4,7 +4,7 @@
 drivers = ['af_packet', 'ark', 'avp',
 	'axgbe', 'bonding', 'bnx2x',
 	'bnxt', 'cxgbe', 'dpaa', 'dpaa2',
-	'e1000', 'ena', 'enic',
+	'e1000', 'ena', 'enic', 'failsafe',
 	'fm10k', 'i40e', 'ixgbe',
 	'mvpp2', 'null', 'octeontx', 'pcap', 'ring',
 	'sfc', 'thunderx', 'virtio']
-- 
2.17.1

[dpdk-dev] [PATCH v2 08/15] net/ifc: rename to ifcvf

[Bruce Richardson]

All files in the directory and the resulting driver have prefix of ifcvf,
not just ifc, so rename directory for accuracy. Also rename the map file
to standard name for meson build in the process.

CC: Xiao Wang <xiao.w.wang@intel.com>
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 MAINTAINERS                                                   | 4 ++--
 drivers/net/Makefile                                          | 2 +-
 drivers/net/{ifc => ifcvf}/Makefile                           | 2 +-
 drivers/net/{ifc => ifcvf}/base/ifcvf.c                       | 0
 drivers/net/{ifc => ifcvf}/base/ifcvf.h                       | 0
 drivers/net/{ifc => ifcvf}/base/ifcvf_osdep.h                 | 0
 drivers/net/{ifc => ifcvf}/ifcvf_vdpa.c                       | 0
 .../rte_ifcvf_version.map => ifcvf/rte_pmd_ifcvf_version.map} | 0
 8 files changed, 4 insertions(+), 4 deletions(-)
 rename drivers/net/{ifc => ifcvf}/Makefile (94%)
 rename drivers/net/{ifc => ifcvf}/base/ifcvf.c (100%)
 rename drivers/net/{ifc => ifcvf}/base/ifcvf.h (100%)
 rename drivers/net/{ifc => ifcvf}/base/ifcvf_osdep.h (100%)
 rename drivers/net/{ifc => ifcvf}/ifcvf_vdpa.c (100%)
 rename drivers/net/{ifc/rte_ifcvf_version.map => ifcvf/rte_pmd_ifcvf_version.map} (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 4667fa7fb..4f6055590 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -559,10 +559,10 @@ T: git://dpdk.org/next/dpdk-next-net-intel
 F: drivers/net/avf/
 F: doc/guides/nics/features/avf*.ini
 
-Intel ifc
+Intel ifcvf
 M: Xiao Wang <xiao.w.wang@intel.com>
 T: git://dpdk.org/next/dpdk-next-net-intel
-F: drivers/net/ifc/
+F: drivers/net/ifcvf/
 F: doc/guides/nics/ifcvf.rst
 F: doc/guides/nics/features/ifcvf.ini
 
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 9f9da6651..9308f9a7b 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -59,7 +59,7 @@ endif # $(CONFIG_RTE_LIBRTE_SCHED)
 ifeq ($(CONFIG_RTE_LIBRTE_VHOST),y)
 DIRS-$(CONFIG_RTE_LIBRTE_PMD_VHOST) += vhost
 ifeq ($(CONFIG_RTE_EAL_VFIO),y)
-DIRS-$(CONFIG_RTE_LIBRTE_IFCVF_VDPA_PMD) += ifc
+DIRS-$(CONFIG_RTE_LIBRTE_IFCVF_VDPA_PMD) += ifcvf
 endif
 endif # $(CONFIG_RTE_LIBRTE_VHOST)
 
diff --git a/drivers/net/ifc/Makefile b/drivers/net/ifcvf/Makefile
similarity index 94%
rename from drivers/net/ifc/Makefile
rename to drivers/net/ifcvf/Makefile
index 1011995bc..a022faaad 100644
--- a/drivers/net/ifc/Makefile
+++ b/drivers/net/ifcvf/Makefile
@@ -22,7 +22,7 @@ BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.
 
 VPATH += $(SRCDIR)/base
 
-EXPORT_MAP := rte_ifcvf_version.map
+EXPORT_MAP := rte_pmd_ifcvf_version.map
 
 LIBABIVER := 1
 
diff --git a/drivers/net/ifc/base/ifcvf.c b/drivers/net/ifcvf/base/ifcvf.c
similarity index 100%
rename from drivers/net/ifc/base/ifcvf.c
rename to drivers/net/ifcvf/base/ifcvf.c
diff --git a/drivers/net/ifc/base/ifcvf.h b/drivers/net/ifcvf/base/ifcvf.h
similarity index 100%
rename from drivers/net/ifc/base/ifcvf.h
rename to drivers/net/ifcvf/base/ifcvf.h
diff --git a/drivers/net/ifc/base/ifcvf_osdep.h b/drivers/net/ifcvf/base/ifcvf_osdep.h
similarity index 100%
rename from drivers/net/ifc/base/ifcvf_osdep.h
rename to drivers/net/ifcvf/base/ifcvf_osdep.h
diff --git a/drivers/net/ifc/ifcvf_vdpa.c b/drivers/net/ifcvf/ifcvf_vdpa.c
similarity index 100%
rename from drivers/net/ifc/ifcvf_vdpa.c
rename to drivers/net/ifcvf/ifcvf_vdpa.c
diff --git a/drivers/net/ifc/rte_ifcvf_version.map b/drivers/net/ifcvf/rte_pmd_ifcvf_version.map
similarity index 100%
rename from drivers/net/ifc/rte_ifcvf_version.map
rename to drivers/net/ifcvf/rte_pmd_ifcvf_version.map
-- 
2.17.1

[dpdk-dev] [PATCH v2 09/15] net/ifcvf: add to meson build

[Bruce Richardson]

CC: Xiao Wang <xiao.w.wang@intel.com>
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 drivers/net/ifcvf/meson.build | 7 +++++++
 drivers/net/meson.build       | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 drivers/net/ifcvf/meson.build

diff --git a/drivers/net/ifcvf/meson.build b/drivers/net/ifcvf/meson.build
new file mode 100644
index 000000000..a30aa09e6
--- /dev/null
+++ b/drivers/net/ifcvf/meson.build
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Intel Corporation
+
+allow_experimental_apis = true
+sources = files('ifcvf_vdpa.c', 'base/ifcvf.c')
+includes += include_directories('base')
+deps += 'vhost'
diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index decb1519a..c983f90b1 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -5,7 +5,7 @@ drivers = ['af_packet', 'ark', 'avp',
 	'axgbe', 'bonding', 'bnx2x',
 	'bnxt', 'cxgbe', 'dpaa', 'dpaa2',
 	'e1000', 'ena', 'enic', 'failsafe',
-	'fm10k', 'i40e', 'ixgbe',
+	'fm10k', 'i40e', 'ifcvf', 'ixgbe',
 	'mvpp2', 'null', 'octeontx', 'pcap', 'ring',
 	'sfc', 'thunderx', 'virtio']
 std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc
-- 
2.17.1

[dpdk-dev] [PATCH v2 10/15] net/kni: add to meson build

[Bruce Richardson]

Since the kni library is an optional library, we need to add a check
here to ensure that the kni wrapper PMD is only built when the main kni
lib is being built.

CC: Ferruh Yigit <ferruh.yigit@intel.com>
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 drivers/net/kni/meson.build | 8 ++++++++
 drivers/net/meson.build     | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 drivers/net/kni/meson.build

diff --git a/drivers/net/kni/meson.build b/drivers/net/kni/meson.build
new file mode 100644
index 000000000..77468188b
--- /dev/null
+++ b/drivers/net/kni/meson.build
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Intel Corporation
+
+# this driver can be built if-and-only-if KNI library is buildable
+build = dpdk_conf.has('LIB_LIBRTE_KNI')
+allow_experimental_apis = true
+sources = files('rte_eth_kni.c')
+deps += 'kni'
diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index c983f90b1..213fe734c 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -6,7 +6,8 @@ drivers = ['af_packet', 'ark', 'avp',
 	'bnxt', 'cxgbe', 'dpaa', 'dpaa2',
 	'e1000', 'ena', 'enic', 'failsafe',
 	'fm10k', 'i40e', 'ifcvf', 'ixgbe',
-	'mvpp2', 'null', 'octeontx', 'pcap', 'ring',
+	'kni', 'mvpp2', 'null',
+	'octeontx', 'pcap', 'ring',
 	'sfc', 'thunderx', 'virtio']
 std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc
 std_deps += ['bus_pci']         # very many PMDs depend on PCI, so make std
-- 
2.17.1

[dpdk-dev] [PATCH v2 11/15] net/liquidio: add to meson build

[Bruce Richardson]

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Shijith Thotton <shijith.thotton@caviumnetworks.com>
---
 drivers/net/liquidio/Makefile                             | 2 +-
 drivers/net/liquidio/meson.build                          | 8 ++++++++
 ...e_pmd_lio_version.map => rte_pmd_liquidio_version.map} | 0
 drivers/net/meson.build                                   | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 drivers/net/liquidio/meson.build
 rename drivers/net/liquidio/{rte_pmd_lio_version.map => rte_pmd_liquidio_version.map} (100%)

diff --git a/drivers/net/liquidio/Makefile b/drivers/net/liquidio/Makefile
index fc5f18ad6..f1092851a 100644
--- a/drivers/net/liquidio/Makefile
+++ b/drivers/net/liquidio/Makefile
@@ -15,7 +15,7 @@ LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
 LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
 LDLIBS += -lrte_bus_pci
 
-EXPORT_MAP := rte_pmd_lio_version.map
+EXPORT_MAP := rte_pmd_liquidio_version.map
 
 LIBABIVER := 1
 
diff --git a/drivers/net/liquidio/meson.build b/drivers/net/liquidio/meson.build
new file mode 100644
index 000000000..9ae48e213
--- /dev/null
+++ b/drivers/net/liquidio/meson.build
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Intel Corporation
+
+sources = files('base/lio_23xx_vf.c',
+	'base/lio_mbox.c',
+	'lio_ethdev.c',
+	'lio_rxtx.c')
+includes += include_directories('base')
diff --git a/drivers/net/liquidio/rte_pmd_lio_version.map b/drivers/net/liquidio/rte_pmd_liquidio_version.map
similarity index 100%
rename from drivers/net/liquidio/rte_pmd_lio_version.map
rename to drivers/net/liquidio/rte_pmd_liquidio_version.map
diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index 213fe734c..9faed7d61 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -6,7 +6,7 @@ drivers = ['af_packet', 'ark', 'avp',
 	'bnxt', 'cxgbe', 'dpaa', 'dpaa2',
 	'e1000', 'ena', 'enic', 'failsafe',
 	'fm10k', 'i40e', 'ifcvf', 'ixgbe',
-	'kni', 'mvpp2', 'null',
+	'kni', 'liquidio', 'mvpp2', 'null',
 	'octeontx', 'pcap', 'ring',
 	'sfc', 'thunderx', 'virtio']
 std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc
-- 
2.17.1

[dpdk-dev] [PATCH v2 12/15] net/nfp: add to meson build

[Bruce Richardson]

CC: Alejandro Lucero <alejandro.lucero@netronome.com>
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 drivers/net/meson.build     |  2 +-
 drivers/net/nfp/meson.build | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 drivers/net/nfp/meson.build

diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index 9faed7d61..9714491d1 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -6,7 +6,7 @@ drivers = ['af_packet', 'ark', 'avp',
 	'bnxt', 'cxgbe', 'dpaa', 'dpaa2',
 	'e1000', 'ena', 'enic', 'failsafe',
 	'fm10k', 'i40e', 'ifcvf', 'ixgbe',
-	'kni', 'liquidio', 'mvpp2', 'null',
+	'kni', 'liquidio', 'mvpp2', 'nfp', 'null',
 	'octeontx', 'pcap', 'ring',
 	'sfc', 'thunderx', 'virtio']
 std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc
diff --git a/drivers/net/nfp/meson.build b/drivers/net/nfp/meson.build
new file mode 100644
index 000000000..3ba37e279
--- /dev/null
+++ b/drivers/net/nfp/meson.build
@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Intel Corporation
+
+sources = files('nfpcore/nfp_cpp_pcie_ops.c',
+	'nfpcore/nfp_nsp.c',
+	'nfpcore/nfp_cppcore.c',
+	'nfpcore/nfp_resource.c',
+	'nfpcore/nfp_mip.c',
+	'nfpcore/nfp_nffw.c',
+	'nfpcore/nfp_rtsym.c',
+	'nfpcore/nfp_nsp_cmds.c',
+	'nfpcore/nfp_crc.c',
+	'nfpcore/nfp_mutex.c',
+	'nfpcore/nfp_nsp_eth.c',
+	'nfpcore/nfp_hwinfo.c',
+	'nfp_net.c')
-- 
2.17.1

[dpdk-dev] [PATCH v2 13/15] net/softnic: add to meson build

[Bruce Richardson]

CC: Jasvinder Singh <jasvinder.singh@intel.com>
CC: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 drivers/net/meson.build                                    | 3 ++-
 drivers/net/softnic/Makefile                               | 2 +-
 drivers/net/softnic/meson.build                            | 7 +++++++
 ...eth_softnic_version.map => rte_pmd_softnic_version.map} | 0
 4 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 drivers/net/softnic/meson.build
 rename drivers/net/softnic/{rte_pmd_eth_softnic_version.map => rte_pmd_softnic_version.map} (100%)

diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index 9714491d1..9cec3f884 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -8,7 +8,8 @@ drivers = ['af_packet', 'ark', 'avp',
 	'fm10k', 'i40e', 'ifcvf', 'ixgbe',
 	'kni', 'liquidio', 'mvpp2', 'nfp', 'null',
 	'octeontx', 'pcap', 'ring',
-	'sfc', 'thunderx', 'virtio']
+	'sfc', 'softnic',
+	'thunderx', 'virtio']
 std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc
 std_deps += ['bus_pci']         # very many PMDs depend on PCI, so make std
 std_deps += ['bus_vdev']        # same with vdev bus
diff --git a/drivers/net/softnic/Makefile b/drivers/net/softnic/Makefile
index d56fecd62..97ac88411 100644
--- a/drivers/net/softnic/Makefile
+++ b/drivers/net/softnic/Makefile
@@ -14,7 +14,7 @@ LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
 LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_sched
 LDLIBS += -lrte_bus_vdev
 
-EXPORT_MAP := rte_pmd_eth_softnic_version.map
+EXPORT_MAP := rte_pmd_softnic_version.map
 
 LIBABIVER := 1
 
diff --git a/drivers/net/softnic/meson.build b/drivers/net/softnic/meson.build
new file mode 100644
index 000000000..41059da8b
--- /dev/null
+++ b/drivers/net/softnic/meson.build
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Intel Corporation
+
+install_headers('rte_eth_softnic.h')
+sources = files('rte_eth_softnic_tm.c',
+	'rte_eth_softnic.c')
+deps += 'sched'
diff --git a/drivers/net/softnic/rte_pmd_eth_softnic_version.map b/drivers/net/softnic/rte_pmd_softnic_version.map
similarity index 100%
rename from drivers/net/softnic/rte_pmd_eth_softnic_version.map
rename to drivers/net/softnic/rte_pmd_softnic_version.map
-- 
2.17.1

[dpdk-dev] [PATCH v2 14/15] net/szedata2: add to meson build

[Bruce Richardson]

CC: Matej Vido <vido@cesnet.cz>
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 drivers/net/meson.build          | 2 +-
 drivers/net/szedata2/meson.build | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 drivers/net/szedata2/meson.build

diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index 9cec3f884..c7e18a696 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -8,7 +8,7 @@ drivers = ['af_packet', 'ark', 'avp',
 	'fm10k', 'i40e', 'ifcvf', 'ixgbe',
 	'kni', 'liquidio', 'mvpp2', 'nfp', 'null',
 	'octeontx', 'pcap', 'ring',
-	'sfc', 'softnic',
+	'sfc', 'softnic', 'szedata2',
 	'thunderx', 'virtio']
 std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc
 std_deps += ['bus_pci']         # very many PMDs depend on PCI, so make std
diff --git a/drivers/net/szedata2/meson.build b/drivers/net/szedata2/meson.build
new file mode 100644
index 000000000..da3733743
--- /dev/null
+++ b/drivers/net/szedata2/meson.build
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Intel Corporation
+
+dep = cc.find_library('sze2', required: false)
+build = dep.found()
+ext_deps += dep
+sources = files('rte_eth_szedata2.c')
-- 
2.17.1

[dpdk-dev] [PATCH v2 15/15] net/vhost: add to meson build

[Bruce Richardson]

CC: Tetsuya Mukawa <mtetsuyah@gmail.com>
CC: Maxime Coquelin <maxime.coquelin@redhat.com>
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 drivers/net/meson.build       | 2 +-
 drivers/net/vhost/meson.build | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 drivers/net/vhost/meson.build

diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index c7e18a696..aef5ef6c0 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -9,7 +9,7 @@ drivers = ['af_packet', 'ark', 'avp',
 	'kni', 'liquidio', 'mvpp2', 'nfp', 'null',
 	'octeontx', 'pcap', 'ring',
 	'sfc', 'softnic', 'szedata2',
-	'thunderx', 'virtio']
+	'thunderx', 'vhost', 'virtio']
 std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc
 std_deps += ['bus_pci']         # very many PMDs depend on PCI, so make std
 std_deps += ['bus_vdev']        # same with vdev bus
diff --git a/drivers/net/vhost/meson.build b/drivers/net/vhost/meson.build
new file mode 100644
index 000000000..a8f77e1ab
--- /dev/null
+++ b/drivers/net/vhost/meson.build
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Intel Corporation
+
+version = 2
+sources = files('rte_eth_vhost.c')
+install_headers('rte_eth_vhost.h')
+deps += 'vhost'
-- 
2.17.1

Re: [dpdk-dev] [PATCH v2 08/15] net/ifc: rename to ifcvf

[Wang, Xiao W]

Hi Bruce,

> -----Original Message-----
> From: Richardson, Bruce
> Sent: Saturday, June 9, 2018 5:21 AM
> To: dev@dpdk.org
> Cc: Richardson, Bruce <bruce.richardson@intel.com>; Wang, Xiao W
> <xiao.w.wang@intel.com>
> Subject: [PATCH v2 08/15] net/ifc: rename to ifcvf
> 
> All files in the directory and the resulting driver have prefix of ifcvf,
> not just ifc, so rename directory for accuracy. Also rename the map file
> to standard name for meson build in the process.

Compared with renaming the dir to IFCVF and renaming it back to IFC sometime in future,
I think keeping the dir name as IFC is better for us, this avoids the extra effort.
We can just rename below files:
doc/guides/nics/ifcvf.rst => doc/guides/nics/ifc.rst
drivers/net/ifc/rte_ifcvf_version.map => drivers/net/ifc/rte_pmd_ifc_version.

And yes, we need to update documents which refer to ifc.

Thanks!
Xiao

> 
> CC: Xiao Wang <xiao.w.wang@intel.com>
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
>  MAINTAINERS                                                   | 4 ++--
>  drivers/net/Makefile                                          | 2 +-
>  drivers/net/{ifc => ifcvf}/Makefile                           | 2 +-
>  drivers/net/{ifc => ifcvf}/base/ifcvf.c                       | 0
>  drivers/net/{ifc => ifcvf}/base/ifcvf.h                       | 0
>  drivers/net/{ifc => ifcvf}/base/ifcvf_osdep.h                 | 0
>  drivers/net/{ifc => ifcvf}/ifcvf_vdpa.c                       | 0
>  .../rte_ifcvf_version.map => ifcvf/rte_pmd_ifcvf_version.map} | 0
>  8 files changed, 4 insertions(+), 4 deletions(-)
>  rename drivers/net/{ifc => ifcvf}/Makefile (94%)
>  rename drivers/net/{ifc => ifcvf}/base/ifcvf.c (100%)
>  rename drivers/net/{ifc => ifcvf}/base/ifcvf.h (100%)
>  rename drivers/net/{ifc => ifcvf}/base/ifcvf_osdep.h (100%)
>  rename drivers/net/{ifc => ifcvf}/ifcvf_vdpa.c (100%)
>  rename drivers/net/{ifc/rte_ifcvf_version.map =>
> ifcvf/rte_pmd_ifcvf_version.map} (100%)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 4667fa7fb..4f6055590 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -559,10 +559,10 @@ T: git://dpdk.org/next/dpdk-next-net-intel
>  F: drivers/net/avf/
>  F: doc/guides/nics/features/avf*.ini
> 
> -Intel ifc
> +Intel ifcvf
>  M: Xiao Wang <xiao.w.wang@intel.com>
>  T: git://dpdk.org/next/dpdk-next-net-intel
> -F: drivers/net/ifc/
> +F: drivers/net/ifcvf/
>  F: doc/guides/nics/ifcvf.rst
>  F: doc/guides/nics/features/ifcvf.ini
> 
> diff --git a/drivers/net/Makefile b/drivers/net/Makefile
> index 9f9da6651..9308f9a7b 100644
> --- a/drivers/net/Makefile
> +++ b/drivers/net/Makefile
> @@ -59,7 +59,7 @@ endif # $(CONFIG_RTE_LIBRTE_SCHED)
>  ifeq ($(CONFIG_RTE_LIBRTE_VHOST),y)
>  DIRS-$(CONFIG_RTE_LIBRTE_PMD_VHOST) += vhost
>  ifeq ($(CONFIG_RTE_EAL_VFIO),y)
> -DIRS-$(CONFIG_RTE_LIBRTE_IFCVF_VDPA_PMD) += ifc
> +DIRS-$(CONFIG_RTE_LIBRTE_IFCVF_VDPA_PMD) += ifcvf
>  endif
>  endif # $(CONFIG_RTE_LIBRTE_VHOST)
> 
> diff --git a/drivers/net/ifc/Makefile b/drivers/net/ifcvf/Makefile
> similarity index 94%
> rename from drivers/net/ifc/Makefile
> rename to drivers/net/ifcvf/Makefile
> index 1011995bc..a022faaad 100644
> --- a/drivers/net/ifc/Makefile
> +++ b/drivers/net/ifcvf/Makefile
> @@ -22,7 +22,7 @@ BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir
> $(wildcard $(SRCDIR)/base/*.
> 
>  VPATH += $(SRCDIR)/base
> 
> -EXPORT_MAP := rte_ifcvf_version.map
> +EXPORT_MAP := rte_pmd_ifcvf_version.map
> 
>  LIBABIVER := 1
> 
> diff --git a/drivers/net/ifc/base/ifcvf.c b/drivers/net/ifcvf/base/ifcvf.c
> similarity index 100%
> rename from drivers/net/ifc/base/ifcvf.c
> rename to drivers/net/ifcvf/base/ifcvf.c
> diff --git a/drivers/net/ifc/base/ifcvf.h b/drivers/net/ifcvf/base/ifcvf.h
> similarity index 100%
> rename from drivers/net/ifc/base/ifcvf.h
> rename to drivers/net/ifcvf/base/ifcvf.h
> diff --git a/drivers/net/ifc/base/ifcvf_osdep.h
> b/drivers/net/ifcvf/base/ifcvf_osdep.h
> similarity index 100%
> rename from drivers/net/ifc/base/ifcvf_osdep.h
> rename to drivers/net/ifcvf/base/ifcvf_osdep.h
> diff --git a/drivers/net/ifc/ifcvf_vdpa.c b/drivers/net/ifcvf/ifcvf_vdpa.c
> similarity index 100%
> rename from drivers/net/ifc/ifcvf_vdpa.c
> rename to drivers/net/ifcvf/ifcvf_vdpa.c
> diff --git a/drivers/net/ifc/rte_ifcvf_version.map
> b/drivers/net/ifcvf/rte_pmd_ifcvf_version.map
> similarity index 100%
> rename from drivers/net/ifc/rte_ifcvf_version.map
> rename to drivers/net/ifcvf/rte_pmd_ifcvf_version.map
> --
> 2.17.1

Re: [dpdk-dev] [PATCH v2 08/15] net/ifc: rename to ifcvf

[Bruce Richardson]

On Wed, Jun 13, 2018 at 03:46:05AM +0100, Wang, Xiao W wrote:
> Hi Bruce,
> 
> > -----Original Message-----
> > From: Richardson, Bruce
> > Sent: Saturday, June 9, 2018 5:21 AM
> > To: dev@dpdk.org
> > Cc: Richardson, Bruce <bruce.richardson@intel.com>; Wang, Xiao W
> > <xiao.w.wang@intel.com>
> > Subject: [PATCH v2 08/15] net/ifc: rename to ifcvf
> > 
> > All files in the directory and the resulting driver have prefix of ifcvf,
> > not just ifc, so rename directory for accuracy. Also rename the map file
> > to standard name for meson build in the process.
> 
> Compared with renaming the dir to IFCVF and renaming it back to IFC sometime in future,
> I think keeping the dir name as IFC is better for us, this avoids the extra effort.
> We can just rename below files:
> doc/guides/nics/ifcvf.rst => doc/guides/nics/ifc.rst
> drivers/net/ifc/rte_ifcvf_version.map => drivers/net/ifc/rte_pmd_ifc_version.
> 
> And yes, we need to update documents which refer to ifc.
> 
> Thanks!
> Xiao
> 
Ok, that can work.

Re: [dpdk-dev] [PATCH v2 05/15] net/cxgbe: add to meson build

[Ferruh Yigit]

On 6/8/2018 10:20 PM, Bruce Richardson wrote:
> CC: Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
>  drivers/net/cxgbe/meson.build | 11 +++++++++++
>  drivers/net/meson.build       |  2 +-
>  2 files changed, 12 insertions(+), 1 deletion(-)
>  create mode 100644 drivers/net/cxgbe/meson.build
> 
> diff --git a/drivers/net/cxgbe/meson.build b/drivers/net/cxgbe/meson.build
> new file mode 100644
> index 000000000..8196e8afb
> --- /dev/null
> +++ b/drivers/net/cxgbe/meson.build
> @@ -0,0 +1,11 @@
> +# SPDX-License-Identifier: BSD-3-Clause
> +# Copyright(c) 2018 Intel Corporation
> +
> +sources = files('cxgbe_ethdev.c',
> +	'cxgbe_main.c',
> +	'cxgbevf_ethdev.c',
> +	'cxgbevf_main.c',
> +	'sge.c',
> +	'base/t4_hw.c',
> +	'base/t4vf_hw.c')

Recently added files, in next-net commits, added while applying:
cxgbe_filter.c
cxgbe_flow.c

> +includes += include_directories('base')
> diff --git a/drivers/net/meson.build b/drivers/net/meson.build
> index d012c62fe..c55ca65a5 100644
> --- a/drivers/net/meson.build
> +++ b/drivers/net/meson.build
> @@ -3,7 +3,7 @@
>  
>  drivers = ['af_packet', 'ark', 'avp',
>  	'axgbe', 'bonding', 'bnx2x',
> -	'bnxt', 'dpaa', 'dpaa2',
> +	'bnxt', 'cxgbe', 'dpaa', 'dpaa2',
>  	'e1000', 'enic', 'fm10k', 'i40e', 'ixgbe',
>  	'mvpp2', 'null', 'octeontx', 'pcap', 'ring',
>  	'sfc', 'thunderx', 'virtio']
> 

Re: [dpdk-dev] [PATCH v2 06/15] net/ena: add to meson build

[Ferruh Yigit]

On 6/8/2018 10:20 PM, Bruce Richardson wrote:
> CC: Marcin Wojtas <mw@semihalf.com>
> CC: Michal Krawczyk <mk@semihalf.com>
> CC: Guy Tzalik <gtzalik@amazon.com>
> CC: Evgeny Schemeilin <evgenys@amazon.com>
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
>  drivers/net/ena/meson.build | 8 ++++++++
>  drivers/net/meson.build     | 3 ++-
>  2 files changed, 10 insertions(+), 1 deletion(-)
>  create mode 100644 drivers/net/ena/meson.build
> 
> diff --git a/drivers/net/ena/meson.build b/drivers/net/ena/meson.build
> new file mode 100644
> index 000000000..542f29567
> --- /dev/null
> +++ b/drivers/net/ena/meson.build
> @@ -0,0 +1,8 @@
> +# SPDX-License-Identifier: BSD-3-Clause
> +# Copyright(c) 2018 Intel Corporation
> +
> +allow_experimental_apis = true
> +sources = files('ena_ethdev.c',
> +	'base/ena_com.c',
> +	'base/ena_eth_com.c')

Added missing rte_timer dependency while merging:

deps += ['timer']

> +includes += include_directories('base', 'base/ena_defs')
> diff --git a/drivers/net/meson.build b/drivers/net/meson.build
> index c55ca65a5..d4c7d58ab 100644
> --- a/drivers/net/meson.build
> +++ b/drivers/net/meson.build
> @@ -4,7 +4,8 @@
>  drivers = ['af_packet', 'ark', 'avp',
>  	'axgbe', 'bonding', 'bnx2x',
>  	'bnxt', 'cxgbe', 'dpaa', 'dpaa2',
> -	'e1000', 'enic', 'fm10k', 'i40e', 'ixgbe',
> +	'e1000', 'ena', 'enic',
> +	'fm10k', 'i40e', 'ixgbe',
>  	'mvpp2', 'null', 'octeontx', 'pcap', 'ring',
>  	'sfc', 'thunderx', 'virtio']
>  std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc
> 

Re: [dpdk-dev] [PATCH v2 00/15] add meson support for more net drivers

[Ferruh Yigit]

On 6/8/2018 10:20 PM, Bruce Richardson wrote:
> A number of net drivers require pretty minimal meson.build files to build
> successfully with meson. This set adds support for 14 net drivers to the
> build.
> 
> V2: Small change to net/kni patch to ensure 32-bit builds ok.
> 
> Bruce Richardson (15):
>   net/ark: add to meson build
>   net/avp: add to meson build
>   net/bnx2x: add to meson build
>   net/bnxt: add to meson build
>   net/cxgbe: add to meson build
>   net/ena: add to meson build
>   net/failsafe: add to meson build
>   net/ifc: rename to ifcvf
>   net/ifcvf: add to meson build
>   net/kni: add to meson build
>   net/liquidio: add to meson build
>   net/nfp: add to meson build
>   net/softnic: add to meson build
>   net/szedata2: add to meson build
>   net/vhost: add to meson build

Series applied to dpdk-next-net/master, thanks.

With exceptions:

- 8/15, 9/16 dropped from set. They replaced with:
  https://dpdk.org/dev/patchwork/patch/41030/
  https://dpdk.org/dev/patchwork/patch/41029/

- driver list in drivers/net/meson.build serialized while applying

- updates on 5/15 & 6/15 while merging, commented on patches

Re: [dpdk-dev] [PATCH v2 00/15] add meson support for more net drivers

[Ferruh Yigit]

On 6/8/2018 10:20 PM, Bruce Richardson wrote:
> A number of net drivers require pretty minimal meson.build files to build
> successfully with meson. This set adds support for 14 net drivers to the
> build.
> 
> V2: Small change to net/kni patch to ensure 32-bit builds ok.
> 
> Bruce Richardson (15):
>   net/ark: add to meson build
>   net/avp: add to meson build
>   net/bnx2x: add to meson build
>   net/bnxt: add to meson build
>   net/cxgbe: add to meson build
>   net/ena: add to meson build
>   net/failsafe: add to meson build
>   net/ifc: rename to ifcvf
>   net/ifcvf: add to meson build
>   net/kni: add to meson build
>   net/liquidio: add to meson build
>   net/nfp: add to meson build
>   net/softnic: add to meson build
>   net/szedata2: add to meson build
>   net/vhost: add to meson build

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