From patchwork Thu Jun 23 13:49:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 113346 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7FB0AA0093; Thu, 23 Jun 2022 15:50:01 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B1206427EE; Thu, 23 Jun 2022 15:49:57 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mails.dpdk.org (Postfix) with ESMTP id 87FD541143; Thu, 23 Jun 2022 15:49:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1655992195; x=1687528195; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=hW4tS+WMGQjQI0YI2IgeNnORED+pKqlt93gaEO2OXiY=; b=N35uhNcyijSk+LkWeeJEdkiLWYbaVvVdTdboFrnQu996/ovlydsRkCBu tMaOzqTKlpplps6B7oYlQHvI9tuoXuBP6ZsqK0WKZwvwJk0gsP7IrSJM+ IEsdG2txMxCtACEemQrvBychPGjBR91h8rhr+2P+MrMxha8PwXjijDnay HtjoBQg+8fVQCVy+/14NxdvXIPc1YMXRIgvmM/SIYDIuSeEuXFyl5Soc8 2gjLsP+kvcewDcyXH0uOIVwaZ68umXNaIZjNX3KsbLoQgiybwi4Jgde48 G8bbFWOWJVWjF2hqhJ8MCUtH+GQOh6Twj98S4RDCY4JYynuO5Lr+RvLGQ g==; X-IronPort-AV: E=McAfee;i="6400,9594,10386"; a="281800702" X-IronPort-AV: E=Sophos;i="5.92,216,1650956400"; d="scan'208";a="281800702" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 06:49:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,216,1650956400"; d="scan'208";a="678065793" Received: from silpixa00401385.ir.intel.com (HELO silpixa00401385.ger.corp.intel.com.) ([10.237.223.125]) by FMSMGA003.fm.intel.com with ESMTP; 23 Jun 2022 06:49:54 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , stable@dpdk.org Subject: [PATCH 2/3] raw/ioat: fix build when ioat dmadev enabled Date: Thu, 23 Jun 2022 14:49:32 +0100 Message-Id: <20220623134933.469240-3-bruce.richardson@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220623134933.469240-1-bruce.richardson@intel.com> References: <20220623134933.469240-1-bruce.richardson@intel.com> MIME-Version: 1.0 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 The build of the raw/ioat driver only occurs when the equivalent dmadev drivers are disabled. Complications occur when the ioat dmadev is being built but not the idxd. In this case, only the idxd part of raw/ioat gets built, but the definition of the logtype is in the ioat part, causing build errors. .../raw_ioat_idxd_bus.c.o: In function `idxd_vdev_mmap_wq': idxd_bus.c:(.text+0x116): undefined reference to `ioat_pmd_logtype' Fix this by moving the logtype definition to the common C file, and renaming it to avoid conflicts with a similarly named value in the dma/ioat driver. Fixes: ff06fa2cf3ba ("raw/ioat: probe idxd PCI") Cc: stable@dpdk.org Signed-off-by: Bruce Richardson --- drivers/raw/ioat/ioat_common.c | 2 ++ drivers/raw/ioat/ioat_private.h | 4 ++-- drivers/raw/ioat/ioat_rawdev.c | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/raw/ioat/ioat_common.c b/drivers/raw/ioat/ioat_common.c index 60de41152a..e44e181e58 100644 --- a/drivers/raw/ioat/ioat_common.c +++ b/drivers/raw/ioat/ioat_common.c @@ -9,6 +9,8 @@ #include "ioat_private.h" +RTE_LOG_REGISTER_DEFAULT(ioat_rawdev_logtype, INFO); + static const char * const xstat_names[] = { "failed_enqueues", "successful_enqueues", "copies_started", "copies_completed" diff --git a/drivers/raw/ioat/ioat_private.h b/drivers/raw/ioat/ioat_private.h index f032d5fe3d..7fb685a3d7 100644 --- a/drivers/raw/ioat/ioat_private.h +++ b/drivers/raw/ioat/ioat_private.h @@ -18,10 +18,10 @@ #include #include "rte_ioat_rawdev.h" -extern int ioat_pmd_logtype; +extern int ioat_rawdev_logtype; #define IOAT_PMD_LOG(level, fmt, args...) rte_log(RTE_LOG_ ## level, \ - ioat_pmd_logtype, "IOAT: %s(): " fmt "\n", __func__, ##args) + ioat_rawdev_logtype, "IOAT: %s(): " fmt "\n", __func__, ##args) #define IOAT_PMD_DEBUG(fmt, args...) IOAT_PMD_LOG(DEBUG, fmt, ## args) #define IOAT_PMD_INFO(fmt, args...) IOAT_PMD_LOG(INFO, fmt, ## args) diff --git a/drivers/raw/ioat/ioat_rawdev.c b/drivers/raw/ioat/ioat_rawdev.c index 5396671d4f..11341fcf5d 100644 --- a/drivers/raw/ioat/ioat_rawdev.c +++ b/drivers/raw/ioat/ioat_rawdev.c @@ -28,8 +28,6 @@ static struct rte_pci_driver ioat_pmd_drv; #define IOAT_DEVICE_ID_BDXF 0x6f2F #define IOAT_DEVICE_ID_ICX 0x0b00 -RTE_LOG_REGISTER_DEFAULT(ioat_pmd_logtype, INFO); - #define DESC_SZ sizeof(struct rte_ioat_generic_hw_desc) #define COMPLETION_SZ sizeof(__m128i)