From patchwork Tue Dec 22 00:45:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kadam, Pallavi" X-Patchwork-Id: 85622 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 199A4A09EF; Tue, 22 Dec 2020 01:53:04 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AE3C3CAC0; Tue, 22 Dec 2020 01:52:31 +0100 (CET) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id E2D2CCAA2 for ; Tue, 22 Dec 2020 01:52:26 +0100 (CET) IronPort-SDR: sQMzZdPmgDMWIES66q+43/Fm3SQmv/YKHWF9CnVk3ZI6p0Aabvd1xo4ahs3SC8QyUoHvZ16WQA rclehwg6RXOg== X-IronPort-AV: E=McAfee;i="6000,8403,9842"; a="155017041" X-IronPort-AV: E=Sophos;i="5.78,437,1599548400"; d="scan'208";a="155017041" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Dec 2020 16:52:22 -0800 IronPort-SDR: pc36SSWdJjbRVqSsdmgRxyaJIBh2pU7pZc3tTF8FaW3mgcOkzjoaPXSFpzZnE+YLdD+4sfnHZq 34tZ4Zp03axg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.78,437,1599548400"; d="scan'208";a="560558205" Received: from win-dpdk-pallavi.jf.intel.com (HELO localhost.localdomain) ([10.166.188.111]) by orsmga005.jf.intel.com with ESMTP; 21 Dec 2020 16:52:21 -0800 From: Pallavi Kadam To: dev@dpdk.org, thomas@monjalon.net Cc: ranjit.menon@intel.com, dmitry.kozliuk@gmail.com, bruce.richardson@intel.com, ferruh.yigit@intel.com, beilei.xing@intel.com, jia.guo@intel.com, Narcisa.Vasile@microsoft.com, talshn@nvidia.com, pallavi.kadam@intel.com Date: Mon, 21 Dec 2020 16:45:10 -0800 Message-Id: <20201222004511.12948-2-pallavi.kadam@intel.com> X-Mailer: git-send-email 2.18.0.windows.1 In-Reply-To: <20201222004511.12948-1-pallavi.kadam@intel.com> References: <20201217225909.3580-1-pallavi.kadam@intel.com> <20201222004511.12948-1-pallavi.kadam@intel.com> Subject: [dpdk-dev] [PATCH v3 1/2] eal: add rte_random.c file on windows X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This file is required to compile and build i40e PMD on Windows. Add rte_rand variable to export file. Redefine _m_prefetchw for Clang toolchain due to following error with respect to conflicting types: FAILED: lib/76b5a35@@rte_eal@sta/librte_eal_common_rte_random.c.obj clang @lib/76b5a35@@rte_eal@sta/librte_eal_common_rte_random.c.obj.rsp In file included from ../lib/librte_eal/common/rte_random.c:13: In file included from ..\lib/librte_eal/include\rte_eal.h:20: In file included from ..\lib/librte_eal/include\rte_per_lcore.h:25: In file included from ..\lib/librte_eal/windows/include\pthread.h:21: In file included from ..\lib/librte_eal/windows/include\rte_windows.h:27: In file included from C:\Program Files (x86)\Windows Kits\10\include\ 10.0.18362.0\um\windows.h:171: In file included from C:\Program Files (x86)\Windows Kits\10\include\ 10.0.18362.0\shared\windef.h:24: In file included from C:\Program Files (x86)\Windows Kits\10\include\ 10.0.18362.0\shared\minwindef.h:182: C:\Program Files (x86)\Windows Kits\10\include\10.0.18362.0\um\ winnt.h:3324:1: error: conflicting types for '_m_prefetchw' _m_prefetchw ( ^ C:\Program Files\LLVM\lib\clang\10.0.0\include\prfchwintrin.h:50:1: note: previous definition is here _m_prefetchw(void *__P) ^ 1 error generated. Signed-off-by: Pallavi Kadam Reviewed-by: Ranjit Menon --- lib/librte_eal/common/meson.build | 1 + lib/librte_eal/rte_eal_exports.def | 1 + lib/librte_eal/windows/include/rte_windows.h | 6 ++++++ 3 files changed, 8 insertions(+) diff --git a/lib/librte_eal/common/meson.build b/lib/librte_eal/common/meson.build index 39abf7a0a..98e8fffd4 100644 --- a/lib/librte_eal/common/meson.build +++ b/lib/librte_eal/common/meson.build @@ -33,6 +33,7 @@ if is_windows 'malloc_heap.c', 'rte_malloc.c', 'eal_common_timer.c', + 'rte_random.c', 'rte_service.c', ) subdir_done() diff --git a/lib/librte_eal/rte_eal_exports.def b/lib/librte_eal/rte_eal_exports.def index 6a6be1cfa..a2ad4d633 100644 --- a/lib/librte_eal/rte_eal_exports.def +++ b/lib/librte_eal/rte_eal_exports.def @@ -114,6 +114,7 @@ EXPORTS rte_memzone_reserve_bounded rte_memzone_walk rte_openlog_stream + rte_rand rte_realloc rte_rtm_supported rte_service_attr_get diff --git a/lib/librte_eal/windows/include/rte_windows.h b/lib/librte_eal/windows/include/rte_windows.h index b82af34f6..0063b5d78 100644 --- a/lib/librte_eal/windows/include/rte_windows.h +++ b/lib/librte_eal/windows/include/rte_windows.h @@ -18,6 +18,12 @@ #define WIN32_LEAN_AND_MEAN #endif +/* Override Windows SDK definition of _m_prefetchw to avoid conflicting types */ +#ifdef RTE_TOOLCHAIN_CLANG +#undef _m_prefetchw +#define _m_prefetchw __m_prefetchw +#endif + /* Must come first. */ #include From patchwork Tue Dec 22 00:45:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kadam, Pallavi" X-Patchwork-Id: 85621 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 48C27A09EF; Tue, 22 Dec 2020 01:52:47 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 06017CAA9; Tue, 22 Dec 2020 01:52:30 +0100 (CET) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id 66869CAA1 for ; Tue, 22 Dec 2020 01:52:25 +0100 (CET) IronPort-SDR: WGq455XsCFRRYTeFI+jcsaclrbLcX/z9ozPwZJnIiOw7nkibNoHMtPJfmFxO+lAVZva2pm7VlB RJ+GwdWmHW0g== X-IronPort-AV: E=McAfee;i="6000,8403,9842"; a="155017043" X-IronPort-AV: E=Sophos;i="5.78,437,1599548400"; d="scan'208";a="155017043" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Dec 2020 16:52:22 -0800 IronPort-SDR: YvhbYToytpPUmwR3ZDcW1ZISSbABhHp+QTTC43pkyPRVJTmTBFieW0hAtFrTD25MTbwWMkhAre fTtryoEVA5ww== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.78,437,1599548400"; d="scan'208";a="560558207" Received: from win-dpdk-pallavi.jf.intel.com (HELO localhost.localdomain) ([10.166.188.111]) by orsmga005.jf.intel.com with ESMTP; 21 Dec 2020 16:52:21 -0800 From: Pallavi Kadam To: dev@dpdk.org, thomas@monjalon.net Cc: ranjit.menon@intel.com, dmitry.kozliuk@gmail.com, bruce.richardson@intel.com, ferruh.yigit@intel.com, beilei.xing@intel.com, jia.guo@intel.com, Narcisa.Vasile@microsoft.com, talshn@nvidia.com, pallavi.kadam@intel.com Date: Mon, 21 Dec 2020 16:45:11 -0800 Message-Id: <20201222004511.12948-3-pallavi.kadam@intel.com> X-Mailer: git-send-email 2.18.0.windows.1 In-Reply-To: <20201222004511.12948-1-pallavi.kadam@intel.com> References: <20201217225909.3580-1-pallavi.kadam@intel.com> <20201222004511.12948-1-pallavi.kadam@intel.com> Subject: [dpdk-dev] [PATCH v3 2/2] build: i40e PMD on Windows X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Allows i40e PMD to compile on Windows and disable other drivers. Disable few warnings with Clang such as comparison of integers of different signs and macro redefinitions. Adds temp folder mlx5/windows as it is required to build this patch without any build error. This folder will be removed once mlx5 PMD patches are merged. Signed-off-by: Pallavi Kadam Reviewed-by: Ranjit Menon Acked-by: Tal Shnaiderman --- drivers/net/af_xdp/meson.build | 6 ++++++ drivers/net/ark/meson.build | 6 ++++++ drivers/net/atlantic/meson.build | 6 ++++++ drivers/net/bnx2x/meson.build | 6 ++++++ drivers/net/bnxt/meson.build | 6 ++++++ drivers/net/bonding/meson.build | 6 ++++++ drivers/net/cxgbe/meson.build | 6 ++++++ drivers/net/e1000/meson.build | 6 ++++++ drivers/net/ena/meson.build | 6 ++++++ drivers/net/enic/meson.build | 6 ++++++ drivers/net/failsafe/meson.build | 6 ++++++ drivers/net/fm10k/meson.build | 6 ++++++ drivers/net/hinic/meson.build | 6 ++++++ drivers/net/i40e/base/i40e_osdep.h | 10 ++++++++++ drivers/net/i40e/i40e_ethdev_vf.c | 3 ++- drivers/net/i40e/i40e_rxtx_vec_avx2.c | 2 +- drivers/net/i40e/i40e_tm.c | 2 +- drivers/net/iavf/meson.build | 6 ++++++ drivers/net/ice/meson.build | 6 ++++++ drivers/net/igc/meson.build | 6 ++++++ drivers/net/ionic/meson.build | 6 ++++++ drivers/net/ipn3ke/meson.build | 6 ++++++ drivers/net/ixgbe/meson.build | 6 ++++++ drivers/net/kni/meson.build | 6 ++++++ drivers/net/liquidio/meson.build | 6 ++++++ drivers/net/meson.build | 3 --- drivers/net/mlx5/windows/meson.build | 0 drivers/net/mvneta/meson.build | 6 ++++++ drivers/net/mvpp2/meson.build | 6 ++++++ drivers/net/netvsc/meson.build | 6 ++++++ drivers/net/nfb/meson.build | 6 ++++++ drivers/net/null/meson.build | 6 ++++++ drivers/net/octeontx/meson.build | 6 ++++++ drivers/net/octeontx2/meson.build | 6 ++++++ drivers/net/pcap/meson.build | 6 ++++++ drivers/net/qede/meson.build | 6 ++++++ drivers/net/ring/meson.build | 6 ++++++ drivers/net/sfc/meson.build | 6 ++++++ drivers/net/szedata2/meson.build | 6 ++++++ drivers/net/thunderx/meson.build | 6 ++++++ drivers/net/txgbe/meson.build | 6 ++++++ drivers/net/vhost/meson.build | 6 ++++++ drivers/net/virtio/meson.build | 6 ++++++ drivers/net/vmxnet3/meson.build | 6 ++++++ 44 files changed, 242 insertions(+), 6 deletions(-) create mode 100644 drivers/net/mlx5/windows/meson.build diff --git a/drivers/net/af_xdp/meson.build b/drivers/net/af_xdp/meson.build index fead8dd99..dce123036 100644 --- a/drivers/net/af_xdp/meson.build +++ b/drivers/net/af_xdp/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2019 Intel Corporation +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + sources = files('rte_eth_af_xdp.c') bpf_dep = dependency('libbpf', required: false) diff --git a/drivers/net/ark/meson.build b/drivers/net/ark/meson.build index 80bce94e1..aea3ba493 100644 --- a/drivers/net/ark/meson.build +++ b/drivers/net/ark/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + headers = files('rte_pmd_ark.h') sources = files('ark_ddm.c', diff --git a/drivers/net/atlantic/meson.build b/drivers/net/atlantic/meson.build index 60b84684e..01373f868 100644 --- a/drivers/net/atlantic/meson.build +++ b/drivers/net/atlantic/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Aquantia Corporation +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + sources = files( 'atl_rxtx.c', 'atl_ethdev.c', diff --git a/drivers/net/bnx2x/meson.build b/drivers/net/bnx2x/meson.build index 4892bb234..8837ef424 100644 --- a/drivers/net/bnx2x/meson.build +++ b/drivers/net/bnx2x/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + dep = dependency('zlib', required: false) build = dep.found() reason = 'missing dependency, "zlib"' diff --git a/drivers/net/bnxt/meson.build b/drivers/net/bnxt/meson.build index 2896337b5..092655697 100644 --- a/drivers/net/bnxt/meson.build +++ b/drivers/net/bnxt/meson.build @@ -2,6 +2,12 @@ # Copyright(c) 2018 Intel Corporation # Copyright(c) 2020 Broadcom +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + headers = files('rte_pmd_bnxt.h') includes += include_directories('tf_ulp') diff --git a/drivers/net/bonding/meson.build b/drivers/net/bonding/meson.build index adf64626e..4682903a6 100644 --- a/drivers/net/bonding/meson.build +++ b/drivers/net/bonding/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + name = 'bond' #, james bond :-) sources = files('rte_eth_bond_api.c', 'rte_eth_bond_pmd.c', 'rte_eth_bond_flow.c', 'rte_eth_bond_args.c', 'rte_eth_bond_8023ad.c', 'rte_eth_bond_alb.c') diff --git a/drivers/net/cxgbe/meson.build b/drivers/net/cxgbe/meson.build index 3992aba44..52896ea85 100644 --- a/drivers/net/cxgbe/meson.build +++ b/drivers/net/cxgbe/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + sources = files('cxgbe_ethdev.c', 'cxgbe_main.c', 'cxgbevf_ethdev.c', diff --git a/drivers/net/e1000/meson.build b/drivers/net/e1000/meson.build index cf456995c..43ad52cbc 100644 --- a/drivers/net/e1000/meson.build +++ b/drivers/net/e1000/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + subdir('base') objs = [base_objs] diff --git a/drivers/net/ena/meson.build b/drivers/net/ena/meson.build index 189903b90..772fbfc88 100644 --- a/drivers/net/ena/meson.build +++ b/drivers/net/ena/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + sources = files('ena_ethdev.c', 'base/ena_com.c', 'base/ena_eth_com.c') diff --git a/drivers/net/enic/meson.build b/drivers/net/enic/meson.build index 86ef2a8a2..ed699bb37 100644 --- a/drivers/net/enic/meson.build +++ b/drivers/net/enic/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Cisco Systems, Inc. +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + sources = files( 'base/vnic_cq.c', 'base/vnic_dev.c', diff --git a/drivers/net/failsafe/meson.build b/drivers/net/failsafe/meson.build index 56010e212..d8343be63 100644 --- a/drivers/net/failsafe/meson.build +++ b/drivers/net/failsafe/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + cflags += '-std=gnu99' cflags += '-D_DEFAULT_SOURCE' cflags += '-D_XOPEN_SOURCE=700' diff --git a/drivers/net/fm10k/meson.build b/drivers/net/fm10k/meson.build index 2772ea4df..fa264f489 100644 --- a/drivers/net/fm10k/meson.build +++ b/drivers/net/fm10k/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + subdir('base') objs = [base_objs] diff --git a/drivers/net/hinic/meson.build b/drivers/net/hinic/meson.build index bc7e24639..61ea3954c 100644 --- a/drivers/net/hinic/meson.build +++ b/drivers/net/hinic/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Huawei Technologies Co., Ltd +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + subdir('base') objs = [base_objs] diff --git a/drivers/net/i40e/base/i40e_osdep.h b/drivers/net/i40e/base/i40e_osdep.h index 9b5033024..5085d6510 100644 --- a/drivers/net/i40e/base/i40e_osdep.h +++ b/drivers/net/i40e/base/i40e_osdep.h @@ -20,6 +20,7 @@ #include #include "../i40e_logs.h" +#include "i40e_status.h" #define INLINE inline #define STATIC static @@ -67,6 +68,15 @@ typedef enum i40e_status_code i40e_status; #define false 0 #define true 1 +/* Avoid macro redefinition warning on Windows */ +#ifdef RTE_EXEC_ENV_WINDOWS +#ifdef min +#undef min +#endif +#ifdef max +#undef max +#endif +#endif #define min(a,b) RTE_MIN(a,b) #define max(a,b) RTE_MAX(a,b) diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c index c26b036b8..daf4a3f99 100644 --- a/drivers/net/i40e/i40e_ethdev_vf.c +++ b/drivers/net/i40e/i40e_ethdev_vf.c @@ -1495,7 +1495,8 @@ i40evf_handle_aq_msg(struct rte_eth_dev *dev) info.msg_len); else { /* read message and it's expected one */ - if (msg_opc == vf->pend_cmd) { + if ((volatile uint32_t)msg_opc == + vf->pend_cmd) { vf->cmd_retval = msg_ret; /* prevent compiler reordering */ rte_compiler_barrier(); diff --git a/drivers/net/i40e/i40e_rxtx_vec_avx2.c b/drivers/net/i40e/i40e_rxtx_vec_avx2.c index 7a558fc73..e5f0e90cb 100644 --- a/drivers/net/i40e/i40e_rxtx_vec_avx2.c +++ b/drivers/net/i40e/i40e_rxtx_vec_avx2.c @@ -12,7 +12,7 @@ #include "i40e_rxtx.h" #include "i40e_rxtx_vec_common.h" -#include +#include #ifndef __INTEL_COMPILER #pragma GCC diagnostic ignored "-Wcast-qual" diff --git a/drivers/net/i40e/i40e_tm.c b/drivers/net/i40e/i40e_tm.c index 5d722f92c..cab296e1a 100644 --- a/drivers/net/i40e/i40e_tm.c +++ b/drivers/net/i40e/i40e_tm.c @@ -554,7 +554,7 @@ i40e_node_add(struct rte_eth_dev *dev, uint32_t node_id, } /* check level */ if (level_id != RTE_TM_NODE_LEVEL_ID_ANY && - level_id != parent_node_type + 1) { + level_id != (uint32_t)parent_node_type + 1) { error->type = RTE_TM_ERROR_TYPE_NODE_PARAMS; error->message = "Wrong level"; return -EINVAL; diff --git a/drivers/net/iavf/meson.build b/drivers/net/iavf/meson.build index 26c02c440..ac2af81f7 100644 --- a/drivers/net/iavf/meson.build +++ b/drivers/net/iavf/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Luca Boccassi +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + cflags += ['-Wno-strict-aliasing'] includes += include_directories('../../common/iavf') diff --git a/drivers/net/ice/meson.build b/drivers/net/ice/meson.build index 7b291269d..9aab0249a 100644 --- a/drivers/net/ice/meson.build +++ b/drivers/net/ice/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + subdir('base') objs = [base_objs] diff --git a/drivers/net/igc/meson.build b/drivers/net/igc/meson.build index fba119c98..b971e6f8c 100644 --- a/drivers/net/igc/meson.build +++ b/drivers/net/igc/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2019-2020 Intel Corporation +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + subdir('base') objs = [base_objs] diff --git a/drivers/net/ionic/meson.build b/drivers/net/ionic/meson.build index 1c6362d27..631ea27f5 100644 --- a/drivers/net/ionic/meson.build +++ b/drivers/net/ionic/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) # Copyright(c) 2019 Pensando +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + sources = files( 'ionic_mac_api.c', 'ionic_rx_filter.c', diff --git a/drivers/net/ipn3ke/meson.build b/drivers/net/ipn3ke/meson.build index d5000d807..65de9d517 100644 --- a/drivers/net/ipn3ke/meson.build +++ b/drivers/net/ipn3ke/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2019 Intel Corporation +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + # # Add the experimenatal APIs called from this PMD # rte_eth_switch_domain_alloc() diff --git a/drivers/net/ixgbe/meson.build b/drivers/net/ixgbe/meson.build index f10437891..76cbfb830 100644 --- a/drivers/net/ixgbe/meson.build +++ b/drivers/net/ixgbe/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + cflags += ['-DRTE_LIBRTE_IXGBE_BYPASS'] subdir('base') diff --git a/drivers/net/kni/meson.build b/drivers/net/kni/meson.build index d9fa898d1..4d5e5fe36 100644 --- a/drivers/net/kni/meson.build +++ b/drivers/net/kni/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + # this driver can be built if-and-only-if KNI library is buildable build = dpdk_conf.has('RTE_LIB_KNI') reason = 'missing dependency, DPDK KNI library' diff --git a/drivers/net/liquidio/meson.build b/drivers/net/liquidio/meson.build index 9ae48e213..4965ebe85 100644 --- a/drivers/net/liquidio/meson.build +++ b/drivers/net/liquidio/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + sources = files('base/lio_23xx_vf.c', 'base/lio_mbox.c', 'lio_ethdev.c', diff --git a/drivers/net/meson.build b/drivers/net/meson.build index 29f477750..b489088f1 100644 --- a/drivers/net/meson.build +++ b/drivers/net/meson.build @@ -1,9 +1,6 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -if is_windows - subdir_done() -endif drivers = ['af_packet', 'af_xdp', diff --git a/drivers/net/mlx5/windows/meson.build b/drivers/net/mlx5/windows/meson.build new file mode 100644 index 000000000..e69de29bb diff --git a/drivers/net/mvneta/meson.build b/drivers/net/mvneta/meson.build index 8d7202788..c10d2f789 100644 --- a/drivers/net/mvneta/meson.build +++ b/drivers/net/mvneta/meson.build @@ -3,6 +3,12 @@ # Copyright(c) 2018 Semihalf. # All rights reserved. +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + path = get_option('lib_musdk_dir') lib_dir = path + '/lib' inc_dir = path + '/include' diff --git a/drivers/net/mvpp2/meson.build b/drivers/net/mvpp2/meson.build index e06eddaac..4ed392374 100644 --- a/drivers/net/mvpp2/meson.build +++ b/drivers/net/mvpp2/meson.build @@ -3,6 +3,12 @@ # Copyright(c) 2018 Semihalf. # All rights reserved. +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + path = get_option('lib_musdk_dir') lib_dir = path + '/lib' inc_dir = path + '/include' diff --git a/drivers/net/netvsc/meson.build b/drivers/net/netvsc/meson.build index f3f52f732..c190124db 100644 --- a/drivers/net/netvsc/meson.build +++ b/drivers/net/netvsc/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Microsoft Corporation +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + build = dpdk_conf.has('RTE_BUS_VMBUS') reason = 'missing dependency, DPDK VMBus driver' sources = files('hn_ethdev.c', 'hn_rxtx.c', 'hn_rndis.c', 'hn_nvs.c', 'hn_vf.c') diff --git a/drivers/net/nfb/meson.build b/drivers/net/nfb/meson.build index d53e8eca7..42f7921dc 100644 --- a/drivers/net/nfb/meson.build +++ b/drivers/net/nfb/meson.build @@ -3,6 +3,12 @@ # Copyright(c) 2019 Netcope Technologies, a.s. # All rights reserved. +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + dep = dependency('netcope-common', required: false) reason = 'missing dependency, "libnfb"' build = dep.found() diff --git a/drivers/net/null/meson.build b/drivers/net/null/meson.build index 68ac0d2ae..d9fb88fd7 100644 --- a/drivers/net/null/meson.build +++ b/drivers/net/null/meson.build @@ -1,4 +1,10 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + sources = files('rte_eth_null.c') diff --git a/drivers/net/octeontx/meson.build b/drivers/net/octeontx/meson.build index e8d3ff4a3..4e784b948 100644 --- a/drivers/net/octeontx/meson.build +++ b/drivers/net/octeontx/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Cavium, Inc +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + subdir('base') objs = [base_objs] diff --git a/drivers/net/octeontx2/meson.build b/drivers/net/octeontx2/meson.build index 638c04a2f..e2c139a8b 100644 --- a/drivers/net/octeontx2/meson.build +++ b/drivers/net/octeontx2/meson.build @@ -2,6 +2,12 @@ # Copyright(C) 2019 Marvell International Ltd. # +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + if not dpdk_conf.get('RTE_ARCH_64') build = false reason = 'only supported on 64-bit' diff --git a/drivers/net/pcap/meson.build b/drivers/net/pcap/meson.build index b680710aa..b65d91e70 100644 --- a/drivers/net/pcap/meson.build +++ b/drivers/net/pcap/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + if not dpdk_conf.has('RTE_PORT_PCAP') build = false reason = 'missing dependency, "libpcap"' diff --git a/drivers/net/qede/meson.build b/drivers/net/qede/meson.build index ff0ac0b03..05ce69560 100644 --- a/drivers/net/qede/meson.build +++ b/drivers/net/qede/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Luca Boccassi +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + subdir('base') objs = [base_objs] diff --git a/drivers/net/ring/meson.build b/drivers/net/ring/meson.build index 26a324eeb..fb6a5f7d6 100644 --- a/drivers/net/ring/meson.build +++ b/drivers/net/ring/meson.build @@ -1,5 +1,11 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + sources = files('rte_eth_ring.c') headers = files('rte_eth_ring.h') diff --git a/drivers/net/sfc/meson.build b/drivers/net/sfc/meson.build index be888bd87..c3ecdbe19 100644 --- a/drivers/net/sfc/meson.build +++ b/drivers/net/sfc/meson.build @@ -6,6 +6,12 @@ # This software was jointly developed between OKTET Labs (under contract # for Solarflare) and Solarflare Communications, Inc. +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + if (arch_subdir != 'x86' or not dpdk_conf.get('RTE_ARCH_64')) and (arch_subdir != 'arm' or not host_machine.cpu_family().startswith('aarch64')) build = false reason = 'only supported on x86_64 and aarch64' diff --git a/drivers/net/szedata2/meson.build b/drivers/net/szedata2/meson.build index b53fcbc59..4c02830b0 100644 --- a/drivers/net/szedata2/meson.build +++ b/drivers/net/szedata2/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + dep = dependency('libsze2', required: false) build = dep.found() reason = 'missing dependency, "libsze2"' diff --git a/drivers/net/thunderx/meson.build b/drivers/net/thunderx/meson.build index 69819a97f..dad5c5924 100644 --- a/drivers/net/thunderx/meson.build +++ b/drivers/net/thunderx/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Cavium, Inc +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + subdir('base') objs = [base_objs] diff --git a/drivers/net/txgbe/meson.build b/drivers/net/txgbe/meson.build index 345dffaf6..a18660078 100644 --- a/drivers/net/txgbe/meson.build +++ b/drivers/net/txgbe/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2015-2020 +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + subdir('base') objs = [base_objs] diff --git a/drivers/net/vhost/meson.build b/drivers/net/vhost/meson.build index 1ae4854b8..804b7a1dd 100644 --- a/drivers/net/vhost/meson.build +++ b/drivers/net/vhost/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + build = dpdk_conf.has('RTE_LIB_VHOST') reason = 'missing dependency, DPDK vhost library' sources = files('rte_eth_vhost.c') diff --git a/drivers/net/virtio/meson.build b/drivers/net/virtio/meson.build index eaed46373..a06b9dde7 100644 --- a/drivers/net/virtio/meson.build +++ b/drivers/net/virtio/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + sources += files('virtio_ethdev.c', 'virtio_pci.c', 'virtio_rxtx.c', diff --git a/drivers/net/vmxnet3/meson.build b/drivers/net/vmxnet3/meson.build index 0641f776f..124238666 100644 --- a/drivers/net/vmxnet3/meson.build +++ b/drivers/net/vmxnet3/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Luca Boccassi +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + sources += files( 'vmxnet3_ethdev.c', 'vmxnet3_rxtx.c',