Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/42093/?format=api
{ "id": 42093, "url": "http://patches.dpdk.org/api/patches/42093/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1530524353-28607-4-git-send-email-tomaszx.jozwiak@intel.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1530524353-28607-4-git-send-email-tomaszx.jozwiak@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1530524353-28607-4-git-send-email-tomaszx.jozwiak@intel.com", "date": "2018-07-02T09:39:13", "name": "[v4,3/3] crypto/qat: move common qat files to common dir", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "311b1c927c84a3a90d77907f582e7f26113e8432", "submitter": { "id": 949, "url": "http://patches.dpdk.org/api/people/949/?format=api", "name": "Tomasz Jozwiak", "email": "tomaszx.jozwiak@intel.com" }, "delegate": { "id": 22, "url": "http://patches.dpdk.org/api/users/22/?format=api", "username": "pdelarag", "first_name": "Pablo", "last_name": "de Lara Guarch", "email": "pablo.de.lara.guarch@intel.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1530524353-28607-4-git-send-email-tomaszx.jozwiak@intel.com/mbox/", "series": [ { "id": 351, "url": "http://patches.dpdk.org/api/series/351/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=351", "date": "2018-07-02T09:39:10", "name": "crypto/qat: move files to drivers/common directory", "version": 4, "mbox": "http://patches.dpdk.org/series/351/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/42093/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/42093/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 4E8262BB1;\n\tMon, 2 Jul 2018 11:39:47 +0200 (CEST)", "from mga12.intel.com (mga12.intel.com [192.55.52.136])\n\tby dpdk.org (Postfix) with ESMTP id 9B14C2BF3\n\tfor <dev@dpdk.org>; Mon, 2 Jul 2018 11:39:45 +0200 (CEST)", "from fmsmga002.fm.intel.com ([10.253.24.26])\n\tby fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t02 Jul 2018 02:39:43 -0700", "from tjozwiax-mobl.ger.corp.intel.com (HELO localhost.localdomain)\n\t([10.103.104.48])\n\tby fmsmga002.fm.intel.com with ESMTP; 02 Jul 2018 02:39:19 -0700" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.51,298,1526367600\"; d=\"scan'208\";a=\"63386074\"", "From": "Tomasz Jozwiak <tomaszx.jozwiak@intel.com>", "To": "Fiona.trahe@intel.com,\n\tpablo.de.lara.guarch@intel.com,\n\tdev@dpdk.org", "Date": "Mon, 2 Jul 2018 11:39:13 +0200", "Message-Id": "<1530524353-28607-4-git-send-email-tomaszx.jozwiak@intel.com>", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1530524353-28607-1-git-send-email-tomaszx.jozwiak@intel.com>", "References": "<1526971901-9281-1-git-send-email-tomaszx.jozwiak@intel.com>\n\t<1530524353-28607-1-git-send-email-tomaszx.jozwiak@intel.com>", "Subject": "[dpdk-dev] [PATCH v4 3/3] crypto/qat: move common qat files to\n\tcommon dir", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "- moved common qat files to common/qat dir.\n - changed common/qat/Makefile, common/qat/meson.build,\n drivers/Makefile, crypto/Makefile\n to add possibility of using new files locations\n - added README file into crypto/qat to clarify where\n the build is made from\n - updated MAINTAINERS file\n\nSigned-off-by: Tomasz Jozwiak <tomaszx.jozwiak@intel.com>\nAcked-by: Fiona Trahe <fiona.trahe@intel.com>\n---\n MAINTAINERS | 1 +\n drivers/Makefile | 2 ++\n drivers/common/meson.build | 2 +-\n drivers/{crypto => common}/qat/Makefile | 20 +++++++++++-----\n drivers/common/qat/meson.build | 14 +++++++++++\n .../qat/qat_adf/adf_transport_access_macros.h | 0\n .../{crypto => common}/qat/qat_adf/icp_qat_fw.h | 0\n .../{crypto => common}/qat/qat_adf/icp_qat_fw_la.h | 0\n .../{crypto => common}/qat/qat_adf/icp_qat_hw.h | 0\n drivers/{crypto => common}/qat/qat_common.c | 0\n drivers/{crypto => common}/qat/qat_common.h | 0\n drivers/{crypto => common}/qat/qat_device.c | 0\n drivers/{crypto => common}/qat/qat_device.h | 0\n drivers/{crypto => common}/qat/qat_logs.c | 0\n drivers/{crypto => common}/qat/qat_logs.h | 0\n drivers/{crypto => common}/qat/qat_qp.c | 0\n drivers/{crypto => common}/qat/qat_qp.h | 0\n drivers/crypto/Makefile | 1 -\n drivers/crypto/qat/README | 8 +++++++\n drivers/crypto/qat/meson.build | 28 ++++++++++++----------\n drivers/crypto/qat/qat_sym.h | 8 +++++++\n drivers/crypto/qat/qat_sym_pmd.h | 3 +++\n 22 files changed, 67 insertions(+), 20 deletions(-)\n rename drivers/{crypto => common}/qat/Makefile (60%)\n create mode 100644 drivers/common/qat/meson.build\n rename drivers/{crypto => common}/qat/qat_adf/adf_transport_access_macros.h (100%)\n rename drivers/{crypto => common}/qat/qat_adf/icp_qat_fw.h (100%)\n rename drivers/{crypto => common}/qat/qat_adf/icp_qat_fw_la.h (100%)\n rename drivers/{crypto => common}/qat/qat_adf/icp_qat_hw.h (100%)\n rename drivers/{crypto => common}/qat/qat_common.c (100%)\n rename drivers/{crypto => common}/qat/qat_common.h (100%)\n rename drivers/{crypto => common}/qat/qat_device.c (100%)\n rename drivers/{crypto => common}/qat/qat_device.h (100%)\n rename drivers/{crypto => common}/qat/qat_logs.c (100%)\n rename drivers/{crypto => common}/qat/qat_logs.h (100%)\n rename drivers/{crypto => common}/qat/qat_qp.c (100%)\n rename drivers/{crypto => common}/qat/qat_qp.h (100%)\n create mode 100644 drivers/crypto/qat/README", "diff": "diff --git a/MAINTAINERS b/MAINTAINERS\nindex 3bc928f..bc16078 100644\n--- a/MAINTAINERS\n+++ b/MAINTAINERS\n@@ -775,6 +775,7 @@ M: John Griffin <john.griffin@intel.com>\n M: Fiona Trahe <fiona.trahe@intel.com>\n M: Deepak Kumar Jain <deepak.k.jain@intel.com>\n F: drivers/crypto/qat/\n+F: drivers/common/qat/\n F: doc/guides/cryptodevs/qat.rst\n F: doc/guides/cryptodevs/features/qat.ini\n \ndiff --git a/drivers/Makefile b/drivers/Makefile\nindex c88638c..7566076 100644\n--- a/drivers/Makefile\n+++ b/drivers/Makefile\n@@ -13,6 +13,8 @@ DIRS-$(CONFIG_RTE_LIBRTE_BBDEV) += baseband\n DEPDIRS-baseband := common bus mempool\n DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += crypto\n DEPDIRS-crypto := common bus mempool\n+DIRS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += common/qat\n+DEPDIRS-common/qat := bus mempool\n DIRS-$(CONFIG_RTE_LIBRTE_COMPRESSDEV) += compress\n DEPDIRS-compress := bus mempool\n DIRS-$(CONFIG_RTE_LIBRTE_EVENTDEV) += event\ndiff --git a/drivers/common/meson.build b/drivers/common/meson.build\nindex 5f6341b..d7b7d8c 100644\n--- a/drivers/common/meson.build\n+++ b/drivers/common/meson.build\n@@ -2,6 +2,6 @@\n # Copyright(c) 2018 Cavium, Inc\n \n std_deps = ['eal']\n-drivers = ['octeontx']\n+drivers = ['octeontx', 'qat']\n config_flag_fmt = 'RTE_LIBRTE_@0@_COMMON'\n driver_name_fmt = 'rte_common_@0@'\ndiff --git a/drivers/crypto/qat/Makefile b/drivers/common/qat/Makefile\nsimilarity index 60%\nrename from drivers/crypto/qat/Makefile\nrename to drivers/common/qat/Makefile\nindex a939eca..069ac8c 100644\n--- a/drivers/crypto/qat/Makefile\n+++ b/drivers/common/qat/Makefile\n@@ -13,8 +13,13 @@ LIBABIVER := 1\n CFLAGS += $(WERROR_FLAGS)\n CFLAGS += -O3\n \n+# build directories\n+QAT_CRYPTO_DIR := $(RTE_SDK)/drivers/crypto/qat\n+\n # external library include paths\n CFLAGS += -I$(SRCDIR)/qat_adf\n+CFLAGS += -I$(SRCDIR)\n+CFLAGS += -I$(QAT_CRYPTO_DIR)\n \n # library common source files\n SRCS-y += qat_device.c\n@@ -23,11 +28,14 @@ SRCS-y += qat_logs.c\n SRCS-y += qat_qp.c\n \n # library symetric crypto source files\n-LDLIBS += -lrte_cryptodev\n-LDLIBS += -lcrypto\n-SRCS-y += qat_sym.c\n-SRCS-y += qat_sym_session.c\n-SRCS-y += qat_sym_pmd.c\n+ifeq ($(CONFIG_RTE_LIBRTE_CRYPTODEV),y)\n+\tLDLIBS += -lrte_cryptodev\n+\tLDLIBS += -lcrypto\n+\tCFLAGS += -DBUILD_QAT_SYM\n+\tSRCS-y += $(QAT_CRYPTO_DIR)/qat_sym.c\n+\tSRCS-y += $(QAT_CRYPTO_DIR)/qat_sym_session.c\n+\tSRCS-y += $(QAT_CRYPTO_DIR)/qat_sym_pmd.c\n+endif\n \n LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool\n LDLIBS += -lrte_pci -lrte_bus_pci\n@@ -36,6 +44,6 @@ LDLIBS += -lrte_pci -lrte_bus_pci\n SYMLINK-y-include +=\n \n # versioning export map\n-EXPORT_MAP := rte_pmd_qat_version.map\n+EXPORT_MAP := ../../crypto/qat/rte_pmd_qat_version.map\n \n include $(RTE_SDK)/mk/rte.lib.mk\ndiff --git a/drivers/common/qat/meson.build b/drivers/common/qat/meson.build\nnew file mode 100644\nindex 0000000..80b6b25\n--- /dev/null\n+++ b/drivers/common/qat/meson.build\n@@ -0,0 +1,14 @@\n+# SPDX-License-Identifier: BSD-3-Clause\n+# Copyright(c) 2017-2018 Intel Corporation\n+\n+# This does not build a driver, but instead holds common files for\n+# the crypto and compression drivers.\n+build = false\n+qat_deps = ['bus_pci']\n+qat_sources = files('qat_common.c',\n+\t\t'qat_qp.c',\n+\t\t'qat_device.c',\n+\t\t'qat_logs.c')\n+qat_includes = [include_directories('.', 'qat_adf')]\n+qat_ext_deps = []\n+qat_cflags = []\ndiff --git a/drivers/crypto/qat/qat_adf/adf_transport_access_macros.h b/drivers/common/qat/qat_adf/adf_transport_access_macros.h\nsimilarity index 100%\nrename from drivers/crypto/qat/qat_adf/adf_transport_access_macros.h\nrename to drivers/common/qat/qat_adf/adf_transport_access_macros.h\ndiff --git a/drivers/crypto/qat/qat_adf/icp_qat_fw.h b/drivers/common/qat/qat_adf/icp_qat_fw.h\nsimilarity index 100%\nrename from drivers/crypto/qat/qat_adf/icp_qat_fw.h\nrename to drivers/common/qat/qat_adf/icp_qat_fw.h\ndiff --git a/drivers/crypto/qat/qat_adf/icp_qat_fw_la.h b/drivers/common/qat/qat_adf/icp_qat_fw_la.h\nsimilarity index 100%\nrename from drivers/crypto/qat/qat_adf/icp_qat_fw_la.h\nrename to drivers/common/qat/qat_adf/icp_qat_fw_la.h\ndiff --git a/drivers/crypto/qat/qat_adf/icp_qat_hw.h b/drivers/common/qat/qat_adf/icp_qat_hw.h\nsimilarity index 100%\nrename from drivers/crypto/qat/qat_adf/icp_qat_hw.h\nrename to drivers/common/qat/qat_adf/icp_qat_hw.h\ndiff --git a/drivers/crypto/qat/qat_common.c b/drivers/common/qat/qat_common.c\nsimilarity index 100%\nrename from drivers/crypto/qat/qat_common.c\nrename to drivers/common/qat/qat_common.c\ndiff --git a/drivers/crypto/qat/qat_common.h b/drivers/common/qat/qat_common.h\nsimilarity index 100%\nrename from drivers/crypto/qat/qat_common.h\nrename to drivers/common/qat/qat_common.h\ndiff --git a/drivers/crypto/qat/qat_device.c b/drivers/common/qat/qat_device.c\nsimilarity index 100%\nrename from drivers/crypto/qat/qat_device.c\nrename to drivers/common/qat/qat_device.c\ndiff --git a/drivers/crypto/qat/qat_device.h b/drivers/common/qat/qat_device.h\nsimilarity index 100%\nrename from drivers/crypto/qat/qat_device.h\nrename to drivers/common/qat/qat_device.h\ndiff --git a/drivers/crypto/qat/qat_logs.c b/drivers/common/qat/qat_logs.c\nsimilarity index 100%\nrename from drivers/crypto/qat/qat_logs.c\nrename to drivers/common/qat/qat_logs.c\ndiff --git a/drivers/crypto/qat/qat_logs.h b/drivers/common/qat/qat_logs.h\nsimilarity index 100%\nrename from drivers/crypto/qat/qat_logs.h\nrename to drivers/common/qat/qat_logs.h\ndiff --git a/drivers/crypto/qat/qat_qp.c b/drivers/common/qat/qat_qp.c\nsimilarity index 100%\nrename from drivers/crypto/qat/qat_qp.c\nrename to drivers/common/qat/qat_qp.c\ndiff --git a/drivers/crypto/qat/qat_qp.h b/drivers/common/qat/qat_qp.h\nsimilarity index 100%\nrename from drivers/crypto/qat/qat_qp.h\nrename to drivers/common/qat/qat_qp.h\ndiff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile\nindex 1d0c88e..c480cbd 100644\n--- a/drivers/crypto/Makefile\n+++ b/drivers/crypto/Makefile\n@@ -8,7 +8,6 @@ DIRS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += aesni_mb\n DIRS-$(CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO) += armv8\n DIRS-$(CONFIG_RTE_LIBRTE_PMD_CCP) += ccp\n DIRS-$(CONFIG_RTE_LIBRTE_PMD_OPENSSL) += openssl\n-DIRS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += qat\n DIRS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += scheduler\n DIRS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += snow3g\n DIRS-$(CONFIG_RTE_LIBRTE_PMD_KASUMI) += kasumi\ndiff --git a/drivers/crypto/qat/README b/drivers/crypto/qat/README\nnew file mode 100644\nindex 0000000..38972a2\n--- /dev/null\n+++ b/drivers/crypto/qat/README\n@@ -0,0 +1,8 @@\n+# SPDX-License-Identifier: BSD-3-Clause\n+# Copyright(c) 2015-2018 Intel Corporation\n+\n+Makefile for crypto QAT PMD is in common/qat directory.\n+The build for the QAT driver is done from there as only one library is built for the\n+whole QAT pci device and that library includes all the services (crypto, compression)\n+which are enabled on the device.\n+\ndiff --git a/drivers/crypto/qat/meson.build b/drivers/crypto/qat/meson.build\nindex 0675426..2873637 100644\n--- a/drivers/crypto/qat/meson.build\n+++ b/drivers/crypto/qat/meson.build\n@@ -1,20 +1,24 @@\n # SPDX-License-Identifier: BSD-3-Clause\n # Copyright(c) 2017-2018 Intel Corporation\n \n-dep = dependency('libcrypto', required: false)\n-\n build = false\n-sources = files('qat_common.c',\n-\t\t'qat_qp.c',\n-\t\t'qat_device.c',\n-\t\t'qat_logs.c')\n-\n+dep = dependency('libcrypto', required: false)\n if dep.found()\n-\tsources += files('qat_sym_pmd.c', 'qat_sym.c', 'qat_sym_session.c')\n+\t# Add our sources files to the list\n+\tqat_sources += files('qat_sym_pmd.c',\n+\t\t\t 'qat_sym.c',\n+\t\t\t 'qat_sym_session.c')\n+\tqat_includes += include_directories('.')\n+\tqat_deps += 'cryptodev'\n+\tqat_ext_deps += dep\n \tpkgconfig_extra_libs += '-lcrypto'\n+\tqat_cflags += '-DBUILD_QAT_SYM'\n+\n+\t# build the whole driver\n+\tsources += qat_sources\n+\tcflags += qat_cflags\n+\tdeps += qat_deps\n+\text_deps += qat_ext_deps\n+\tincludes += qat_includes\n \tbuild = true\n endif\n-\n-includes += include_directories('qat_adf')\n-deps += ['bus_pci']\n-ext_deps += dep\ndiff --git a/drivers/crypto/qat/qat_sym.h b/drivers/crypto/qat/qat_sym.h\nindex 126c191..d425892 100644\n--- a/drivers/crypto/qat/qat_sym.h\n+++ b/drivers/crypto/qat/qat_sym.h\n@@ -6,6 +6,8 @@\n #define _QAT_SYM_H_\n \n #include <rte_cryptodev_pmd.h>\n+\n+#ifdef BUILD_QAT_SYM\n #include <openssl/evp.h>\n \n #include \"qat_common.h\"\n@@ -152,5 +154,11 @@ qat_sym_process_response(void **op, uint8_t *resp)\n \t}\n \t*op = (void *)rx_op;\n }\n+#else\n \n+static inline void\n+qat_sym_process_response(void **op __rte_unused, uint8_t *resp __rte_unused)\n+{\n+}\n+#endif\n #endif /* _QAT_SYM_H_ */\ndiff --git a/drivers/crypto/qat/qat_sym_pmd.h b/drivers/crypto/qat/qat_sym_pmd.h\nindex 1e2344c..439aeb9 100644\n--- a/drivers/crypto/qat/qat_sym_pmd.h\n+++ b/drivers/crypto/qat/qat_sym_pmd.h\n@@ -5,6 +5,8 @@\n #ifndef _QAT_SYM_PMD_H_\n #define _QAT_SYM_PMD_H_\n \n+#ifdef BUILD_QAT_SYM\n+\n #include <rte_cryptodev.h>\n \n #include \"qat_sym_capabilities.h\"\n@@ -36,4 +38,5 @@ qat_sym_dev_create(struct qat_pci_device *qat_pci_dev);\n int\n qat_sym_dev_destroy(struct qat_pci_device *qat_pci_dev);\n \n+#endif\n #endif /* _QAT_SYM_PMD_H_ */\n", "prefixes": [ "v4", "3/3" ] }