From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 8989B2BD8 for ; Tue, 22 May 2018 08:51:47 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 May 2018 23:51:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,429,1520924400"; d="scan'208";a="48842283" Received: from tjozwiax-mobl.ger.corp.intel.com (HELO tojo-VirtualBox.MobicaPL.local) ([10.103.104.44]) by fmsmga002.fm.intel.com with ESMTP; 21 May 2018 23:51:46 -0700 From: Tomasz Jozwiak To: fiona.trahe@intel.com, tomaszx.jozwiak@intel.com, pablo.de.lara.guarch@intel.com, dev@dpdk.org Date: Tue, 22 May 2018 08:51:39 +0200 Message-Id: <1526971901-9281-3-git-send-email-tomaszx.jozwiak@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1526971901-9281-1-git-send-email-tomaszx.jozwiak@intel.com> References: <1526971901-9281-1-git-send-email-tomaszx.jozwiak@intel.com> Subject: [dpdk-dev] [PATCH 2/4] crypto/qat: add libcrypto detection to Makefile X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 May 2018 06:51:48 -0000 This patch adds detection of libcrypto in qat/Makefile. Crypto QAT PMD is build, but only when this library is installed. Signed-off-by: Tomasz Jozwiak Acked-by: Fiona Trahe --- config/common_base | 5 +++-- drivers/crypto/qat/Makefile | 32 ++++++++++++++++++++------------ drivers/crypto/qat/meson.build | 15 +++++++++------ drivers/crypto/qat/qat_sym.h | 9 +++++++++ drivers/crypto/qat/qat_sym_pmd.h | 5 +++++ 5 files changed, 46 insertions(+), 20 deletions(-) diff --git a/config/common_base b/config/common_base index 3cd702e..f456f95 100644 --- a/config/common_base +++ b/config/common_base @@ -480,8 +480,9 @@ CONFIG_RTE_DPAA_SEC_PMD_MAX_NB_SESSIONS=2048 # # Compile PMD for QuickAssist based devices -# -CONFIG_RTE_LIBRTE_PMD_QAT=n +# This QAT flag causes crypto QAT PMD to build, +# but only if libcrypto is installed. +CONFIG_RTE_LIBRTE_PMD_QAT=y # # Max. number of QuickAssist devices, which can be detected and attached # diff --git a/drivers/crypto/qat/Makefile b/drivers/crypto/qat/Makefile index 64f39fd..77700b4 100644 --- a/drivers/crypto/qat/Makefile +++ b/drivers/crypto/qat/Makefile @@ -3,6 +3,9 @@ include $(RTE_SDK)/mk/rte.vars.mk +# libcrypto detection +LIBCRYPTO := $(shell pkg-config --exists libcrypto 1>&2 2> /dev/null; echo $$?) + # library name LIB = librte_pmd_qat.a @@ -15,19 +18,24 @@ CFLAGS += -O3 # external library include paths CFLAGS += -I$(SRCDIR)/qat_adf -LDLIBS += -lcrypto -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_pci -lrte_bus_pci -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += qat_sym.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += qat_device.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += qat_qp.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += qat_sym_session.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += qat_common.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += qat_logs.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += qat_sym_pmd.c +# library common source files +SRCS-y += qat_device.c +SRCS-y += qat_common.c +SRCS-y += qat_logs.c +SRCS-y += qat_qp.c + +ifeq ($(LIBCRYPTO),0) + LDLIBS += -lrte_cryptodev + LDLIBS += -lcrypto + CFLAGS += -DCONFIG_LIBCRYPTO_QAT + SRCS-y += qat_sym.c + SRCS-y += qat_sym_session.c + SRCS-y += qat_sym_pmd.c +endif + +LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool +LDLIBS += -lrte_pci -lrte_bus_pci # export include files SYMLINK-y-include += diff --git a/drivers/crypto/qat/meson.build b/drivers/crypto/qat/meson.build index 6d01dac..c96486a 100644 --- a/drivers/crypto/qat/meson.build +++ b/drivers/crypto/qat/meson.build @@ -2,15 +2,18 @@ # Copyright(c) 2017-2018 Intel Corporation dep = dependency('libcrypto', required: false) -if not dep.found() - build = false -endif + sources = files('qat_common.c', 'qat_qp.c', 'qat_device.c', - 'qat_logs.c', - 'qat_sym_pmd.c', 'qat_sym.c', 'qat_sym_session.c') + 'qat_logs.c') + +if dep.found() + sources += files('qat_sym_pmd.c', 'qat_sym.c', 'qat_sym_session.c') + pkgconfig_extra_libs += '-lcrypto' + cflags += '-DCONFIG_LIBCRYPTO_QAT' +endif + includes += include_directories('qat_adf') deps += ['bus_pci'] ext_deps += dep -pkgconfig_extra_libs += '-lcrypto' diff --git a/drivers/crypto/qat/qat_sym.h b/drivers/crypto/qat/qat_sym.h index f9e72a6..3c8ec5b 100644 --- a/drivers/crypto/qat/qat_sym.h +++ b/drivers/crypto/qat/qat_sym.h @@ -7,6 +7,8 @@ #include +#ifdef CONFIG_LIBCRYPTO_QAT + #include #include "qat_common.h" @@ -153,4 +155,11 @@ qat_sym_process_response(void **op, uint8_t *resp) } *op = (void *)rx_op; } +#else + +static inline void +qat_sym_process_response(void **op __rte_unused, uint8_t *resp __rte_unused) +{ +} +#endif #endif /* _QAT_SYM_H_ */ diff --git a/drivers/crypto/qat/qat_sym_pmd.h b/drivers/crypto/qat/qat_sym_pmd.h index 80a1987..641cc4b 100644 --- a/drivers/crypto/qat/qat_sym_pmd.h +++ b/drivers/crypto/qat/qat_sym_pmd.h @@ -5,6 +5,9 @@ #ifndef _QAT_SYM_PMD_H_ #define _QAT_SYM_PMD_H_ +#ifdef CONFIG_LIBCRYPTO_QAT + + #include #include "qat_sym_capabilities.h" @@ -37,4 +40,6 @@ qat_sym_dev_create(struct qat_pci_device *qat_pci_dev); int qat_sym_dev_destroy(struct qat_pci_device *qat_pci_dev); + +#endif #endif /* _QAT_SYM_PMD_H_ */ -- 2.7.4