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 A748641E90; Tue, 14 Mar 2023 15:30:54 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4F45042C4D; Tue, 14 Mar 2023 15:30:45 +0100 (CET) Received: from wout5-smtp.messagingengine.com (wout5-smtp.messagingengine.com [64.147.123.21]) by mails.dpdk.org (Postfix) with ESMTP id 290B441101; Tue, 14 Mar 2023 15:30:44 +0100 (CET) Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.west.internal (Postfix) with ESMTP id 0F52B3200984; Tue, 14 Mar 2023 10:30:41 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Tue, 14 Mar 2023 10:30:43 -0400 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=fm2; t= 1678804241; x=1678890641; bh=6nPIIZrheKSp6ESNHI5w1FQuoHxL9AKQbVO YYRk3Q20=; b=uzEr4dtM0xc9UiqWw6R95ZH06l1Lys7O9IJ2LwHUbY3B5FbnL70 dnhikXgSV3PADBe3+i+o4WHj8DVJxYh0Gv6iVHWleii2pOtfZ6F5R3eWMJghLoHE hdE0bm6GJW441e2FYy4xC++M23MuhQ0CASsdwI/+qsceMujVALdWvaTmCxDHfC0E JPEB/NC0afn+omddI2RL7irzqeI0FMshQ1Q3L1I05AcQVK9oapsrepNFhDDjVf/c 73OcMY2FDvSRWuJ1jD593R6MRB6f8Noq6/XZlcuyIrVyO7rMyLnvCSf5wOV/tc9V RhGR5h7COsKiOUPMX6zRvcj6oyljjTYI2IQ== 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=fm2; t= 1678804241; x=1678890641; bh=6nPIIZrheKSp6ESNHI5w1FQuoHxL9AKQbVO YYRk3Q20=; b=rsVyytx7IMvdKlMW09CpfWF9mop5OwK6hKt8OLVTh3ugThuxrqh SG8/sB0GnNbtHotM+G8aN2/5Wl1WQ5JsF03e5TKERoqTz34QpLyHO7HVmAOpvhaj bnIcrvt+AKOrZYo70INxYE0couFqgxzNByedvgBud1d2Srv3W8zLKe64V3VQiQTf GwUIYE3KldjeWmsf26Xmcy/ubJCvDrQHj9JL7R1lx8MSrK0XlYHxyqOcki2Xs7Or C+Gqa726QsSI2eyTsReVNC9L8wpyKrMRt0AqtP4/jzuVV9EUyRo6IFpM+Mn//3jM zo393oZZ4uOy+D35/wQ7TYLwMFLGctbTYnw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvddviedgieejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefvhhho mhgrshcuofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlhhonhdrnhgvtheqne cuggftrfgrthhtvghrnheptdeiffffgeefteelhfekueetueduffejgfelvedtieejudek gfevheetheehgeejnecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehmrghilh hfrhhomhepthhhohhmrghssehmohhnjhgrlhhonhdrnhgvth X-ME-Proxy: Feedback-ID: i47234305:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 14 Mar 2023 10:30:39 -0400 (EDT) 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 v3 5/5] drivers: skip build of sub-libs not supporting IOVA mode Date: Tue, 14 Mar 2023 15:29:58 +0100 Message-Id: <20230314142958.3479004-6-thomas@monjalon.net> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230314142958.3479004-1-thomas@monjalon.net> References: <20230219115529.3260580-1-thomas@monjalon.net> <20230314142958.3479004-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..63f60accd9 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 dpdk_conf.get('RTE_IOVA_IN_MBUF') == 0 + subdir_done() +endif + deps += ['mbuf'] sources = files( diff --git a/drivers/event/dlb2/meson.build b/drivers/event/dlb2/meson.build index a2e60273c5..515d1795fe 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 dpdk_conf.get('RTE_IOVA_IN_MBUF') == 0 + 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..0288ed6262 100644 --- a/drivers/net/bnxt/meson.build +++ b/drivers/net/bnxt/meson.build @@ -8,6 +8,10 @@ if is_windows subdir_done() endif +if dpdk_conf.get('RTE_IOVA_IN_MBUF') == 0 + 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..0a0992c3cb 100644 --- a/drivers/net/enic/meson.build +++ b/drivers/net/enic/meson.build @@ -7,6 +7,10 @@ if is_windows subdir_done() endif +if dpdk_conf.get('RTE_IOVA_IN_MBUF') == 0 + 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..8e53b87a65 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 dpdk_conf.get('RTE_IOVA_IN_MBUF') == 0 + 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..fc09ffa2ae 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 dpdk_conf.get('RTE_IOVA_IN_MBUF') == 0 + subdir_done() +endif cflags += ['-Wno-strict-aliasing'] diff --git a/drivers/net/virtio/meson.build b/drivers/net/virtio/meson.build index 0ffd77024e..ef016c1566 100644 --- a/drivers/net/virtio/meson.build +++ b/drivers/net/virtio/meson.build @@ -7,6 +7,10 @@ if is_windows subdir_done() endif +if dpdk_conf.get('RTE_IOVA_IN_MBUF') == 0 + subdir_done() +endif + sources += files( 'virtio.c', 'virtio_cvq.c', -- 2.39.1