From patchwork Tue Jul 3 10:31:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 42139 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 271FF1BEB2; Tue, 3 Jul 2018 12:31:53 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 753E11BEB0 for ; Tue, 3 Jul 2018 12:31:51 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Jul 2018 03:31:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,303,1526367600"; d="scan'208";a="63749869" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.223]) by fmsmga002.fm.intel.com with ESMTP; 03 Jul 2018 03:31:50 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Date: Tue, 3 Jul 2018 11:31:12 +0100 Message-Id: <20180703103119.15747-2-bruce.richardson@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703103119.15747-1-bruce.richardson@intel.com> References: <20180608163807.66737-1-bruce.richardson@intel.com> <20180703103119.15747-1-bruce.richardson@intel.com> Subject: [dpdk-dev] [PATCH v2 1/8] kni: disable for 32-bit meson builds 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" The kni library is not supported on 32-bit so disable it for those builds using meson. Signed-off-by: Bruce Richardson Acked-by: Ferruh Yigit Series-acked-by: Hemant Agrawal --- lib/librte_kni/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_kni/meson.build b/lib/librte_kni/meson.build index c4b21961c..a738a033a 100644 --- a/lib/librte_kni/meson.build +++ b/lib/librte_kni/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -if host_machine.system() != 'linux' +if host_machine.system() != 'linux' or cc.sizeof('void *') == 4 build = false endif version = 2 From patchwork Tue Jul 3 10:31:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 42140 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AA1A61BEC1; Tue, 3 Jul 2018 12:32:01 +0200 (CEST) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id 125421BE73 for ; Tue, 3 Jul 2018 12:31:59 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Jul 2018 03:31:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,303,1526367600"; d="scan'208";a="63749898" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.223]) by fmsmga002.fm.intel.com with ESMTP; 03 Jul 2018 03:31:57 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Date: Tue, 3 Jul 2018 11:31:13 +0100 Message-Id: <20180703103119.15747-3-bruce.richardson@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703103119.15747-1-bruce.richardson@intel.com> References: <20180608163807.66737-1-bruce.richardson@intel.com> <20180703103119.15747-1-bruce.richardson@intel.com> Subject: [dpdk-dev] [PATCH v2 2/8] bpf: fix 32-bit build support with meson 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" The JIT is only supported on x86_64 so disable for 32-bit builds. Fixes: cc752e43e079 ("bpf: add JIT compilation for x86_64 ISA") Signed-off-by: Bruce Richardson Acked-by: Konstantin Ananyev Series-acked-by: Hemant Agrawal --- lib/librte_bpf/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_bpf/meson.build b/lib/librte_bpf/meson.build index de9de0091..bc0cd78f9 100644 --- a/lib/librte_bpf/meson.build +++ b/lib/librte_bpf/meson.build @@ -8,7 +8,7 @@ sources = files('bpf.c', 'bpf_pkt.c', 'bpf_validate.c') -if arch_subdir == 'x86' +if arch_subdir == 'x86' and cc.sizeof('void *') == 8 sources += files('bpf_jit_x86.c') endif From patchwork Tue Jul 3 10:31:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 42141 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5EB2A1BEE3; Tue, 3 Jul 2018 12:32:03 +0200 (CEST) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id F3E331BE73 for ; Tue, 3 Jul 2018 12:32:00 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Jul 2018 03:32:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,303,1526367600"; d="scan'208";a="63749917" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.223]) by fmsmga002.fm.intel.com with ESMTP; 03 Jul 2018 03:31:59 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Date: Tue, 3 Jul 2018 11:31:14 +0100 Message-Id: <20180703103119.15747-4-bruce.richardson@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703103119.15747-1-bruce.richardson@intel.com> References: <20180608163807.66737-1-bruce.richardson@intel.com> <20180703103119.15747-1-bruce.richardson@intel.com> Subject: [dpdk-dev] [PATCH v2 3/8] net/sfc: disable for 32-bit builds 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" The sfc driver is not supported on 32-bit so disable in meson in those cases. Signed-off-by: Bruce Richardson Acked-by: Andrew Rybchenko Series-acked-by: Hemant Agrawal --- drivers/net/sfc/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/sfc/meson.build b/drivers/net/sfc/meson.build index 3aa14c7bd..2d34e869d 100644 --- a/drivers/net/sfc/meson.build +++ b/drivers/net/sfc/meson.build @@ -6,7 +6,7 @@ # This software was jointly developed between OKTET Labs (under contract # for Solarflare) and Solarflare Communications, Inc. -if arch_subdir != 'x86' +if arch_subdir != 'x86' or cc.sizeof('void *') == 4 build = false endif From patchwork Tue Jul 3 10:31:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 42142 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C78A01BEED; Tue, 3 Jul 2018 12:32:04 +0200 (CEST) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id B7EEF1BEDB for ; Tue, 3 Jul 2018 12:32:02 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Jul 2018 03:32:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,303,1526367600"; d="scan'208";a="63749938" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.223]) by fmsmga002.fm.intel.com with ESMTP; 03 Jul 2018 03:32:01 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Date: Tue, 3 Jul 2018 11:31:15 +0100 Message-Id: <20180703103119.15747-5-bruce.richardson@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703103119.15747-1-bruce.richardson@intel.com> References: <20180608163807.66737-1-bruce.richardson@intel.com> <20180703103119.15747-1-bruce.richardson@intel.com> Subject: [dpdk-dev] [PATCH v2 4/8] build: disable pointer to int conversion warnings for 32-bit 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" Converting a 32-bit pointer to a 64-bit integer is generally safe, but generates a lot of warnings when compiling 32-bit code with meson. The warnings are not flagged when using make, so just disable them for 32-bit meson builds. Signed-off-by: Bruce Richardson Acked-by: Hemant Agrawal Series-acked-by: Hemant Agrawal --- config/meson.build | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/meson.build b/config/meson.build index 50081b572..1531d9f0e 100644 --- a/config/meson.build +++ b/config/meson.build @@ -60,6 +60,10 @@ warning_flags = [ '-Wno-address-of-packed-member', '-Wno-format-truncation' ] +if cc.sizeof('void *') == 4 +# for 32-bit, don't warn about casting a 32-bit pointer to 64-bit int - it's fine!! + warning_flags += '-Wno-pointer-to-int-cast' +endif foreach arg: warning_flags if cc.has_argument(arg) add_project_arguments(arg, language: 'c') From patchwork Tue Jul 3 10:31:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 42143 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7A5911BEF7; Tue, 3 Jul 2018 12:32:06 +0200 (CEST) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id CE01A1BEEE for ; Tue, 3 Jul 2018 12:32:04 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Jul 2018 03:32:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,303,1526367600"; d="scan'208";a="63749946" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.223]) by fmsmga002.fm.intel.com with ESMTP; 03 Jul 2018 03:32:03 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Date: Tue, 3 Jul 2018 11:31:16 +0100 Message-Id: <20180703103119.15747-6-bruce.richardson@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703103119.15747-1-bruce.richardson@intel.com> References: <20180608163807.66737-1-bruce.richardson@intel.com> <20180703103119.15747-1-bruce.richardson@intel.com> Subject: [dpdk-dev] [PATCH v2 5/8] dpaa2: fix default IOVA build setting for meson builds 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" By default, the DPAA2_USE_PHYS_IOVA setting with the make build-system is "y", which is overridden to "n" in the config file specifically for the arm64-dpaa2-linuxapp-gcc builds. The lack of this setting in meson builds causes issues for 32-bit build, as the alternative code paths have compiler warnings e.g. for i686 builds. Therefore we should align the meson and make settings, setting the value to "true" by default and overriding it to "false" for dpaa2-specific builds. Fixes: 6ec78c2463ac ("build: add meson support for dpaaX platforms") Signed-off-by: Bruce Richardson Acked-by: Hemant Agrawal Series-acked-by: Hemant Agrawal --- config/arm/meson.build | 2 +- config/meson.build | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/config/arm/meson.build b/config/arm/meson.build index 5ad926eda..40dbc87f7 100644 --- a/config/arm/meson.build +++ b/config/arm/meson.build @@ -64,7 +64,7 @@ flags_dpaa2 = [ ['RTE_CACHE_LINE_SIZE', 64], ['RTE_MAX_NUMA_NODES', 1], ['RTE_MAX_LCORE', 16], - ['RTE_LIBRTE_DPAA2_USE_PHYS_IOVA', 'n']] + ['RTE_LIBRTE_DPAA2_USE_PHYS_IOVA', false]] ## Arm implementer ID (ARM DDI 0487C.a, Section G7.2.106, Page G7-5321) impl_generic = ['Generic armv8', flags_generic, machine_args_generic] diff --git a/config/meson.build b/config/meson.build index 1531d9f0e..7a84fa8d0 100644 --- a/config/meson.build +++ b/config/meson.build @@ -78,6 +78,7 @@ dpdk_conf.set('RTE_EAL_ALLOW_INV_SOCKET_ID', get_option('allow_invalid_socket_id # values which have defaults which may be overridden dpdk_conf.set('RTE_MAX_VFIO_GROUPS', 64) dpdk_conf.set('RTE_DRIVER_MEMPOOL_BUCKET_SIZE_KB', 64) +dpdk_conf.set('RTE_LIBRTE_DPAA2_USE_PHYS_IOVA', true) compile_time_cpuflags = [] if host_machine.cpu_family().startswith('x86') From patchwork Tue Jul 3 10:31:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 42144 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4691A1BEF4; Tue, 3 Jul 2018 12:32:09 +0200 (CEST) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id D4B0C1BEE9 for ; Tue, 3 Jul 2018 12:32:06 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Jul 2018 03:32:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,303,1526367600"; d="scan'208";a="63749953" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.223]) by fmsmga002.fm.intel.com with ESMTP; 03 Jul 2018 03:32:05 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Date: Tue, 3 Jul 2018 11:31:17 +0100 Message-Id: <20180703103119.15747-7-bruce.richardson@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703103119.15747-1-bruce.richardson@intel.com> References: <20180608163807.66737-1-bruce.richardson@intel.com> <20180703103119.15747-1-bruce.richardson@intel.com> Subject: [dpdk-dev] [PATCH v2 6/8] examples/kni: fix dependency check for building with meson 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" Rather than hard-coding the example app to be built only when a set of conditions are met, we can simplify things by having the app built when KNI library itself is available. That saves us duplicating the same set of restrictions on both library and example app. Fixes: 89f0711f9ddf ("examples: build some samples with meson") Signed-off-by: Bruce Richardson Series-acked-by: Hemant Agrawal Acked-by: Ferruh Yigit --- examples/kni/meson.build | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/examples/kni/meson.build b/examples/kni/meson.build index 0443ab99b..791316394 100644 --- a/examples/kni/meson.build +++ b/examples/kni/meson.build @@ -6,9 +6,8 @@ # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' -if host_machine.system() != 'linux' - build = false -endif +# this app can be built if-and-only-if KNI library is buildable +build = dpdk_conf.has('RTE_LIBRTE_KNI') deps += ['kni', 'bus_pci'] sources = files( 'main.c' From patchwork Tue Jul 3 10:31:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 42145 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1937D1BEEA; Tue, 3 Jul 2018 12:32:18 +0200 (CEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id 615601BEEA for ; Tue, 3 Jul 2018 12:32:16 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Jul 2018 03:32:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,303,1526367600"; d="scan'208";a="63749977" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.223]) by fmsmga002.fm.intel.com with ESMTP; 03 Jul 2018 03:32:14 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Date: Tue, 3 Jul 2018 11:31:18 +0100 Message-Id: <20180703103119.15747-8-bruce.richardson@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703103119.15747-1-bruce.richardson@intel.com> References: <20180608163807.66737-1-bruce.richardson@intel.com> <20180703103119.15747-1-bruce.richardson@intel.com> Subject: [dpdk-dev] [PATCH v2 7/8] net/avp: fix 32-bit meson builds 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" When compiling with meson, extra warnings are enabled about casting from integers to different size pointers. This triggers an error in AVP as the addition of the offset to the pointer address causes the result to be a 64-bit integer which doesn't fit a 32-bit pointer. The fix here is to explicitly indicate that the offset is of type "uintptr_t" which prevents any promotion which would cause errors. Fixes: c0ad584222b5 ("net/avp: add device initialization") Signed-off-by: Bruce Richardson Acked-by: Allain Legacy Series-acked-by: Hemant Agrawal --- drivers/net/avp/avp_ethdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/avp/avp_ethdev.c b/drivers/net/avp/avp_ethdev.c index dc97e60e6..5e859c8dd 100644 --- a/drivers/net/avp/avp_ethdev.c +++ b/drivers/net/avp/avp_ethdev.c @@ -383,7 +383,7 @@ avp_dev_translate_address(struct rte_eth_dev *eth_dev, (host_phys_addr < (map->phys_addr + map->length))) { /* address is within this segment */ offset += (host_phys_addr - map->phys_addr); - addr = RTE_PTR_ADD(addr, offset); + addr = RTE_PTR_ADD(addr, (uintptr_t)offset); PMD_DRV_LOG(DEBUG, "Translating host physical 0x%" PRIx64 " to guest virtual 0x%p\n", host_phys_addr, addr); From patchwork Tue Jul 3 10:31:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 42146 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 91D311BF07; Tue, 3 Jul 2018 12:32:19 +0200 (CEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id 19B581BEFD for ; Tue, 3 Jul 2018 12:32:17 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Jul 2018 03:32:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,303,1526367600"; d="scan'208";a="63749981" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.223]) by fmsmga002.fm.intel.com with ESMTP; 03 Jul 2018 03:32:16 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Date: Tue, 3 Jul 2018 11:31:19 +0100 Message-Id: <20180703103119.15747-9-bruce.richardson@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703103119.15747-1-bruce.richardson@intel.com> References: <20180608163807.66737-1-bruce.richardson@intel.com> <20180703103119.15747-1-bruce.richardson@intel.com> Subject: [dpdk-dev] [PATCH v2 8/8] net/kni: fix check for meson build 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" The configuration value indicating that KNI was build was incorrect, causing the driver to never be built. Fixes: 3479586fe636 ("net/kni: add to meson build") Signed-off-by: Bruce Richardson Series-acked-by: Hemant Agrawal Acked-by: Ferruh Yigit --- drivers/net/kni/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/kni/meson.build b/drivers/net/kni/meson.build index 77468188b..0f784c6d5 100644 --- a/drivers/net/kni/meson.build +++ b/drivers/net/kni/meson.build @@ -2,7 +2,7 @@ # 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') +build = dpdk_conf.has('RTE_LIBRTE_KNI') allow_experimental_apis = true sources = files('rte_eth_kni.c') deps += 'kni'