From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 078C441DCD; Mon, 6 Mar 2023 17:13:58 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EFF3042BB1; Mon, 6 Mar 2023 17:13:52 +0100 (CET) Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by mails.dpdk.org (Postfix) with ESMTP id 777E842B8B; Mon, 6 Mar 2023 17:13:51 +0100 (CET) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 134A35C0058; Mon, 6 Mar 2023 11:13:51 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Mon, 06 Mar 2023 11:13:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= cc:cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to; s=fm1; t= 1678119231; x=1678205631; bh=0wqNxMWFn9KKP7EezlPFNgRhhbdXy3EQI+N MYGFfRF4=; b=WZ1QY8pm0cpaYa2R37e4Jfoq+0gdYWvQPQRXVvVUiokPTpXSF4I 2gLjrN7XIXoYl3C4uWvOE7z0y9af6qcDEpYYsoscmcA1ZszmAaJXo/uCV4PS51Tj cHfdALJfSSUp9Y4RfsTujb4UGrpLBn1K2RKKL/XB9yQxpds+iiTDEuxU5KonjGm2 0MrdA7sfFVByLEqwN8c1V7gGTL/C69Mn+3leVGnO4acDxHjcLNfjtthBRX0F3JpQ nR9syp4Sp3JrkSBziuKH+31kgRnWmUDdmxLTDrBBGhQACfFS3yVRzki19Ayf6dYw zuI/WCKYbkY7Dyf1qARU0DPnNMs8KgPMIaw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t= 1678119231; x=1678205631; bh=0wqNxMWFn9KKP7EezlPFNgRhhbdXy3EQI+N MYGFfRF4=; b=LgsDE+uLYdTDAw9vbrcWwZsrnkfMpd7dh2sdBieMuaJU6wuxgps qu/Is2SM1ki8U8oZeiyageWPFY+wGoWN5Z7wK8Mtxf9v3lEflEB1pQin/xHDJ5PN 2vrBdyAGiUfzl7BwxG3C8ZpBkFlmlThWewgypoyPZ1aZY5BVjVwD9xeR3vEXBhZE iwfz0iax1TaVO8C39E2zpnPa6pjRS+YuG3OMAxr2Yx+YLAPN2cooSS3H15D/y7p/ lmvYql22rj/OEYms1eazZrcC0w4p18jerthdovpiAtJlBC9fVgVmNaYS+eFirKFU ubbz8IkjogTaLLyeh3veA/CkSfNJdGXvkcA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvddtkedgheekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefvhhho mhgrshcuofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlhhonhdrnhgvtheqne cuggftrfgrthhtvghrnheptdeiffffgeefteelhfekueetueduffejgfelvedtieejudek gfevheetheehgeejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilh hfrhhomhepthhhohhmrghssehmohhnjhgrlhhonhdrnhgvth X-ME-Proxy: Feedback-ID: i47234305:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 6 Mar 2023 11:13:48 -0500 (EST) From: Thomas Monjalon To: dev@dpdk.org Cc: David Marchand , Bruce Richardson , Qi Zhang , =?UTF-8?q?Morten=20Br=C3=B8rup?= , Shijith Thotton , stable@dpdk.org, Jingjing Wu , Beilei Xing , Timothy McDaniel , Ajit Khaparde , Somnath Kotur , John Daley , Hyong Youb Kim , Yuying Zhang , Maxime Coquelin , Chenbo Xia , Olivier Matz Subject: [PATCH v2 2/2] drivers: skip build of sub-libs not supporting IOVA mode Date: Mon, 6 Mar 2023 17:13:28 +0100 Message-Id: <20230306161328.3802696-3-thomas@monjalon.net> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230306161328.3802696-1-thomas@monjalon.net> References: <20230219115529.3260580-1-thomas@monjalon.net> <20230306161328.3802696-1-thomas@monjalon.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org If IOVA as PA is disabled and the driver requires the IOVA field, the build of the driver was disabled. Unfortunately some drivers were building some sub-libraries (with specific options for vector paths) which were not disabled. The build parsing of those drivers need to be skipped earlier to avoid defining the sub-libraries. Fixes: a986c2b7973d ("build: add option to configure IOVA mode as PA") Cc: stable@dpdk.org Signed-off-by: Thomas Monjalon Acked-by: Morten Brørup Acked-by: Shijith Thotton --- drivers/common/idpf/meson.build | 4 ++++ drivers/event/dlb2/meson.build | 5 ++++- drivers/net/bnxt/meson.build | 4 ++++ drivers/net/enic/meson.build | 4 ++++ drivers/net/i40e/meson.build | 4 ++++ drivers/net/iavf/meson.build | 3 +++ drivers/net/virtio/meson.build | 4 ++++ 7 files changed, 27 insertions(+), 1 deletion(-) diff --git a/drivers/common/idpf/meson.build b/drivers/common/idpf/meson.build index 58059ef443..74c0e92cac 100644 --- a/drivers/common/idpf/meson.build +++ b/drivers/common/idpf/meson.build @@ -1,6 +1,10 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2022 Intel Corporation +if not get_option('enable_iova_as_pa') + subdir_done() +endif + deps += ['mbuf'] sources = files( diff --git a/drivers/event/dlb2/meson.build b/drivers/event/dlb2/meson.build index a2e60273c5..8ae7db0011 100644 --- a/drivers/event/dlb2/meson.build +++ b/drivers/event/dlb2/meson.build @@ -1,4 +1,3 @@ - # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2019-2020 Intel Corporation @@ -8,6 +7,10 @@ if not is_linux or not dpdk_conf.has('RTE_ARCH_X86_64') subdir_done() endif +if not get_option('enable_iova_as_pa') + subdir_done() +endif + sources = files( 'dlb2.c', 'dlb2_iface.c', diff --git a/drivers/net/bnxt/meson.build b/drivers/net/bnxt/meson.build index 09d494e90f..c9ca09089a 100644 --- a/drivers/net/bnxt/meson.build +++ b/drivers/net/bnxt/meson.build @@ -8,6 +8,10 @@ if is_windows subdir_done() endif +if not get_option('enable_iova_as_pa') + subdir_done() +endif + headers = files('rte_pmd_bnxt.h') cflags_options = [ '-DSUPPORT_CFA_HW_ALL=1', diff --git a/drivers/net/enic/meson.build b/drivers/net/enic/meson.build index 7131a25f09..f1f7f5432a 100644 --- a/drivers/net/enic/meson.build +++ b/drivers/net/enic/meson.build @@ -7,6 +7,10 @@ if is_windows subdir_done() endif +if not get_option('enable_iova_as_pa') + subdir_done() +endif + sources = files( 'base/vnic_cq.c', 'base/vnic_dev.c', diff --git a/drivers/net/i40e/meson.build b/drivers/net/i40e/meson.build index e00c1a9ef9..689606a1de 100644 --- a/drivers/net/i40e/meson.build +++ b/drivers/net/i40e/meson.build @@ -13,6 +13,10 @@ if arch_subdir == 'riscv' subdir_done() endif +if not get_option('enable_iova_as_pa') + subdir_done() +endif + cflags += ['-DPF_DRIVER', '-DVF_DRIVER', '-DINTEGRATED_VF', diff --git a/drivers/net/iavf/meson.build b/drivers/net/iavf/meson.build index 6df771f917..c95503adda 100644 --- a/drivers/net/iavf/meson.build +++ b/drivers/net/iavf/meson.build @@ -1,6 +1,9 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Luca Boccassi +if not get_option('enable_iova_as_pa') + subdir_done() +endif cflags += ['-Wno-strict-aliasing'] diff --git a/drivers/net/virtio/meson.build b/drivers/net/virtio/meson.build index 0ffd77024e..b8ba1807fa 100644 --- a/drivers/net/virtio/meson.build +++ b/drivers/net/virtio/meson.build @@ -7,6 +7,10 @@ if is_windows subdir_done() endif +if not get_option('enable_iova_as_pa') + subdir_done() +endif + sources += files( 'virtio.c', 'virtio_cvq.c', -- 2.39.1