From patchwork Thu Sep 16 06:11:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Pai G, Sunil" X-Patchwork-Id: 1528650 X-Patchwork-Delegate: i.maximets@samsung.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.133; helo=smtp2.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4H96Ct1dhlz9sXS for ; Thu, 16 Sep 2021 16:11:20 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 06AA9401AE; Thu, 16 Sep 2021 06:11:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rtLy1fpLr4fG; Thu, 16 Sep 2021 06:11:16 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp2.osuosl.org (Postfix) with ESMTPS id 04CA640114; Thu, 16 Sep 2021 06:11:15 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id C27A3C0011; Thu, 16 Sep 2021 06:11:15 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) by lists.linuxfoundation.org (Postfix) with ESMTP id E599AC000D for ; Thu, 16 Sep 2021 06:11:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id CACEB82F32 for ; Thu, 16 Sep 2021 06:11:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sfYVSLLEyRR2 for ; Thu, 16 Sep 2021 06:11:13 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by smtp1.osuosl.org (Postfix) with ESMTPS id 37A9282EF1 for ; Thu, 16 Sep 2021 06:11:13 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10108"; a="201993635" X-IronPort-AV: E=Sophos;i="5.85,297,1624345200"; d="scan'208";a="201993635" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Sep 2021 23:11:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,297,1624345200"; d="scan'208";a="471237679" Received: from silpixa00400896.ir.intel.com ([10.243.22.68]) by fmsmga007.fm.intel.com with ESMTP; 15 Sep 2021 23:11:09 -0700 From: Sunil Pai G To: dev@openvswitch.org Date: Thu, 16 Sep 2021 06:11:06 +0000 Message-Id: <20210916061106.44853-1-sunil.pai.g@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Cc: david.marchand@redhat.com, i.maximets@ovn.org Subject: [ovs-dev] [PATCH v2] acinclude: Use standardized DPDK component defines. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" The DPDK component defines have been renamed from RTE_LIBRTE_* to macro's of the form: "RTE_" + + "_" + drivername as documented in the commit [1]. This commit replaces the old macro's with new ones. Macro's changed: OLD NEW --------- ---------- RTE_LIBRTE_PMD_PCAP --> RTE_NET_PCAP RTE_LIBRTE_PMD_AF_XDP --> RTE_NET_AF_XDP RTE_LIBRTE_MLX5_PMD --> RTE_NET_MLX5 RTE_LIBRTE_MLX4_PMD --> RTE_NET_MLX4 [1]: 762bfccc8abf ("config: remove compatibility build defines") Signed-off-by: Sunil Pai G Reviewed-by: David Marchand --- v1 -> v2: * Modify commit message to include the right DPDK reference commit. * Change target branch from dpdk-latest to master. --- acinclude.m4 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index dba365ea1..8ab690f47 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -446,11 +446,11 @@ AC_DEFUN([OVS_CHECK_DPDK], [ OVS_FIND_DEPENDENCY([get_mempolicy], [numa], [libnuma]) ], [], [[#include ]]) - AC_CHECK_DECL([RTE_LIBRTE_PMD_PCAP], [ + AC_CHECK_DECL([RTE_NET_PCAP], [ OVS_FIND_DEPENDENCY([pcap_dump_close], [pcap], [libpcap]) ], [], [[#include ]]) - AC_CHECK_DECL([RTE_LIBRTE_PMD_AF_XDP], [ + AC_CHECK_DECL([RTE_NET_AF_XDP], [ LIBBPF_LDADD="-lbpf" ], [], [[#include ]]) @@ -458,14 +458,14 @@ AC_DEFUN([OVS_CHECK_DPDK], [ AC_DEFINE([VHOST_NUMA], [1], [NUMA Aware vHost support detected in DPDK.]) ], [], [[#include ]]) - AC_CHECK_DECL([RTE_LIBRTE_MLX5_PMD], [dnl found + AC_CHECK_DECL([RTE_NET_MLX5], [dnl found AC_CHECK_DECL([RTE_IBVERBS_LINK_DLOPEN], [], [dnl not found OVS_FIND_DEPENDENCY([mlx5dv_create_wq], [mlx5], [libmlx5]) OVS_FIND_DEPENDENCY([verbs_init_cq], [ibverbs], [libibverbs]) ], [[#include ]]) ], [], [[#include ]]) - AC_CHECK_DECL([RTE_LIBRTE_MLX4_PMD], [dnl found + AC_CHECK_DECL([RTE_NET_MLX4], [dnl found AC_CHECK_DECL([RTE_IBVERBS_LINK_DLOPEN], [], [dnl not found OVS_FIND_DEPENDENCY([mlx4dv_init_obj], [mlx4], [libmlx4]) OVS_FIND_DEPENDENCY([verbs_init_cq], [ibverbs], [libibverbs])