From patchwork Thu Jun 14 11:12:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Jozwiak X-Patchwork-Id: 41122 X-Patchwork-Delegate: pablo.de.lara.guarch@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 092491E41E; Thu, 14 Jun 2018 13:12:31 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 85C451E35D for ; Thu, 14 Jun 2018 13:12:23 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Jun 2018 04:12:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,222,1526367600"; d="scan'208";a="66941326" Received: from tjozwiax-mobl.ger.corp.intel.com (HELO tojo-VirtualBox.MobicaPL.local) ([10.103.104.42]) by orsmga002.jf.intel.com with ESMTP; 14 Jun 2018 04:12:22 -0700 From: Tomasz Jozwiak To: fiona.trahe@intel.com, tomaszx.jozwiak@intel.com, dev@dpdk.org Date: Thu, 14 Jun 2018 13:12:17 +0200 Message-Id: <1528974737-13518-4-git-send-email-tomaszx.jozwiak@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1528974737-13518-1-git-send-email-tomaszx.jozwiak@intel.com> References: <1526971901-9281-1-git-send-email-tomaszx.jozwiak@intel.com> <1528974737-13518-1-git-send-email-tomaszx.jozwiak@intel.com> Subject: [dpdk-dev] [PATCH v2 3/3] crypto/qat: move common qat files to common dir 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" - moved common qat files to common/qat dir. - changed common/qat/Makefile, common/qat/meson.build, drivers/Makefile, crypto/Makefile to add possibility of using new files locations - added README file into crypto/qat to clarify where the build is made from - updated MAINTAINERS file Signed-off-by: Tomasz Jozwiak Acked-by: Fiona Trahe --- MAINTAINERS | 1 + drivers/Makefile | 2 ++ drivers/common/meson.build | 2 +- drivers/{crypto => common}/qat/Makefile | 13 ++++++--- drivers/common/qat/meson.build | 14 ++++++++++ .../qat/qat_adf/adf_transport_access_macros.h | 0 .../{crypto => common}/qat/qat_adf/icp_qat_fw.h | 0 .../{crypto => common}/qat/qat_adf/icp_qat_fw_la.h | 0 .../{crypto => common}/qat/qat_adf/icp_qat_hw.h | 0 drivers/{crypto => common}/qat/qat_common.c | 0 drivers/{crypto => common}/qat/qat_common.h | 0 drivers/{crypto => common}/qat/qat_device.c | 0 drivers/{crypto => common}/qat/qat_device.h | 0 drivers/{crypto => common}/qat/qat_logs.c | 0 drivers/{crypto => common}/qat/qat_logs.h | 0 drivers/{crypto => common}/qat/qat_qp.c | 0 drivers/{crypto => common}/qat/qat_qp.h | 0 drivers/crypto/Makefile | 1 - drivers/crypto/qat/README | 8 ++++++ drivers/crypto/qat/meson.build | 31 +++++++++++++--------- 20 files changed, 53 insertions(+), 19 deletions(-) rename drivers/{crypto => common}/qat/Makefile (72%) create mode 100644 drivers/common/qat/meson.build rename drivers/{crypto => common}/qat/qat_adf/adf_transport_access_macros.h (100%) rename drivers/{crypto => common}/qat/qat_adf/icp_qat_fw.h (100%) rename drivers/{crypto => common}/qat/qat_adf/icp_qat_fw_la.h (100%) rename drivers/{crypto => common}/qat/qat_adf/icp_qat_hw.h (100%) rename drivers/{crypto => common}/qat/qat_common.c (100%) rename drivers/{crypto => common}/qat/qat_common.h (100%) rename drivers/{crypto => common}/qat/qat_device.c (100%) rename drivers/{crypto => common}/qat/qat_device.h (100%) rename drivers/{crypto => common}/qat/qat_logs.c (100%) rename drivers/{crypto => common}/qat/qat_logs.h (100%) rename drivers/{crypto => common}/qat/qat_qp.c (100%) rename drivers/{crypto => common}/qat/qat_qp.h (100%) create mode 100644 drivers/crypto/qat/README diff --git a/MAINTAINERS b/MAINTAINERS index 7cc8860..aada659 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -757,6 +757,7 @@ M: John Griffin M: Fiona Trahe M: Deepak Kumar Jain F: drivers/crypto/qat/ +F: drivers/common/qat/ F: doc/guides/cryptodevs/qat.rst F: doc/guides/cryptodevs/features/qat.ini diff --git a/drivers/Makefile b/drivers/Makefile index c88638c..7566076 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -13,6 +13,8 @@ DIRS-$(CONFIG_RTE_LIBRTE_BBDEV) += baseband DEPDIRS-baseband := common bus mempool DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += crypto DEPDIRS-crypto := common bus mempool +DIRS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += common/qat +DEPDIRS-common/qat := bus mempool DIRS-$(CONFIG_RTE_LIBRTE_COMPRESSDEV) += compress DEPDIRS-compress := bus mempool DIRS-$(CONFIG_RTE_LIBRTE_EVENTDEV) += event diff --git a/drivers/common/meson.build b/drivers/common/meson.build index 5f6341b..d7b7d8c 100644 --- a/drivers/common/meson.build +++ b/drivers/common/meson.build @@ -2,6 +2,6 @@ # Copyright(c) 2018 Cavium, Inc std_deps = ['eal'] -drivers = ['octeontx'] +drivers = ['octeontx', 'qat'] config_flag_fmt = 'RTE_LIBRTE_@0@_COMMON' driver_name_fmt = 'rte_common_@0@' diff --git a/drivers/crypto/qat/Makefile b/drivers/common/qat/Makefile similarity index 72% rename from drivers/crypto/qat/Makefile rename to drivers/common/qat/Makefile index 77700b4..d2c1e2c 100644 --- a/drivers/crypto/qat/Makefile +++ b/drivers/common/qat/Makefile @@ -16,8 +16,13 @@ LIBABIVER := 1 CFLAGS += $(WERROR_FLAGS) CFLAGS += -O3 +# build directories +QAT_CRYPTO_DIR := $(RTE_SDK)/drivers/crypto/qat + # external library include paths CFLAGS += -I$(SRCDIR)/qat_adf +CFLAGS += -I$(SRCDIR) +CFLAGS += -I$(QAT_CRYPTO_DIR) # library common source files SRCS-y += qat_device.c @@ -29,9 +34,9 @@ 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 + SRCS-y += $(QAT_CRYPTO_DIR)/qat_sym.c + SRCS-y += $(QAT_CRYPTO_DIR)/qat_sym_session.c + SRCS-y += $(QAT_CRYPTO_DIR)/qat_sym_pmd.c endif LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool @@ -41,6 +46,6 @@ LDLIBS += -lrte_pci -lrte_bus_pci SYMLINK-y-include += # versioning export map -EXPORT_MAP := rte_pmd_qat_version.map +EXPORT_MAP := ../../crypto/qat/rte_pmd_qat_version.map include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/common/qat/meson.build b/drivers/common/qat/meson.build new file mode 100644 index 0000000..80b6b25 --- /dev/null +++ b/drivers/common/qat/meson.build @@ -0,0 +1,14 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2017-2018 Intel Corporation + +# This does not build a driver, but instead holds common files for +# the crypto and compression drivers. +build = false +qat_deps = ['bus_pci'] +qat_sources = files('qat_common.c', + 'qat_qp.c', + 'qat_device.c', + 'qat_logs.c') +qat_includes = [include_directories('.', 'qat_adf')] +qat_ext_deps = [] +qat_cflags = [] diff --git a/drivers/crypto/qat/qat_adf/adf_transport_access_macros.h b/drivers/common/qat/qat_adf/adf_transport_access_macros.h similarity index 100% rename from drivers/crypto/qat/qat_adf/adf_transport_access_macros.h rename to drivers/common/qat/qat_adf/adf_transport_access_macros.h diff --git a/drivers/crypto/qat/qat_adf/icp_qat_fw.h b/drivers/common/qat/qat_adf/icp_qat_fw.h similarity index 100% rename from drivers/crypto/qat/qat_adf/icp_qat_fw.h rename to drivers/common/qat/qat_adf/icp_qat_fw.h diff --git a/drivers/crypto/qat/qat_adf/icp_qat_fw_la.h b/drivers/common/qat/qat_adf/icp_qat_fw_la.h similarity index 100% rename from drivers/crypto/qat/qat_adf/icp_qat_fw_la.h rename to drivers/common/qat/qat_adf/icp_qat_fw_la.h diff --git a/drivers/crypto/qat/qat_adf/icp_qat_hw.h b/drivers/common/qat/qat_adf/icp_qat_hw.h similarity index 100% rename from drivers/crypto/qat/qat_adf/icp_qat_hw.h rename to drivers/common/qat/qat_adf/icp_qat_hw.h diff --git a/drivers/crypto/qat/qat_common.c b/drivers/common/qat/qat_common.c similarity index 100% rename from drivers/crypto/qat/qat_common.c rename to drivers/common/qat/qat_common.c diff --git a/drivers/crypto/qat/qat_common.h b/drivers/common/qat/qat_common.h similarity index 100% rename from drivers/crypto/qat/qat_common.h rename to drivers/common/qat/qat_common.h diff --git a/drivers/crypto/qat/qat_device.c b/drivers/common/qat/qat_device.c similarity index 100% rename from drivers/crypto/qat/qat_device.c rename to drivers/common/qat/qat_device.c diff --git a/drivers/crypto/qat/qat_device.h b/drivers/common/qat/qat_device.h similarity index 100% rename from drivers/crypto/qat/qat_device.h rename to drivers/common/qat/qat_device.h diff --git a/drivers/crypto/qat/qat_logs.c b/drivers/common/qat/qat_logs.c similarity index 100% rename from drivers/crypto/qat/qat_logs.c rename to drivers/common/qat/qat_logs.c diff --git a/drivers/crypto/qat/qat_logs.h b/drivers/common/qat/qat_logs.h similarity index 100% rename from drivers/crypto/qat/qat_logs.h rename to drivers/common/qat/qat_logs.h diff --git a/drivers/crypto/qat/qat_qp.c b/drivers/common/qat/qat_qp.c similarity index 100% rename from drivers/crypto/qat/qat_qp.c rename to drivers/common/qat/qat_qp.c diff --git a/drivers/crypto/qat/qat_qp.h b/drivers/common/qat/qat_qp.h similarity index 100% rename from drivers/crypto/qat/qat_qp.h rename to drivers/common/qat/qat_qp.h diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile index 1d0c88e..c480cbd 100644 --- a/drivers/crypto/Makefile +++ b/drivers/crypto/Makefile @@ -8,7 +8,6 @@ DIRS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += aesni_mb DIRS-$(CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO) += armv8 DIRS-$(CONFIG_RTE_LIBRTE_PMD_CCP) += ccp DIRS-$(CONFIG_RTE_LIBRTE_PMD_OPENSSL) += openssl -DIRS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += qat DIRS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += scheduler DIRS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += snow3g DIRS-$(CONFIG_RTE_LIBRTE_PMD_KASUMI) += kasumi diff --git a/drivers/crypto/qat/README b/drivers/crypto/qat/README new file mode 100644 index 0000000..14716a4 --- /dev/null +++ b/drivers/crypto/qat/README @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2015-2018 Intel Corporation + +Makefile for crypto QAT PMD are in common/qat directory. +The build for the QAT driver is done from there as only one library is built for the +whole QAT pci device and that library includes all the services (crypto, compression) +which are enabled on the device. + diff --git a/drivers/crypto/qat/meson.build b/drivers/crypto/qat/meson.build index c96486a..e474b1d 100644 --- a/drivers/crypto/qat/meson.build +++ b/drivers/crypto/qat/meson.build @@ -1,19 +1,24 @@ -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: BSD-3-Clause$ # Copyright(c) 2017-2018 Intel Corporation +build = false dep = dependency('libcrypto', required: false) - -sources = files('qat_common.c', - 'qat_qp.c', - 'qat_device.c', - 'qat_logs.c') - if dep.found() - sources += files('qat_sym_pmd.c', 'qat_sym.c', 'qat_sym_session.c') + # Add our sources files to the list + qat_sources += files('qat_sym_pmd.c', + 'qat_sym.c', + 'qat_sym_session.c') + qat_includes += include_directories('.') + qat_deps += 'cryptodev' + qat_ext_deps += dep pkgconfig_extra_libs += '-lcrypto' - cflags += '-DCONFIG_LIBCRYPTO_QAT' -endif + qat_cflags += '-DCONFIG_LIBCRYPTO_QAT' -includes += include_directories('qat_adf') -deps += ['bus_pci'] -ext_deps += dep + # build the whole driver + sources += qat_sources + cflags += qat_cflags + deps += qat_deps + ext_deps += qat_ext_deps + includes += qat_includes + build = true +endif