From 98c4a35c736fb6c214416b67e80acb689d6fc877 Mon Sep 17 00:00:00 2001 From: Tomasz Jozwiak Date: Mon, 2 Jul 2018 11:39:13 +0200 Subject: [PATCH] crypto/qat: move common qat files to common dir - 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 | 21 ++++++++++---- drivers/common/qat/meson.build | 14 ++++++++++ .../qat/qat_adf/adf_transport_access_macros.h | 0 .../qat/qat_adf/icp_qat_fw.h | 0 .../qat/qat_adf/icp_qat_fw_la.h | 0 .../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 | 7 +++++ drivers/crypto/qat/meson.build | 28 +++++++++++-------- drivers/crypto/qat/qat_sym.h | 8 ++++++ drivers/crypto/qat/qat_sym_pmd.h | 3 ++ 22 files changed, 67 insertions(+), 20 deletions(-) rename drivers/{crypto => common}/qat/Makefile (62%) 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 dabb12d659..8050b5d83a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -777,6 +777,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 c88638c8f0..75660765e7 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 5f6341b8f7..d7b7d8cf17 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 62% rename from drivers/crypto/qat/Makefile rename to drivers/common/qat/Makefile index 2ad10858ce..02e83f9f06 100644 --- a/drivers/crypto/qat/Makefile +++ b/drivers/common/qat/Makefile @@ -13,8 +13,14 @@ LIBABIVER := 1 CFLAGS += $(WERROR_FLAGS) CFLAGS += -O3 +# build directories +QAT_CRYPTO_DIR := $(RTE_SDK)/drivers/crypto/qat +VPATH=$(QAT_CRYPTO_DIR) + # 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 @@ -23,11 +29,14 @@ SRCS-y += qat_logs.c SRCS-y += qat_qp.c # library symmetric crypto source files -LDLIBS += -lrte_cryptodev -LDLIBS += -lcrypto -SRCS-y += qat_sym.c -SRCS-y += qat_sym_session.c -SRCS-y += qat_sym_pmd.c +ifeq ($(CONFIG_RTE_LIBRTE_CRYPTODEV),y) + LDLIBS += -lrte_cryptodev + LDLIBS += -lcrypto + CFLAGS += -DBUILD_QAT_SYM + 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 @@ -36,6 +45,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 0000000000..80b6b25a86 --- /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 1d0c88ef94..c480cbd37e 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 0000000000..444ae605f0 --- /dev/null +++ b/drivers/crypto/qat/README @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2015-2018 Intel Corporation + +Makefile for crypto QAT PMD is 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 067542670e..2873637def 100644 --- a/drivers/crypto/qat/meson.build +++ b/drivers/crypto/qat/meson.build @@ -1,20 +1,24 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017-2018 Intel Corporation -dep = dependency('libcrypto', required: false) - build = false -sources = files('qat_common.c', - 'qat_qp.c', - 'qat_device.c', - 'qat_logs.c') - +dep = dependency('libcrypto', required: false) 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' + qat_cflags += '-DBUILD_QAT_SYM' + + # build the whole driver + sources += qat_sources + cflags += qat_cflags + deps += qat_deps + ext_deps += qat_ext_deps + includes += qat_includes build = true endif - -includes += include_directories('qat_adf') -deps += ['bus_pci'] -ext_deps += dep diff --git a/drivers/crypto/qat/qat_sym.h b/drivers/crypto/qat/qat_sym.h index 126c191d05..d425892f4d 100644 --- a/drivers/crypto/qat/qat_sym.h +++ b/drivers/crypto/qat/qat_sym.h @@ -6,6 +6,8 @@ #define _QAT_SYM_H_ #include + +#ifdef BUILD_QAT_SYM #include #include "qat_common.h" @@ -152,5 +154,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 1e2344cf01..439aeb98ab 100644 --- a/drivers/crypto/qat/qat_sym_pmd.h +++ b/drivers/crypto/qat/qat_sym_pmd.h @@ -5,6 +5,8 @@ #ifndef _QAT_SYM_PMD_H_ #define _QAT_SYM_PMD_H_ +#ifdef BUILD_QAT_SYM + #include #include "qat_sym_capabilities.h" @@ -36,4 +38,5 @@ 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.20.1