From nobody Fri May 3 12:16:54 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B9456C76196 for ; Tue, 28 Mar 2023 15:41:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234133AbjC1Pls (ORCPT ); Tue, 28 Mar 2023 11:41:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46434 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233814AbjC1PlR (ORCPT ); Tue, 28 Mar 2023 11:41:17 -0400 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4483111E9D; Tue, 28 Mar 2023 08:40:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1680018017; x=1711554017; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=YKDrUlG2J6CW2hsz7Kqgy/KuKtUut2UIBgLdc048xRo=; b=H6QvKYyMWqIwQbByefi7b10rSsNazElwXJLr1MUWncivjpskJnLBlaHw RCO1PEPRNX+8u0GWm3AUyRMAc6+irW3OAgMzZyUvoPL40e4rPtyol9R+Y TQR3n7TVaNnlxcFIzLecNXPXKXumhYsf96h4NCEZM3Lk1E4rJql709Bk0 FPEVH4oysVzKRQBoCBHoNAE6M3wAFPLdg1PA+TKAsRh4GwyjAUeOwVO/k JYeHlj7nhL/uZ4kfPcS8v+GKkbrHg3F65Q+jVdGlILrZ3vevHwBCDfJaj LVV74lK9YkG9bnKGALwAj9ntz+u5PuCUfsilY6cBcqSPZI8xC3pMjbX6k w==; X-IronPort-AV: E=McAfee;i="6600,9927,10663"; a="405543650" X-IronPort-AV: E=Sophos;i="5.98,297,1673942400"; d="scan'208";a="405543650" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Mar 2023 08:39:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10663"; a="773185241" X-IronPort-AV: E=Sophos;i="5.98,297,1673942400"; d="scan'208";a="773185241" Received: from sdwarak1-mobl.amr.corp.intel.com (HELO tzanussi-mobl1.intel.com) ([10.212.127.200]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Mar 2023 08:39:57 -0700 From: Tom Zanussi To: herbert@gondor.apana.org.au, davem@davemloft.net, fenghua.yu@intel.com, vkoul@kernel.org Cc: dave.jiang@intel.com, tony.luck@intel.com, wajdi.k.feghali@intel.com, james.guilford@intel.com, kanchana.p.sridhar@intel.com, giovanni.cabiddu@intel.com, clabbe@baylibre.com, daniele.alessandrelli@intel.com, prabhjot.khurana@intel.com, mgross@linux.intel.com, declan.murphy@intel.com, linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org, dmaengine@vger.kernel.org Subject: [PATCH 1/3] crypto: keembay - Move driver to drivers/crypto/intel/keembay Date: Tue, 28 Mar 2023 10:39:49 -0500 Message-Id: <20230328153951.126564-2-tom.zanussi@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230328153951.126564-1-tom.zanussi@linux.intel.com> References: <20230328153951.126564-1-tom.zanussi@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" With the growing number of Intel crypto drivers, it makes sense to group them all into a single drivers/crypto/intel/ directory. Signed-off-by: Tom Zanussi Acked-by: Daniele Alessandrelli --- MAINTAINERS | 26 +++++++++---------- drivers/crypto/Kconfig | 1 - drivers/crypto/Makefile | 1 - drivers/crypto/intel/Kconfig | 1 + drivers/crypto/intel/Makefile | 1 + drivers/crypto/{ =3D> intel}/keembay/Kconfig | 0 drivers/crypto/{ =3D> intel}/keembay/Makefile | 0 .../keembay/keembay-ocs-aes-core.c | 0 .../{ =3D> intel}/keembay/keembay-ocs-ecc.c | 0 .../keembay/keembay-ocs-hcu-core.c | 0 drivers/crypto/{ =3D> intel}/keembay/ocs-aes.c | 0 drivers/crypto/{ =3D> intel}/keembay/ocs-aes.h | 0 drivers/crypto/{ =3D> intel}/keembay/ocs-hcu.c | 0 drivers/crypto/{ =3D> intel}/keembay/ocs-hcu.h | 0 14 files changed, 15 insertions(+), 15 deletions(-) rename drivers/crypto/{ =3D> intel}/keembay/Kconfig (100%) rename drivers/crypto/{ =3D> intel}/keembay/Makefile (100%) rename drivers/crypto/{ =3D> intel}/keembay/keembay-ocs-aes-core.c (100%) rename drivers/crypto/{ =3D> intel}/keembay/keembay-ocs-ecc.c (100%) rename drivers/crypto/{ =3D> intel}/keembay/keembay-ocs-hcu-core.c (100%) rename drivers/crypto/{ =3D> intel}/keembay/ocs-aes.c (100%) rename drivers/crypto/{ =3D> intel}/keembay/ocs-aes.h (100%) rename drivers/crypto/{ =3D> intel}/keembay/ocs-hcu.c (100%) rename drivers/crypto/{ =3D> intel}/keembay/ocs-hcu.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 2db8b4940de8..0054dc0e5f0b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10422,11 +10422,11 @@ INTEL KEEM BAY OCS AES/SM4 CRYPTO DRIVER M: Daniele Alessandrelli S: Maintained F: Documentation/devicetree/bindings/crypto/intel,keembay-ocs-aes.yaml -F: drivers/crypto/keembay/Kconfig -F: drivers/crypto/keembay/Makefile -F: drivers/crypto/keembay/keembay-ocs-aes-core.c -F: drivers/crypto/keembay/ocs-aes.c -F: drivers/crypto/keembay/ocs-aes.h +F: drivers/crypto/intel/keembay/Kconfig +F: drivers/crypto/intel/keembay/Makefile +F: drivers/crypto/intel/keembay/keembay-ocs-aes-core.c +F: drivers/crypto/intel/keembay/ocs-aes.c +F: drivers/crypto/intel/keembay/ocs-aes.h =20 INTEL KEEM BAY OCS ECC CRYPTO DRIVER M: Daniele Alessandrelli @@ -10434,20 +10434,20 @@ M: Prabhjot Khurana M: Mark Gross S: Maintained F: Documentation/devicetree/bindings/crypto/intel,keembay-ocs-ecc.yaml -F: drivers/crypto/keembay/Kconfig -F: drivers/crypto/keembay/Makefile -F: drivers/crypto/keembay/keembay-ocs-ecc.c +F: drivers/crypto/intel/keembay/Kconfig +F: drivers/crypto/intel/keembay/Makefile +F: drivers/crypto/intel/keembay/keembay-ocs-ecc.c =20 INTEL KEEM BAY OCS HCU CRYPTO DRIVER M: Daniele Alessandrelli M: Declan Murphy S: Maintained F: Documentation/devicetree/bindings/crypto/intel,keembay-ocs-hcu.yaml -F: drivers/crypto/keembay/Kconfig -F: drivers/crypto/keembay/Makefile -F: drivers/crypto/keembay/keembay-ocs-hcu-core.c -F: drivers/crypto/keembay/ocs-hcu.c -F: drivers/crypto/keembay/ocs-hcu.h +F: drivers/crypto/intel/keembay/Kconfig +F: drivers/crypto/intel/keembay/Makefile +F: drivers/crypto/intel/keembay/keembay-ocs-hcu-core.c +F: drivers/crypto/intel/keembay/ocs-hcu.c +F: drivers/crypto/intel/keembay/ocs-hcu.h =20 INTEL THUNDER BAY EMMC PHY DRIVER M: Nandhini Srikandan diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index 56466eeb4eef..e8d9fc954121 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig @@ -821,7 +821,6 @@ config CRYPTO_DEV_SA2UL used for crypto offload. Select this if you want to use hardware acceleration for cryptographic algorithms on these devices. =20 -source "drivers/crypto/keembay/Kconfig" source "drivers/crypto/aspeed/Kconfig" =20 endif # CRYPTO_HW diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile index 34c1e60d9dd1..eb8eb80aab3b 100644 --- a/drivers/crypto/Makefile +++ b/drivers/crypto/Makefile @@ -51,5 +51,4 @@ obj-$(CONFIG_CRYPTO_DEV_ARTPEC6) +=3D axis/ obj-y +=3D xilinx/ obj-y +=3D hisilicon/ obj-$(CONFIG_CRYPTO_DEV_AMLOGIC_GXL) +=3D amlogic/ -obj-y +=3D keembay/ obj-y +=3D intel/ diff --git a/drivers/crypto/intel/Kconfig b/drivers/crypto/intel/Kconfig index 7c9f51b873ea..6a9abdf38422 100644 --- a/drivers/crypto/intel/Kconfig +++ b/drivers/crypto/intel/Kconfig @@ -1,3 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 =20 source "drivers/crypto/intel/iaa/Kconfig" +source "drivers/crypto/intel/keembay/Kconfig" diff --git a/drivers/crypto/intel/Makefile b/drivers/crypto/intel/Makefile index b1263f1f90cc..159a5fd3e9ac 100644 --- a/drivers/crypto/intel/Makefile +++ b/drivers/crypto/intel/Makefile @@ -1,3 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 =20 obj-$(CONFIG_CRYPTO_DEV_IAA_CRYPTO) +=3D iaa/ +obj-y +=3D keembay/ diff --git a/drivers/crypto/keembay/Kconfig b/drivers/crypto/intel/keembay/= Kconfig similarity index 100% rename from drivers/crypto/keembay/Kconfig rename to drivers/crypto/intel/keembay/Kconfig diff --git a/drivers/crypto/keembay/Makefile b/drivers/crypto/intel/keembay= /Makefile similarity index 100% rename from drivers/crypto/keembay/Makefile rename to drivers/crypto/intel/keembay/Makefile diff --git a/drivers/crypto/keembay/keembay-ocs-aes-core.c b/drivers/crypto= /intel/keembay/keembay-ocs-aes-core.c similarity index 100% rename from drivers/crypto/keembay/keembay-ocs-aes-core.c rename to drivers/crypto/intel/keembay/keembay-ocs-aes-core.c diff --git a/drivers/crypto/keembay/keembay-ocs-ecc.c b/drivers/crypto/inte= l/keembay/keembay-ocs-ecc.c similarity index 100% rename from drivers/crypto/keembay/keembay-ocs-ecc.c rename to drivers/crypto/intel/keembay/keembay-ocs-ecc.c diff --git a/drivers/crypto/keembay/keembay-ocs-hcu-core.c b/drivers/crypto= /intel/keembay/keembay-ocs-hcu-core.c similarity index 100% rename from drivers/crypto/keembay/keembay-ocs-hcu-core.c rename to drivers/crypto/intel/keembay/keembay-ocs-hcu-core.c diff --git a/drivers/crypto/keembay/ocs-aes.c b/drivers/crypto/intel/keemba= y/ocs-aes.c similarity index 100% rename from drivers/crypto/keembay/ocs-aes.c rename to drivers/crypto/intel/keembay/ocs-aes.c diff --git a/drivers/crypto/keembay/ocs-aes.h b/drivers/crypto/intel/keemba= y/ocs-aes.h similarity index 100% rename from drivers/crypto/keembay/ocs-aes.h rename to drivers/crypto/intel/keembay/ocs-aes.h diff --git a/drivers/crypto/keembay/ocs-hcu.c b/drivers/crypto/intel/keemba= y/ocs-hcu.c similarity index 100% rename from drivers/crypto/keembay/ocs-hcu.c rename to drivers/crypto/intel/keembay/ocs-hcu.c diff --git a/drivers/crypto/keembay/ocs-hcu.h b/drivers/crypto/intel/keemba= y/ocs-hcu.h similarity index 100% rename from drivers/crypto/keembay/ocs-hcu.h rename to drivers/crypto/intel/keembay/ocs-hcu.h --=20 2.34.1 From nobody Fri May 3 12:16:54 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A28E9C761AF for ; Tue, 28 Mar 2023 15:41:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234141AbjC1Plx (ORCPT ); Tue, 28 Mar 2023 11:41:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46980 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232953AbjC1PlR (ORCPT ); Tue, 28 Mar 2023 11:41:17 -0400 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 837A811EAA; Tue, 28 Mar 2023 08:40:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1680018018; x=1711554018; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=qBFRkj3VAiWm2ddYSXBSzpv19mxvwr/Ryn7W1PctZ/c=; b=N5ec3HMmzhjUO90xAJvw9ZPKSgdQg46rw1VMdz3oZG4/GtbPm8snrc7b DqiLpHObk6J0TA0VPcuGmkWdUhCAIKlxCC69TjIZeom5RmKYkENc2sCyr Un2wpMdkz2vOaXUtXd5mamjt1cPNRkKzoI1lwnbsoujD3WrPQMcjuwwKI b96jp4EksOoOTIM57tS+EFLFgOOmOOF9TMhQxHJZJ7u/BZm8DHmQbvGwf jBIvFzGh1GnOKyl+u9As0Vbi4CkfAoS9beW3GqKdrpuWjBEe94j0HsUA2 yPvN/v5dauCqcPIlLYCnf8v6rMXU9jW4kLePlak85zFmG720nZE0TThDS w==; X-IronPort-AV: E=McAfee;i="6600,9927,10663"; a="405543664" X-IronPort-AV: E=Sophos;i="5.98,297,1673942400"; d="scan'208";a="405543664" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Mar 2023 08:40:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10663"; a="773185264" X-IronPort-AV: E=Sophos;i="5.98,297,1673942400"; d="scan'208";a="773185264" Received: from sdwarak1-mobl.amr.corp.intel.com (HELO tzanussi-mobl1.intel.com) ([10.212.127.200]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Mar 2023 08:40:00 -0700 From: Tom Zanussi To: herbert@gondor.apana.org.au, davem@davemloft.net, fenghua.yu@intel.com, vkoul@kernel.org Cc: dave.jiang@intel.com, tony.luck@intel.com, wajdi.k.feghali@intel.com, james.guilford@intel.com, kanchana.p.sridhar@intel.com, giovanni.cabiddu@intel.com, clabbe@baylibre.com, daniele.alessandrelli@intel.com, prabhjot.khurana@intel.com, mgross@linux.intel.com, declan.murphy@intel.com, linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org, dmaengine@vger.kernel.org Subject: [PATCH 2/3] crypto: ixp4xx - Move driver to drivers/crypto/intel/ixp4xx Date: Tue, 28 Mar 2023 10:39:50 -0500 Message-Id: <20230328153951.126564-3-tom.zanussi@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230328153951.126564-1-tom.zanussi@linux.intel.com> References: <20230328153951.126564-1-tom.zanussi@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" With the growing number of Intel crypto drivers, it makes sense to group them all into a single drivers/crypto/intel/ directory. Create a separate drivers/crypto/intel/ixp4xx directory and move drivers/crypto/ixp4xx_crypto.c to it, along with a new Kconfig and Makefile to contain the config and make bits. Also add a COMPILE_TEST dependency to CRYPTO_DEV_IXP4XX so it can be more easily compile-tested. Signed-off-by: Tom Zanussi Acked-by: Corentin LABBE --- MAINTAINERS | 4 ++-- drivers/crypto/Kconfig | 15 --------------- drivers/crypto/Makefile | 1 - drivers/crypto/intel/Kconfig | 1 + drivers/crypto/intel/Makefile | 1 + drivers/crypto/intel/ixp4xx/Kconfig | 14 ++++++++++++++ drivers/crypto/intel/ixp4xx/Makefile | 2 ++ drivers/crypto/{ =3D> intel/ixp4xx}/ixp4xx_crypto.c | 0 8 files changed, 20 insertions(+), 18 deletions(-) create mode 100644 drivers/crypto/intel/ixp4xx/Kconfig create mode 100644 drivers/crypto/intel/ixp4xx/Makefile rename drivers/crypto/{ =3D> intel/ixp4xx}/ixp4xx_crypto.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 0054dc0e5f0b..e49d331aba47 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2275,7 +2275,7 @@ F: arch/arm/boot/dts/intel-ixp* F: arch/arm/mach-ixp4xx/ F: drivers/bus/intel-ixp4xx-eb.c F: drivers/clocksource/timer-ixp4xx.c -F: drivers/crypto/ixp4xx_crypto.c +F: drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c F: drivers/gpio/gpio-ixp4xx.c F: drivers/irqchip/irq-ixp4xx.c =20 @@ -10387,7 +10387,7 @@ INTEL IXP4XX CRYPTO SUPPORT M: Corentin Labbe L: linux-crypto@vger.kernel.org S: Maintained -F: drivers/crypto/ixp4xx_crypto.c +F: drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c =20 INTEL ISHTP ECLITE DRIVER M: Sumesh K Naduvalath diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index e8d9fc954121..007299bcd36c 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig @@ -240,21 +240,6 @@ config CRYPTO_DEV_TALITOS2 Say 'Y' here to use the Freescale Security Engine (SEC) version 2 and following as found on MPC83xx, MPC85xx, etc ... =20 -config CRYPTO_DEV_IXP4XX - tristate "Driver for IXP4xx crypto hardware acceleration" - depends on ARCH_IXP4XX && IXP4XX_QMGR && IXP4XX_NPE - select CRYPTO_AES - select CRYPTO_DES - select CRYPTO_ECB - select CRYPTO_CBC - select CRYPTO_CTR - select CRYPTO_LIB_DES - select CRYPTO_AEAD - select CRYPTO_AUTHENC - select CRYPTO_SKCIPHER - help - Driver for the IXP4xx NPE crypto engine. - config CRYPTO_DEV_PPC4XX tristate "Driver AMCC PPC4xx crypto accelerator" depends on PPC && 4xx diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile index eb8eb80aab3b..17f323718b6a 100644 --- a/drivers/crypto/Makefile +++ b/drivers/crypto/Makefile @@ -19,7 +19,6 @@ obj-$(CONFIG_CRYPTO_DEV_FSL_CAAM_COMMON) +=3D caam/ obj-$(CONFIG_CRYPTO_DEV_GEODE) +=3D geode-aes.o obj-$(CONFIG_CRYPTO_DEV_HIFN_795X) +=3D hifn_795x.o obj-$(CONFIG_CRYPTO_DEV_IMGTEC_HASH) +=3D img-hash.o -obj-$(CONFIG_CRYPTO_DEV_IXP4XX) +=3D ixp4xx_crypto.o obj-$(CONFIG_CRYPTO_DEV_MARVELL) +=3D marvell/ obj-$(CONFIG_CRYPTO_DEV_MXS_DCP) +=3D mxs-dcp.o obj-$(CONFIG_CRYPTO_DEV_NIAGARA2) +=3D n2_crypto.o diff --git a/drivers/crypto/intel/Kconfig b/drivers/crypto/intel/Kconfig index 6a9abdf38422..a777e558b004 100644 --- a/drivers/crypto/intel/Kconfig +++ b/drivers/crypto/intel/Kconfig @@ -2,3 +2,4 @@ =20 source "drivers/crypto/intel/iaa/Kconfig" source "drivers/crypto/intel/keembay/Kconfig" +source "drivers/crypto/intel/ixp4xx/Kconfig" diff --git a/drivers/crypto/intel/Makefile b/drivers/crypto/intel/Makefile index 159a5fd3e9ac..93a3cf3a8703 100644 --- a/drivers/crypto/intel/Makefile +++ b/drivers/crypto/intel/Makefile @@ -2,3 +2,4 @@ =20 obj-$(CONFIG_CRYPTO_DEV_IAA_CRYPTO) +=3D iaa/ obj-y +=3D keembay/ +obj-y +=3D ixp4xx/ diff --git a/drivers/crypto/intel/ixp4xx/Kconfig b/drivers/crypto/intel/ixp= 4xx/Kconfig new file mode 100644 index 000000000000..af3cc5688328 --- /dev/null +++ b/drivers/crypto/intel/ixp4xx/Kconfig @@ -0,0 +1,14 @@ +config CRYPTO_DEV_IXP4XX + tristate "Driver for IXP4xx crypto hardware acceleration" + depends on (ARCH_IXP4XX || COMPILE_TEST) && IXP4XX_QMGR && IXP4XX_NPE + select CRYPTO_AES + select CRYPTO_DES + select CRYPTO_ECB + select CRYPTO_CBC + select CRYPTO_CTR + select CRYPTO_LIB_DES + select CRYPTO_AEAD + select CRYPTO_AUTHENC + select CRYPTO_SKCIPHER + help + Driver for the IXP4xx NPE crypto engine. diff --git a/drivers/crypto/intel/ixp4xx/Makefile b/drivers/crypto/intel/ix= p4xx/Makefile new file mode 100644 index 000000000000..74ebefd93046 --- /dev/null +++ b/drivers/crypto/intel/ixp4xx/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_CRYPTO_DEV_IXP4XX) +=3D ixp4xx_crypto.o diff --git a/drivers/crypto/ixp4xx_crypto.c b/drivers/crypto/intel/ixp4xx/i= xp4xx_crypto.c similarity index 100% rename from drivers/crypto/ixp4xx_crypto.c rename to drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c --=20 2.34.1 From nobody Fri May 3 12:16:54 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A10D6C77B61 for ; Tue, 28 Mar 2023 15:42:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234096AbjC1PmT (ORCPT ); Tue, 28 Mar 2023 11:42:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56460 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233298AbjC1Pli (ORCPT ); Tue, 28 Mar 2023 11:41:38 -0400 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0420FD311; Tue, 28 Mar 2023 08:40:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1680018037; x=1711554037; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=AMA8EofbhA//DFk0oiAVA/xLpdgoMD5167QPiuE+r7k=; b=ePfXzgth/n/pSGtkl1WJJ2IIWKBDXvw1NYYjWhOs9xL7CkUuOsRWFf1o UegzUk867xczfTdz1qdaIa2Dgxl3kYcnsf1lmokNAu2W7t1rFJbe1yn7K 7p2qnPtAzHvNqAoHKcaTEh24BryGTfq/iRJz+vuFaUzRKd87Sdujlxe6q MxLcNLQ0lQb6bzPOgfzyilycUD7XLel2A0koOJFRwYMXVh67BAgIX6uHB MBQ4MajHd+VlGuMg3JsqauAifsHtzQJqCbjoS3OEj39JfTCjmHlZfNNJt 7T8WO2Ceo4STgbUwLEQSdSWApfgs+Q4IGKU1NK941ZLMacqUFShtAvKFe g==; X-IronPort-AV: E=McAfee;i="6600,9927,10663"; a="405543678" X-IronPort-AV: E=Sophos;i="5.98,297,1673942400"; d="scan'208";a="405543678" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Mar 2023 08:40:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10663"; a="773185280" X-IronPort-AV: E=Sophos;i="5.98,297,1673942400"; d="scan'208";a="773185280" Received: from sdwarak1-mobl.amr.corp.intel.com (HELO tzanussi-mobl1.intel.com) ([10.212.127.200]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Mar 2023 08:40:02 -0700 From: Tom Zanussi To: herbert@gondor.apana.org.au, davem@davemloft.net, fenghua.yu@intel.com, vkoul@kernel.org Cc: dave.jiang@intel.com, tony.luck@intel.com, wajdi.k.feghali@intel.com, james.guilford@intel.com, kanchana.p.sridhar@intel.com, giovanni.cabiddu@intel.com, clabbe@baylibre.com, daniele.alessandrelli@intel.com, prabhjot.khurana@intel.com, mgross@linux.intel.com, declan.murphy@intel.com, linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org, dmaengine@vger.kernel.org Subject: [PATCH 3/3] crypto: qat - Move driver to drivers/crypto/intel/qat Date: Tue, 28 Mar 2023 10:39:51 -0500 Message-Id: <20230328153951.126564-4-tom.zanussi@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230328153951.126564-1-tom.zanussi@linux.intel.com> References: <20230328153951.126564-1-tom.zanussi@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" With the growing number of Intel crypto drivers, it makes sense to group them all into a single drivers/crypto/intel/ directory. Signed-off-by: Tom Zanussi --- MAINTAINERS | 2 +- drivers/crypto/Kconfig | 1 - drivers/crypto/Makefile | 1 - drivers/crypto/intel/Kconfig | 1 + drivers/crypto/intel/Makefile | 1 + drivers/crypto/{ =3D> intel}/qat/Kconfig | 0 drivers/crypto/{ =3D> intel}/qat/Makefile | 0 drivers/crypto/{ =3D> intel}/qat/qat_4xxx/Makefile | 0 drivers/crypto/{ =3D> intel}/qat/qat_4xxx/adf_4xxx_hw_data.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_4xxx/adf_4xxx_hw_data.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_4xxx/adf_drv.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_c3xxx/Makefile | 0 drivers/crypto/{ =3D> intel}/qat/qat_c3xxx/adf_c3xxx_hw_data.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_c3xxx/adf_c3xxx_hw_data.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_c3xxx/adf_drv.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_c3xxxvf/Makefile | 0 .../crypto/{ =3D> intel}/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.c | 0 .../crypto/{ =3D> intel}/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_c3xxxvf/adf_drv.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_c62x/Makefile | 0 drivers/crypto/{ =3D> intel}/qat/qat_c62x/adf_c62x_hw_data.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_c62x/adf_c62x_hw_data.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_c62x/adf_drv.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_c62xvf/Makefile | 0 drivers/crypto/{ =3D> intel}/qat/qat_c62xvf/adf_c62xvf_hw_data.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_c62xvf/adf_c62xvf_hw_data.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_c62xvf/adf_drv.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/Makefile | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_accel_devices.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_accel_engine.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_admin.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_aer.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_cfg.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_cfg.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_cfg_common.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_cfg_strings.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_cfg_user.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_common_drv.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_ctl_drv.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_dev_mgr.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_gen2_config.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_gen2_config.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_gen2_dc.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_gen2_dc.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_gen2_hw_data.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_gen2_hw_data.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_gen2_pfvf.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_gen2_pfvf.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_gen4_dc.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_gen4_dc.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_gen4_hw_data.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_gen4_hw_data.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_gen4_pfvf.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_gen4_pfvf.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_gen4_pm.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_gen4_pm.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_hw_arbiter.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_init.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_isr.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_pfvf_msg.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_pfvf_pf_msg.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_pfvf_pf_msg.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_pfvf_pf_proto.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_pfvf_pf_proto.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_pfvf_utils.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_pfvf_utils.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_pfvf_vf_msg.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_pfvf_vf_msg.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_pfvf_vf_proto.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_pfvf_vf_proto.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_sriov.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_sysfs.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_transport.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_transport.h | 0 .../{ =3D> intel}/qat/qat_common/adf_transport_access_macros.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_transport_debug.c | 0 .../crypto/{ =3D> intel}/qat/qat_common/adf_transport_internal.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/adf_vf_isr.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/icp_qat_fw.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/icp_qat_fw_comp.h | 0 .../crypto/{ =3D> intel}/qat/qat_common/icp_qat_fw_init_admin.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/icp_qat_fw_la.h | 0 .../{ =3D> intel}/qat/qat_common/icp_qat_fw_loader_handle.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/icp_qat_fw_pke.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/icp_qat_hal.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/icp_qat_hw.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/icp_qat_hw_20_comp.h | 0 .../crypto/{ =3D> intel}/qat/qat_common/icp_qat_hw_20_comp_defs.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/icp_qat_uclo.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/qat_algs.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/qat_algs_send.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/qat_algs_send.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/qat_asym_algs.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/qat_bl.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/qat_bl.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/qat_comp_algs.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/qat_comp_req.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/qat_compression.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/qat_compression.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/qat_crypto.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/qat_crypto.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/qat_hal.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_common/qat_uclo.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_dh895xcc/Makefile | 0 .../crypto/{ =3D> intel}/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c | 0 .../crypto/{ =3D> intel}/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_dh895xcc/adf_drv.c | 0 drivers/crypto/{ =3D> intel}/qat/qat_dh895xccvf/Makefile | 0 .../{ =3D> intel}/qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.c | 0 .../{ =3D> intel}/qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.h | 0 drivers/crypto/{ =3D> intel}/qat/qat_dh895xccvf/adf_drv.c | 0 111 files changed, 3 insertions(+), 3 deletions(-) rename drivers/crypto/{ =3D> intel}/qat/Kconfig (100%) rename drivers/crypto/{ =3D> intel}/qat/Makefile (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_4xxx/Makefile (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_4xxx/adf_4xxx_hw_data.c (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_4xxx/adf_4xxx_hw_data.h (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_4xxx/adf_drv.c (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_c3xxx/Makefile (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_c3xxx/adf_c3xxx_hw_data.c (100= %) rename drivers/crypto/{ =3D> intel}/qat/qat_c3xxx/adf_c3xxx_hw_data.h (100= %) rename drivers/crypto/{ =3D> intel}/qat/qat_c3xxx/adf_drv.c (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_c3xxxvf/Makefile (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.c = (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.h = (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_c3xxxvf/adf_drv.c (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_c62x/Makefile (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_c62x/adf_c62x_hw_data.c (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_c62x/adf_c62x_hw_data.h (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_c62x/adf_drv.c (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_c62xvf/Makefile (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_c62xvf/adf_c62xvf_hw_data.c (1= 00%) rename drivers/crypto/{ =3D> intel}/qat/qat_c62xvf/adf_c62xvf_hw_data.h (1= 00%) rename drivers/crypto/{ =3D> intel}/qat/qat_c62xvf/adf_drv.c (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/Makefile (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_accel_devices.h (10= 0%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_accel_engine.c (100= %) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_admin.c (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_aer.c (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_cfg.c (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_cfg.h (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_cfg_common.h (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_cfg_strings.h (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_cfg_user.h (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_common_drv.h (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_ctl_drv.c (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_dev_mgr.c (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_gen2_config.c (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_gen2_config.h (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_gen2_dc.c (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_gen2_dc.h (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_gen2_hw_data.c (100= %) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_gen2_hw_data.h (100= %) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_gen2_pfvf.c (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_gen2_pfvf.h (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_gen4_dc.c (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_gen4_dc.h (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_gen4_hw_data.c (100= %) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_gen4_hw_data.h (100= %) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_gen4_pfvf.c (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_gen4_pfvf.h (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_gen4_pm.c (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_gen4_pm.h (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_hw_arbiter.c (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_init.c (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_isr.c (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_pfvf_msg.h (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_pfvf_pf_msg.c (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_pfvf_pf_msg.h (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_pfvf_pf_proto.c (10= 0%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_pfvf_pf_proto.h (10= 0%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_pfvf_utils.c (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_pfvf_utils.h (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_pfvf_vf_msg.c (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_pfvf_vf_msg.h (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_pfvf_vf_proto.c (10= 0%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_pfvf_vf_proto.h (10= 0%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_sriov.c (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_sysfs.c (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_transport.c (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_transport.h (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_transport_access_ma= cros.h (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_transport_debug.c (= 100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_transport_internal.= h (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/adf_vf_isr.c (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/icp_qat_fw.h (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/icp_qat_fw_comp.h (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/icp_qat_fw_init_admin.h= (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/icp_qat_fw_la.h (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/icp_qat_fw_loader_handl= e.h (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/icp_qat_fw_pke.h (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/icp_qat_hal.h (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/icp_qat_hw.h (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/icp_qat_hw_20_comp.h (1= 00%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/icp_qat_hw_20_comp_defs= .h (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/icp_qat_uclo.h (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/qat_algs.c (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/qat_algs_send.c (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/qat_algs_send.h (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/qat_asym_algs.c (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/qat_bl.c (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/qat_bl.h (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/qat_comp_algs.c (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/qat_comp_req.h (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/qat_compression.c (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/qat_compression.h (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/qat_crypto.c (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/qat_crypto.h (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/qat_hal.c (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_common/qat_uclo.c (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_dh895xcc/Makefile (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_dh895xcc/adf_dh895xcc_hw_data.= c (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_dh895xcc/adf_dh895xcc_hw_data.= h (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_dh895xcc/adf_drv.c (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_dh895xccvf/Makefile (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_dh895xccvf/adf_dh895xccvf_hw_d= ata.c (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_dh895xccvf/adf_dh895xccvf_hw_d= ata.h (100%) rename drivers/crypto/{ =3D> intel}/qat/qat_dh895xccvf/adf_drv.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index e49d331aba47..da46f5a96fef 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -17026,7 +17026,7 @@ QAT DRIVER M: Giovanni Cabiddu L: qat-linux@intel.com S: Supported -F: drivers/crypto/qat/ +F: drivers/crypto/intel/qat/ =20 QCOM AUDIO (ASoC) DRIVERS M: Srinivas Kandagatla diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index 007299bcd36c..38296235c3e6 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig @@ -487,7 +487,6 @@ config CRYPTO_DEV_MXS_DCP To compile this driver as a module, choose M here: the module will be called mxs-dcp. =20 -source "drivers/crypto/qat/Kconfig" source "drivers/crypto/cavium/cpt/Kconfig" source "drivers/crypto/cavium/nitrox/Kconfig" source "drivers/crypto/marvell/Kconfig" diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile index 17f323718b6a..51d36701e785 100644 --- a/drivers/crypto/Makefile +++ b/drivers/crypto/Makefile @@ -32,7 +32,6 @@ obj-$(CONFIG_CRYPTO_DEV_OMAP_SHAM) +=3D omap-sham.o obj-$(CONFIG_CRYPTO_DEV_PADLOCK_AES) +=3D padlock-aes.o obj-$(CONFIG_CRYPTO_DEV_PADLOCK_SHA) +=3D padlock-sha.o obj-$(CONFIG_CRYPTO_DEV_PPC4XX) +=3D amcc/ -obj-$(CONFIG_CRYPTO_DEV_QAT) +=3D qat/ obj-$(CONFIG_CRYPTO_DEV_QCE) +=3D qce/ obj-$(CONFIG_CRYPTO_DEV_QCOM_RNG) +=3D qcom-rng.o obj-$(CONFIG_CRYPTO_DEV_ROCKCHIP) +=3D rockchip/ diff --git a/drivers/crypto/intel/Kconfig b/drivers/crypto/intel/Kconfig index a777e558b004..a82ead557563 100644 --- a/drivers/crypto/intel/Kconfig +++ b/drivers/crypto/intel/Kconfig @@ -3,3 +3,4 @@ source "drivers/crypto/intel/iaa/Kconfig" source "drivers/crypto/intel/keembay/Kconfig" source "drivers/crypto/intel/ixp4xx/Kconfig" +source "drivers/crypto/intel/qat/Kconfig" diff --git a/drivers/crypto/intel/Makefile b/drivers/crypto/intel/Makefile index 93a3cf3a8703..4d5d0129930b 100644 --- a/drivers/crypto/intel/Makefile +++ b/drivers/crypto/intel/Makefile @@ -3,3 +3,4 @@ obj-$(CONFIG_CRYPTO_DEV_IAA_CRYPTO) +=3D iaa/ obj-y +=3D keembay/ obj-y +=3D ixp4xx/ +obj-$(CONFIG_CRYPTO_DEV_QAT) +=3D qat/ diff --git a/drivers/crypto/qat/Kconfig b/drivers/crypto/intel/qat/Kconfig similarity index 100% rename from drivers/crypto/qat/Kconfig rename to drivers/crypto/intel/qat/Kconfig diff --git a/drivers/crypto/qat/Makefile b/drivers/crypto/intel/qat/Makefile similarity index 100% rename from drivers/crypto/qat/Makefile rename to drivers/crypto/intel/qat/Makefile diff --git a/drivers/crypto/qat/qat_4xxx/Makefile b/drivers/crypto/intel/qa= t/qat_4xxx/Makefile similarity index 100% rename from drivers/crypto/qat/qat_4xxx/Makefile rename to drivers/crypto/intel/qat/qat_4xxx/Makefile diff --git a/drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.c b/drivers/crypt= o/intel/qat/qat_4xxx/adf_4xxx_hw_data.c similarity index 100% rename from drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.c rename to drivers/crypto/intel/qat/qat_4xxx/adf_4xxx_hw_data.c diff --git a/drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.h b/drivers/crypt= o/intel/qat/qat_4xxx/adf_4xxx_hw_data.h similarity index 100% rename from drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.h rename to drivers/crypto/intel/qat/qat_4xxx/adf_4xxx_hw_data.h diff --git a/drivers/crypto/qat/qat_4xxx/adf_drv.c b/drivers/crypto/intel/q= at/qat_4xxx/adf_drv.c similarity index 100% rename from drivers/crypto/qat/qat_4xxx/adf_drv.c rename to drivers/crypto/intel/qat/qat_4xxx/adf_drv.c diff --git a/drivers/crypto/qat/qat_c3xxx/Makefile b/drivers/crypto/intel/q= at/qat_c3xxx/Makefile similarity index 100% rename from drivers/crypto/qat/qat_c3xxx/Makefile rename to drivers/crypto/intel/qat/qat_c3xxx/Makefile diff --git a/drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.c b/drivers/cry= pto/intel/qat/qat_c3xxx/adf_c3xxx_hw_data.c similarity index 100% rename from drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.c rename to drivers/crypto/intel/qat/qat_c3xxx/adf_c3xxx_hw_data.c diff --git a/drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.h b/drivers/cry= pto/intel/qat/qat_c3xxx/adf_c3xxx_hw_data.h similarity index 100% rename from drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.h rename to drivers/crypto/intel/qat/qat_c3xxx/adf_c3xxx_hw_data.h diff --git a/drivers/crypto/qat/qat_c3xxx/adf_drv.c b/drivers/crypto/intel/= qat/qat_c3xxx/adf_drv.c similarity index 100% rename from drivers/crypto/qat/qat_c3xxx/adf_drv.c rename to drivers/crypto/intel/qat/qat_c3xxx/adf_drv.c diff --git a/drivers/crypto/qat/qat_c3xxxvf/Makefile b/drivers/crypto/intel= /qat/qat_c3xxxvf/Makefile similarity index 100% rename from drivers/crypto/qat/qat_c3xxxvf/Makefile rename to drivers/crypto/intel/qat/qat_c3xxxvf/Makefile diff --git a/drivers/crypto/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.c b/drivers= /crypto/intel/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.c similarity index 100% rename from drivers/crypto/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.c rename to drivers/crypto/intel/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.c diff --git a/drivers/crypto/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.h b/drivers= /crypto/intel/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.h similarity index 100% rename from drivers/crypto/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.h rename to drivers/crypto/intel/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.h diff --git a/drivers/crypto/qat/qat_c3xxxvf/adf_drv.c b/drivers/crypto/inte= l/qat/qat_c3xxxvf/adf_drv.c similarity index 100% rename from drivers/crypto/qat/qat_c3xxxvf/adf_drv.c rename to drivers/crypto/intel/qat/qat_c3xxxvf/adf_drv.c diff --git a/drivers/crypto/qat/qat_c62x/Makefile b/drivers/crypto/intel/qa= t/qat_c62x/Makefile similarity index 100% rename from drivers/crypto/qat/qat_c62x/Makefile rename to drivers/crypto/intel/qat/qat_c62x/Makefile diff --git a/drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.c b/drivers/crypt= o/intel/qat/qat_c62x/adf_c62x_hw_data.c similarity index 100% rename from drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.c rename to drivers/crypto/intel/qat/qat_c62x/adf_c62x_hw_data.c diff --git a/drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.h b/drivers/crypt= o/intel/qat/qat_c62x/adf_c62x_hw_data.h similarity index 100% rename from drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.h rename to drivers/crypto/intel/qat/qat_c62x/adf_c62x_hw_data.h diff --git a/drivers/crypto/qat/qat_c62x/adf_drv.c b/drivers/crypto/intel/q= at/qat_c62x/adf_drv.c similarity index 100% rename from drivers/crypto/qat/qat_c62x/adf_drv.c rename to drivers/crypto/intel/qat/qat_c62x/adf_drv.c diff --git a/drivers/crypto/qat/qat_c62xvf/Makefile b/drivers/crypto/intel/= qat/qat_c62xvf/Makefile similarity index 100% rename from drivers/crypto/qat/qat_c62xvf/Makefile rename to drivers/crypto/intel/qat/qat_c62xvf/Makefile diff --git a/drivers/crypto/qat/qat_c62xvf/adf_c62xvf_hw_data.c b/drivers/c= rypto/intel/qat/qat_c62xvf/adf_c62xvf_hw_data.c similarity index 100% rename from drivers/crypto/qat/qat_c62xvf/adf_c62xvf_hw_data.c rename to drivers/crypto/intel/qat/qat_c62xvf/adf_c62xvf_hw_data.c diff --git a/drivers/crypto/qat/qat_c62xvf/adf_c62xvf_hw_data.h b/drivers/c= rypto/intel/qat/qat_c62xvf/adf_c62xvf_hw_data.h similarity index 100% rename from drivers/crypto/qat/qat_c62xvf/adf_c62xvf_hw_data.h rename to drivers/crypto/intel/qat/qat_c62xvf/adf_c62xvf_hw_data.h diff --git a/drivers/crypto/qat/qat_c62xvf/adf_drv.c b/drivers/crypto/intel= /qat/qat_c62xvf/adf_drv.c similarity index 100% rename from drivers/crypto/qat/qat_c62xvf/adf_drv.c rename to drivers/crypto/intel/qat/qat_c62xvf/adf_drv.c diff --git a/drivers/crypto/qat/qat_common/Makefile b/drivers/crypto/intel/= qat/qat_common/Makefile similarity index 100% rename from drivers/crypto/qat/qat_common/Makefile rename to drivers/crypto/intel/qat/qat_common/Makefile diff --git a/drivers/crypto/qat/qat_common/adf_accel_devices.h b/drivers/cr= ypto/intel/qat/qat_common/adf_accel_devices.h similarity index 100% rename from drivers/crypto/qat/qat_common/adf_accel_devices.h rename to drivers/crypto/intel/qat/qat_common/adf_accel_devices.h diff --git a/drivers/crypto/qat/qat_common/adf_accel_engine.c b/drivers/cry= pto/intel/qat/qat_common/adf_accel_engine.c similarity index 100% rename from drivers/crypto/qat/qat_common/adf_accel_engine.c rename to drivers/crypto/intel/qat/qat_common/adf_accel_engine.c diff --git a/drivers/crypto/qat/qat_common/adf_admin.c b/drivers/crypto/int= el/qat/qat_common/adf_admin.c similarity index 100% rename from drivers/crypto/qat/qat_common/adf_admin.c rename to drivers/crypto/intel/qat/qat_common/adf_admin.c diff --git a/drivers/crypto/qat/qat_common/adf_aer.c b/drivers/crypto/intel= /qat/qat_common/adf_aer.c similarity index 100% rename from drivers/crypto/qat/qat_common/adf_aer.c rename to drivers/crypto/intel/qat/qat_common/adf_aer.c diff --git a/drivers/crypto/qat/qat_common/adf_cfg.c b/drivers/crypto/intel= /qat/qat_common/adf_cfg.c similarity index 100% rename from drivers/crypto/qat/qat_common/adf_cfg.c rename to drivers/crypto/intel/qat/qat_common/adf_cfg.c diff --git a/drivers/crypto/qat/qat_common/adf_cfg.h b/drivers/crypto/intel= /qat/qat_common/adf_cfg.h similarity index 100% rename from drivers/crypto/qat/qat_common/adf_cfg.h rename to drivers/crypto/intel/qat/qat_common/adf_cfg.h diff --git a/drivers/crypto/qat/qat_common/adf_cfg_common.h b/drivers/crypt= o/intel/qat/qat_common/adf_cfg_common.h similarity index 100% rename from drivers/crypto/qat/qat_common/adf_cfg_common.h rename to drivers/crypto/intel/qat/qat_common/adf_cfg_common.h diff --git a/drivers/crypto/qat/qat_common/adf_cfg_strings.h b/drivers/cryp= to/intel/qat/qat_common/adf_cfg_strings.h similarity index 100% rename from drivers/crypto/qat/qat_common/adf_cfg_strings.h rename to drivers/crypto/intel/qat/qat_common/adf_cfg_strings.h diff --git a/drivers/crypto/qat/qat_common/adf_cfg_user.h b/drivers/crypto/= intel/qat/qat_common/adf_cfg_user.h similarity index 100% rename from drivers/crypto/qat/qat_common/adf_cfg_user.h rename to drivers/crypto/intel/qat/qat_common/adf_cfg_user.h diff --git a/drivers/crypto/qat/qat_common/adf_common_drv.h b/drivers/crypt= o/intel/qat/qat_common/adf_common_drv.h similarity index 100% rename from drivers/crypto/qat/qat_common/adf_common_drv.h rename to drivers/crypto/intel/qat/qat_common/adf_common_drv.h diff --git a/drivers/crypto/qat/qat_common/adf_ctl_drv.c b/drivers/crypto/i= ntel/qat/qat_common/adf_ctl_drv.c similarity index 100% rename from drivers/crypto/qat/qat_common/adf_ctl_drv.c rename to drivers/crypto/intel/qat/qat_common/adf_ctl_drv.c diff --git a/drivers/crypto/qat/qat_common/adf_dev_mgr.c b/drivers/crypto/i= ntel/qat/qat_common/adf_dev_mgr.c similarity index 100% rename from drivers/crypto/qat/qat_common/adf_dev_mgr.c rename to drivers/crypto/intel/qat/qat_common/adf_dev_mgr.c diff --git a/drivers/crypto/qat/qat_common/adf_gen2_config.c b/drivers/cryp= to/intel/qat/qat_common/adf_gen2_config.c similarity index 100% rename from drivers/crypto/qat/qat_common/adf_gen2_config.c rename to drivers/crypto/intel/qat/qat_common/adf_gen2_config.c diff --git a/drivers/crypto/qat/qat_common/adf_gen2_config.h b/drivers/cryp= to/intel/qat/qat_common/adf_gen2_config.h similarity index 100% rename from drivers/crypto/qat/qat_common/adf_gen2_config.h rename to drivers/crypto/intel/qat/qat_common/adf_gen2_config.h diff --git a/drivers/crypto/qat/qat_common/adf_gen2_dc.c b/drivers/crypto/i= ntel/qat/qat_common/adf_gen2_dc.c similarity index 100% rename from drivers/crypto/qat/qat_common/adf_gen2_dc.c rename to drivers/crypto/intel/qat/qat_common/adf_gen2_dc.c diff --git a/drivers/crypto/qat/qat_common/adf_gen2_dc.h b/drivers/crypto/i= ntel/qat/qat_common/adf_gen2_dc.h similarity index 100% rename from drivers/crypto/qat/qat_common/adf_gen2_dc.h rename to drivers/crypto/intel/qat/qat_common/adf_gen2_dc.h diff --git a/drivers/crypto/qat/qat_common/adf_gen2_hw_data.c b/drivers/cry= pto/intel/qat/qat_common/adf_gen2_hw_data.c similarity index 100% rename from drivers/crypto/qat/qat_common/adf_gen2_hw_data.c rename to drivers/crypto/intel/qat/qat_common/adf_gen2_hw_data.c diff --git a/drivers/crypto/qat/qat_common/adf_gen2_hw_data.h b/drivers/cry= pto/intel/qat/qat_common/adf_gen2_hw_data.h similarity index 100% rename from drivers/crypto/qat/qat_common/adf_gen2_hw_data.h rename to drivers/crypto/intel/qat/qat_common/adf_gen2_hw_data.h diff --git a/drivers/crypto/qat/qat_common/adf_gen2_pfvf.c b/drivers/crypto= /intel/qat/qat_common/adf_gen2_pfvf.c similarity index 100% rename from drivers/crypto/qat/qat_common/adf_gen2_pfvf.c rename to drivers/crypto/intel/qat/qat_common/adf_gen2_pfvf.c diff --git a/drivers/crypto/qat/qat_common/adf_gen2_pfvf.h b/drivers/crypto= /intel/qat/qat_common/adf_gen2_pfvf.h similarity index 100% rename from drivers/crypto/qat/qat_common/adf_gen2_pfvf.h rename to drivers/crypto/intel/qat/qat_common/adf_gen2_pfvf.h diff --git a/drivers/crypto/qat/qat_common/adf_gen4_dc.c b/drivers/crypto/i= ntel/qat/qat_common/adf_gen4_dc.c similarity index 100% rename from drivers/crypto/qat/qat_common/adf_gen4_dc.c rename to drivers/crypto/intel/qat/qat_common/adf_gen4_dc.c diff --git a/drivers/crypto/qat/qat_common/adf_gen4_dc.h b/drivers/crypto/i= ntel/qat/qat_common/adf_gen4_dc.h similarity index 100% rename from drivers/crypto/qat/qat_common/adf_gen4_dc.h rename to drivers/crypto/intel/qat/qat_common/adf_gen4_dc.h diff --git a/drivers/crypto/qat/qat_common/adf_gen4_hw_data.c b/drivers/cry= pto/intel/qat/qat_common/adf_gen4_hw_data.c similarity index 100% rename from drivers/crypto/qat/qat_common/adf_gen4_hw_data.c rename to drivers/crypto/intel/qat/qat_common/adf_gen4_hw_data.c diff --git a/drivers/crypto/qat/qat_common/adf_gen4_hw_data.h b/drivers/cry= pto/intel/qat/qat_common/adf_gen4_hw_data.h similarity index 100% rename from drivers/crypto/qat/qat_common/adf_gen4_hw_data.h rename to drivers/crypto/intel/qat/qat_common/adf_gen4_hw_data.h diff --git a/drivers/crypto/qat/qat_common/adf_gen4_pfvf.c b/drivers/crypto= /intel/qat/qat_common/adf_gen4_pfvf.c similarity index 100% rename from drivers/crypto/qat/qat_common/adf_gen4_pfvf.c rename to drivers/crypto/intel/qat/qat_common/adf_gen4_pfvf.c diff --git a/drivers/crypto/qat/qat_common/adf_gen4_pfvf.h b/drivers/crypto= /intel/qat/qat_common/adf_gen4_pfvf.h similarity index 100% rename from drivers/crypto/qat/qat_common/adf_gen4_pfvf.h rename to drivers/crypto/intel/qat/qat_common/adf_gen4_pfvf.h diff --git a/drivers/crypto/qat/qat_common/adf_gen4_pm.c b/drivers/crypto/i= ntel/qat/qat_common/adf_gen4_pm.c similarity index 100% rename from drivers/crypto/qat/qat_common/adf_gen4_pm.c rename to drivers/crypto/intel/qat/qat_common/adf_gen4_pm.c diff --git a/drivers/crypto/qat/qat_common/adf_gen4_pm.h b/drivers/crypto/i= ntel/qat/qat_common/adf_gen4_pm.h similarity index 100% rename from drivers/crypto/qat/qat_common/adf_gen4_pm.h rename to drivers/crypto/intel/qat/qat_common/adf_gen4_pm.h diff --git a/drivers/crypto/qat/qat_common/adf_hw_arbiter.c b/drivers/crypt= o/intel/qat/qat_common/adf_hw_arbiter.c similarity index 100% rename from drivers/crypto/qat/qat_common/adf_hw_arbiter.c rename to drivers/crypto/intel/qat/qat_common/adf_hw_arbiter.c diff --git a/drivers/crypto/qat/qat_common/adf_init.c b/drivers/crypto/inte= l/qat/qat_common/adf_init.c similarity index 100% rename from drivers/crypto/qat/qat_common/adf_init.c rename to drivers/crypto/intel/qat/qat_common/adf_init.c diff --git a/drivers/crypto/qat/qat_common/adf_isr.c b/drivers/crypto/intel= /qat/qat_common/adf_isr.c similarity index 100% rename from drivers/crypto/qat/qat_common/adf_isr.c rename to drivers/crypto/intel/qat/qat_common/adf_isr.c diff --git a/drivers/crypto/qat/qat_common/adf_pfvf_msg.h b/drivers/crypto/= intel/qat/qat_common/adf_pfvf_msg.h similarity index 100% rename from drivers/crypto/qat/qat_common/adf_pfvf_msg.h rename to drivers/crypto/intel/qat/qat_common/adf_pfvf_msg.h diff --git a/drivers/crypto/qat/qat_common/adf_pfvf_pf_msg.c b/drivers/cryp= to/intel/qat/qat_common/adf_pfvf_pf_msg.c similarity index 100% rename from drivers/crypto/qat/qat_common/adf_pfvf_pf_msg.c rename to drivers/crypto/intel/qat/qat_common/adf_pfvf_pf_msg.c diff --git a/drivers/crypto/qat/qat_common/adf_pfvf_pf_msg.h b/drivers/cryp= to/intel/qat/qat_common/adf_pfvf_pf_msg.h similarity index 100% rename from drivers/crypto/qat/qat_common/adf_pfvf_pf_msg.h rename to drivers/crypto/intel/qat/qat_common/adf_pfvf_pf_msg.h diff --git a/drivers/crypto/qat/qat_common/adf_pfvf_pf_proto.c b/drivers/cr= ypto/intel/qat/qat_common/adf_pfvf_pf_proto.c similarity index 100% rename from drivers/crypto/qat/qat_common/adf_pfvf_pf_proto.c rename to drivers/crypto/intel/qat/qat_common/adf_pfvf_pf_proto.c diff --git a/drivers/crypto/qat/qat_common/adf_pfvf_pf_proto.h b/drivers/cr= ypto/intel/qat/qat_common/adf_pfvf_pf_proto.h similarity index 100% rename from drivers/crypto/qat/qat_common/adf_pfvf_pf_proto.h rename to drivers/crypto/intel/qat/qat_common/adf_pfvf_pf_proto.h diff --git a/drivers/crypto/qat/qat_common/adf_pfvf_utils.c b/drivers/crypt= o/intel/qat/qat_common/adf_pfvf_utils.c similarity index 100% rename from drivers/crypto/qat/qat_common/adf_pfvf_utils.c rename to drivers/crypto/intel/qat/qat_common/adf_pfvf_utils.c diff --git a/drivers/crypto/qat/qat_common/adf_pfvf_utils.h b/drivers/crypt= o/intel/qat/qat_common/adf_pfvf_utils.h similarity index 100% rename from drivers/crypto/qat/qat_common/adf_pfvf_utils.h rename to drivers/crypto/intel/qat/qat_common/adf_pfvf_utils.h diff --git a/drivers/crypto/qat/qat_common/adf_pfvf_vf_msg.c b/drivers/cryp= to/intel/qat/qat_common/adf_pfvf_vf_msg.c similarity index 100% rename from drivers/crypto/qat/qat_common/adf_pfvf_vf_msg.c rename to drivers/crypto/intel/qat/qat_common/adf_pfvf_vf_msg.c diff --git a/drivers/crypto/qat/qat_common/adf_pfvf_vf_msg.h b/drivers/cryp= to/intel/qat/qat_common/adf_pfvf_vf_msg.h similarity index 100% rename from drivers/crypto/qat/qat_common/adf_pfvf_vf_msg.h rename to drivers/crypto/intel/qat/qat_common/adf_pfvf_vf_msg.h diff --git a/drivers/crypto/qat/qat_common/adf_pfvf_vf_proto.c b/drivers/cr= ypto/intel/qat/qat_common/adf_pfvf_vf_proto.c similarity index 100% rename from drivers/crypto/qat/qat_common/adf_pfvf_vf_proto.c rename to drivers/crypto/intel/qat/qat_common/adf_pfvf_vf_proto.c diff --git a/drivers/crypto/qat/qat_common/adf_pfvf_vf_proto.h b/drivers/cr= ypto/intel/qat/qat_common/adf_pfvf_vf_proto.h similarity index 100% rename from drivers/crypto/qat/qat_common/adf_pfvf_vf_proto.h rename to drivers/crypto/intel/qat/qat_common/adf_pfvf_vf_proto.h diff --git a/drivers/crypto/qat/qat_common/adf_sriov.c b/drivers/crypto/int= el/qat/qat_common/adf_sriov.c similarity index 100% rename from drivers/crypto/qat/qat_common/adf_sriov.c rename to drivers/crypto/intel/qat/qat_common/adf_sriov.c diff --git a/drivers/crypto/qat/qat_common/adf_sysfs.c b/drivers/crypto/int= el/qat/qat_common/adf_sysfs.c similarity index 100% rename from drivers/crypto/qat/qat_common/adf_sysfs.c rename to drivers/crypto/intel/qat/qat_common/adf_sysfs.c diff --git a/drivers/crypto/qat/qat_common/adf_transport.c b/drivers/crypto= /intel/qat/qat_common/adf_transport.c similarity index 100% rename from drivers/crypto/qat/qat_common/adf_transport.c rename to drivers/crypto/intel/qat/qat_common/adf_transport.c diff --git a/drivers/crypto/qat/qat_common/adf_transport.h b/drivers/crypto= /intel/qat/qat_common/adf_transport.h similarity index 100% rename from drivers/crypto/qat/qat_common/adf_transport.h rename to drivers/crypto/intel/qat/qat_common/adf_transport.h diff --git a/drivers/crypto/qat/qat_common/adf_transport_access_macros.h b/= drivers/crypto/intel/qat/qat_common/adf_transport_access_macros.h similarity index 100% rename from drivers/crypto/qat/qat_common/adf_transport_access_macros.h rename to drivers/crypto/intel/qat/qat_common/adf_transport_access_macros.h diff --git a/drivers/crypto/qat/qat_common/adf_transport_debug.c b/drivers/= crypto/intel/qat/qat_common/adf_transport_debug.c similarity index 100% rename from drivers/crypto/qat/qat_common/adf_transport_debug.c rename to drivers/crypto/intel/qat/qat_common/adf_transport_debug.c diff --git a/drivers/crypto/qat/qat_common/adf_transport_internal.h b/drive= rs/crypto/intel/qat/qat_common/adf_transport_internal.h similarity index 100% rename from drivers/crypto/qat/qat_common/adf_transport_internal.h rename to drivers/crypto/intel/qat/qat_common/adf_transport_internal.h diff --git a/drivers/crypto/qat/qat_common/adf_vf_isr.c b/drivers/crypto/in= tel/qat/qat_common/adf_vf_isr.c similarity index 100% rename from drivers/crypto/qat/qat_common/adf_vf_isr.c rename to drivers/crypto/intel/qat/qat_common/adf_vf_isr.c diff --git a/drivers/crypto/qat/qat_common/icp_qat_fw.h b/drivers/crypto/in= tel/qat/qat_common/icp_qat_fw.h similarity index 100% rename from drivers/crypto/qat/qat_common/icp_qat_fw.h rename to drivers/crypto/intel/qat/qat_common/icp_qat_fw.h diff --git a/drivers/crypto/qat/qat_common/icp_qat_fw_comp.h b/drivers/cryp= to/intel/qat/qat_common/icp_qat_fw_comp.h similarity index 100% rename from drivers/crypto/qat/qat_common/icp_qat_fw_comp.h rename to drivers/crypto/intel/qat/qat_common/icp_qat_fw_comp.h diff --git a/drivers/crypto/qat/qat_common/icp_qat_fw_init_admin.h b/driver= s/crypto/intel/qat/qat_common/icp_qat_fw_init_admin.h similarity index 100% rename from drivers/crypto/qat/qat_common/icp_qat_fw_init_admin.h rename to drivers/crypto/intel/qat/qat_common/icp_qat_fw_init_admin.h diff --git a/drivers/crypto/qat/qat_common/icp_qat_fw_la.h b/drivers/crypto= /intel/qat/qat_common/icp_qat_fw_la.h similarity index 100% rename from drivers/crypto/qat/qat_common/icp_qat_fw_la.h rename to drivers/crypto/intel/qat/qat_common/icp_qat_fw_la.h diff --git a/drivers/crypto/qat/qat_common/icp_qat_fw_loader_handle.h b/dri= vers/crypto/intel/qat/qat_common/icp_qat_fw_loader_handle.h similarity index 100% rename from drivers/crypto/qat/qat_common/icp_qat_fw_loader_handle.h rename to drivers/crypto/intel/qat/qat_common/icp_qat_fw_loader_handle.h diff --git a/drivers/crypto/qat/qat_common/icp_qat_fw_pke.h b/drivers/crypt= o/intel/qat/qat_common/icp_qat_fw_pke.h similarity index 100% rename from drivers/crypto/qat/qat_common/icp_qat_fw_pke.h rename to drivers/crypto/intel/qat/qat_common/icp_qat_fw_pke.h diff --git a/drivers/crypto/qat/qat_common/icp_qat_hal.h b/drivers/crypto/i= ntel/qat/qat_common/icp_qat_hal.h similarity index 100% rename from drivers/crypto/qat/qat_common/icp_qat_hal.h rename to drivers/crypto/intel/qat/qat_common/icp_qat_hal.h diff --git a/drivers/crypto/qat/qat_common/icp_qat_hw.h b/drivers/crypto/in= tel/qat/qat_common/icp_qat_hw.h similarity index 100% rename from drivers/crypto/qat/qat_common/icp_qat_hw.h rename to drivers/crypto/intel/qat/qat_common/icp_qat_hw.h diff --git a/drivers/crypto/qat/qat_common/icp_qat_hw_20_comp.h b/drivers/c= rypto/intel/qat/qat_common/icp_qat_hw_20_comp.h similarity index 100% rename from drivers/crypto/qat/qat_common/icp_qat_hw_20_comp.h rename to drivers/crypto/intel/qat/qat_common/icp_qat_hw_20_comp.h diff --git a/drivers/crypto/qat/qat_common/icp_qat_hw_20_comp_defs.h b/driv= ers/crypto/intel/qat/qat_common/icp_qat_hw_20_comp_defs.h similarity index 100% rename from drivers/crypto/qat/qat_common/icp_qat_hw_20_comp_defs.h rename to drivers/crypto/intel/qat/qat_common/icp_qat_hw_20_comp_defs.h diff --git a/drivers/crypto/qat/qat_common/icp_qat_uclo.h b/drivers/crypto/= intel/qat/qat_common/icp_qat_uclo.h similarity index 100% rename from drivers/crypto/qat/qat_common/icp_qat_uclo.h rename to drivers/crypto/intel/qat/qat_common/icp_qat_uclo.h diff --git a/drivers/crypto/qat/qat_common/qat_algs.c b/drivers/crypto/inte= l/qat/qat_common/qat_algs.c similarity index 100% rename from drivers/crypto/qat/qat_common/qat_algs.c rename to drivers/crypto/intel/qat/qat_common/qat_algs.c diff --git a/drivers/crypto/qat/qat_common/qat_algs_send.c b/drivers/crypto= /intel/qat/qat_common/qat_algs_send.c similarity index 100% rename from drivers/crypto/qat/qat_common/qat_algs_send.c rename to drivers/crypto/intel/qat/qat_common/qat_algs_send.c diff --git a/drivers/crypto/qat/qat_common/qat_algs_send.h b/drivers/crypto= /intel/qat/qat_common/qat_algs_send.h similarity index 100% rename from drivers/crypto/qat/qat_common/qat_algs_send.h rename to drivers/crypto/intel/qat/qat_common/qat_algs_send.h diff --git a/drivers/crypto/qat/qat_common/qat_asym_algs.c b/drivers/crypto= /intel/qat/qat_common/qat_asym_algs.c similarity index 100% rename from drivers/crypto/qat/qat_common/qat_asym_algs.c rename to drivers/crypto/intel/qat/qat_common/qat_asym_algs.c diff --git a/drivers/crypto/qat/qat_common/qat_bl.c b/drivers/crypto/intel/= qat/qat_common/qat_bl.c similarity index 100% rename from drivers/crypto/qat/qat_common/qat_bl.c rename to drivers/crypto/intel/qat/qat_common/qat_bl.c diff --git a/drivers/crypto/qat/qat_common/qat_bl.h b/drivers/crypto/intel/= qat/qat_common/qat_bl.h similarity index 100% rename from drivers/crypto/qat/qat_common/qat_bl.h rename to drivers/crypto/intel/qat/qat_common/qat_bl.h diff --git a/drivers/crypto/qat/qat_common/qat_comp_algs.c b/drivers/crypto= /intel/qat/qat_common/qat_comp_algs.c similarity index 100% rename from drivers/crypto/qat/qat_common/qat_comp_algs.c rename to drivers/crypto/intel/qat/qat_common/qat_comp_algs.c diff --git a/drivers/crypto/qat/qat_common/qat_comp_req.h b/drivers/crypto/= intel/qat/qat_common/qat_comp_req.h similarity index 100% rename from drivers/crypto/qat/qat_common/qat_comp_req.h rename to drivers/crypto/intel/qat/qat_common/qat_comp_req.h diff --git a/drivers/crypto/qat/qat_common/qat_compression.c b/drivers/cryp= to/intel/qat/qat_common/qat_compression.c similarity index 100% rename from drivers/crypto/qat/qat_common/qat_compression.c rename to drivers/crypto/intel/qat/qat_common/qat_compression.c diff --git a/drivers/crypto/qat/qat_common/qat_compression.h b/drivers/cryp= to/intel/qat/qat_common/qat_compression.h similarity index 100% rename from drivers/crypto/qat/qat_common/qat_compression.h rename to drivers/crypto/intel/qat/qat_common/qat_compression.h diff --git a/drivers/crypto/qat/qat_common/qat_crypto.c b/drivers/crypto/in= tel/qat/qat_common/qat_crypto.c similarity index 100% rename from drivers/crypto/qat/qat_common/qat_crypto.c rename to drivers/crypto/intel/qat/qat_common/qat_crypto.c diff --git a/drivers/crypto/qat/qat_common/qat_crypto.h b/drivers/crypto/in= tel/qat/qat_common/qat_crypto.h similarity index 100% rename from drivers/crypto/qat/qat_common/qat_crypto.h rename to drivers/crypto/intel/qat/qat_common/qat_crypto.h diff --git a/drivers/crypto/qat/qat_common/qat_hal.c b/drivers/crypto/intel= /qat/qat_common/qat_hal.c similarity index 100% rename from drivers/crypto/qat/qat_common/qat_hal.c rename to drivers/crypto/intel/qat/qat_common/qat_hal.c diff --git a/drivers/crypto/qat/qat_common/qat_uclo.c b/drivers/crypto/inte= l/qat/qat_common/qat_uclo.c similarity index 100% rename from drivers/crypto/qat/qat_common/qat_uclo.c rename to drivers/crypto/intel/qat/qat_common/qat_uclo.c diff --git a/drivers/crypto/qat/qat_dh895xcc/Makefile b/drivers/crypto/inte= l/qat/qat_dh895xcc/Makefile similarity index 100% rename from drivers/crypto/qat/qat_dh895xcc/Makefile rename to drivers/crypto/intel/qat/qat_dh895xcc/Makefile diff --git a/drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c b/drive= rs/crypto/intel/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c similarity index 100% rename from drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c rename to drivers/crypto/intel/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c diff --git a/drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h b/drive= rs/crypto/intel/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h similarity index 100% rename from drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h rename to drivers/crypto/intel/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h diff --git a/drivers/crypto/qat/qat_dh895xcc/adf_drv.c b/drivers/crypto/int= el/qat/qat_dh895xcc/adf_drv.c similarity index 100% rename from drivers/crypto/qat/qat_dh895xcc/adf_drv.c rename to drivers/crypto/intel/qat/qat_dh895xcc/adf_drv.c diff --git a/drivers/crypto/qat/qat_dh895xccvf/Makefile b/drivers/crypto/in= tel/qat/qat_dh895xccvf/Makefile similarity index 100% rename from drivers/crypto/qat/qat_dh895xccvf/Makefile rename to drivers/crypto/intel/qat/qat_dh895xccvf/Makefile diff --git a/drivers/crypto/qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.c b/d= rivers/crypto/intel/qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.c similarity index 100% rename from drivers/crypto/qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.c rename to drivers/crypto/intel/qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.c diff --git a/drivers/crypto/qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.h b/d= rivers/crypto/intel/qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.h similarity index 100% rename from drivers/crypto/qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.h rename to drivers/crypto/intel/qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.h diff --git a/drivers/crypto/qat/qat_dh895xccvf/adf_drv.c b/drivers/crypto/i= ntel/qat/qat_dh895xccvf/adf_drv.c similarity index 100% rename from drivers/crypto/qat/qat_dh895xccvf/adf_drv.c rename to drivers/crypto/intel/qat/qat_dh895xccvf/adf_drv.c --=20 2.34.1