From patchwork Wed Jan 18 11:05:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "De Lara Guarch, Pablo" X-Patchwork-Id: 122304 X-Patchwork-Delegate: gakhil@marvell.com 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 867774240D; Wed, 18 Jan 2023 12:06:25 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 74CF9400D6; Wed, 18 Jan 2023 12:06:25 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mails.dpdk.org (Postfix) with ESMTP id 030494003F; Wed, 18 Jan 2023 12:06:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674039984; x=1705575984; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=NcIsW4IcjP5n4n2UKmRCPeoSTbpY0QbGMF7e5T+T2sE=; b=Qsng/MY6mzEH/wqqYsyOz3WnrDZHZ5yw6QisXLdGxbJq3GAsaWMt1Fdb qBYjU8jr25ewBfYeDOCTMx1Z9K4XZI788+eHSlrx4jBEsoEgbJZGbBplf 2BumHenZD7gynMeOzf6CsIyoECP+reJUdz39k2Yhk1mPJwJaUjL8LOcJE vYHtog5Pezq3rKp+ZWqcPgkkNMrFQF+lNVPYV4SmfkIW8/bwjMV0Oi9Eq OAvtiJtEwRfJouzH9Mc8L4WMDFWsTLSvs8OpLUhzM1bMj8CcOl33RHTo4 ScmAfXTFqmec8cwaqqdRAAcSDx27B/6awJzzrIL+OGr/TLs1W/s/ihX5r A==; X-IronPort-AV: E=McAfee;i="6500,9779,10593"; a="325009482" X-IronPort-AV: E=Sophos;i="5.97,226,1669104000"; d="scan'208";a="325009482" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jan 2023 03:06:23 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10593"; a="728151625" X-IronPort-AV: E=Sophos;i="5.97,226,1669104000"; d="scan'208";a="728151625" Received: from silpixa00401399.ir.intel.com ([10.55.128.139]) by fmsmga004.fm.intel.com with ESMTP; 18 Jan 2023 03:06:00 -0800 From: Pablo de Lara To: gakhil@marvell.com Cc: dev@dpdk.org, Pablo de Lara , stable@dpdk.org, kai.ji@intel.com Subject: [PATCH v2] crypto/qat: fix build Date: Wed, 18 Jan 2023 11:05:58 +0000 Message-Id: <20230118110558.1136485-1-pablo.de.lara.guarch@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230112193045.2907753-1-pablo.de.lara.guarch@intel.com> References: <20230112193045.2907753-1-pablo.de.lara.guarch@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 When building QAT PMD, the following issue comes up: intel-ipsec-mb.h:333: error: "AES_BLOCK_SIZE" redefined 333 | #define AES_BLOCK_SIZE IMB_AES_BLOCK_SIZE In file included from drivers/crypto/qat/qat_sym_session.c:8: /usr/include/openssl/aes.h:26: previous definition 26 | # define AES_BLOCK_SIZE 16 By defining NO_COMPAT_IMB_API_053, it prevents legacy macros like AES_BLOCK_SIZE from being defined from IPSec MB library, avoiding the redefinition. Fixes: 3227bc7138f5 ("crypto/qat: use intel-ipsec-mb for partial hash and AES") Cc: stable@dpdk.org Cc: kai.ji@intel.com Signed-off-by: Pablo de Lara Acked-by: Kai Ji --- v2: reworded the commit message --- drivers/crypto/qat/qat_sym_session.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/crypto/qat/qat_sym_session.c b/drivers/crypto/qat/qat_sym_session.c index 978ee49dce..7f18e9875d 100644 --- a/drivers/crypto/qat/qat_sym_session.c +++ b/drivers/crypto/qat/qat_sym_session.c @@ -10,6 +10,7 @@ #include /* Needed for bpi runt block processing */ #ifdef RTE_QAT_LIBIPSECMB +#define NO_COMPAT_IMB_API_053 #if defined(RTE_ARCH_ARM) #include #else