linux-crypto.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/3] crypto: Move Intel crypto drivers to drivers/crypto/intel
@ 2023-03-28 15:39 Tom Zanussi
  2023-03-28 15:39 ` [PATCH 1/3] crypto: keembay - Move driver to drivers/crypto/intel/keembay Tom Zanussi
                   ` (3 more replies)
  0 siblings, 4 replies; 7+ messages in thread
From: Tom Zanussi @ 2023-03-28 15:39 UTC (permalink / raw)
  To: herbert, davem, fenghua.yu, vkoul
  Cc: dave.jiang, tony.luck, wajdi.k.feghali, james.guilford,
	kanchana.p.sridhar, giovanni.cabiddu, clabbe,
	daniele.alessandrelli, prabhjot.khurana, mgross, declan.murphy,
	linux-kernel, linux-crypto, dmaengine

As part of the series adding the IAA crypto driver ([PATCH v2 00/15]
crypto: Add Intel Analytics Accelerator (IAA) crypto compression
driver) [1] to drivers/crypto, Herbert Xu suggested moving the other
Intel drivers there too.

[1] https://lore.kernel.org/lkml/20230328153535.126223-1-tom.zanussi@linux.intel.com/T/#m6d6bff882778a3091317c5295f82373a4ad09e39

Tom Zanussi (3):
  crypto: keembay - Move driver to drivers/crypto/intel/keembay
  crypto: ixp4xx - Move driver to drivers/crypto/intel/ixp4xx
  crypto: qat - Move driver to drivers/crypto/intel/qat

 MAINTAINERS                                   | 32 +++++++++----------
 drivers/crypto/Kconfig                        | 17 ----------
 drivers/crypto/Makefile                       |  3 --
 drivers/crypto/intel/Kconfig                  |  3 ++
 drivers/crypto/intel/Makefile                 |  3 ++
 drivers/crypto/intel/ixp4xx/Kconfig           | 14 ++++++++
 drivers/crypto/intel/ixp4xx/Makefile          |  2 ++
 .../crypto/{ => intel/ixp4xx}/ixp4xx_crypto.c |  0
 drivers/crypto/{ => intel}/keembay/Kconfig    |  0
 drivers/crypto/{ => intel}/keembay/Makefile   |  0
 .../keembay/keembay-ocs-aes-core.c            |  0
 .../{ => intel}/keembay/keembay-ocs-ecc.c     |  0
 .../keembay/keembay-ocs-hcu-core.c            |  0
 drivers/crypto/{ => intel}/keembay/ocs-aes.c  |  0
 drivers/crypto/{ => intel}/keembay/ocs-aes.h  |  0
 drivers/crypto/{ => intel}/keembay/ocs-hcu.c  |  0
 drivers/crypto/{ => intel}/keembay/ocs-hcu.h  |  0
 drivers/crypto/{ => intel}/qat/Kconfig        |  0
 drivers/crypto/{ => intel}/qat/Makefile       |  0
 .../crypto/{ => intel}/qat/qat_4xxx/Makefile  |  0
 .../qat/qat_4xxx/adf_4xxx_hw_data.c           |  0
 .../qat/qat_4xxx/adf_4xxx_hw_data.h           |  0
 .../crypto/{ => intel}/qat/qat_4xxx/adf_drv.c |  0
 .../crypto/{ => intel}/qat/qat_c3xxx/Makefile |  0
 .../qat/qat_c3xxx/adf_c3xxx_hw_data.c         |  0
 .../qat/qat_c3xxx/adf_c3xxx_hw_data.h         |  0
 .../{ => intel}/qat/qat_c3xxx/adf_drv.c       |  0
 .../{ => intel}/qat/qat_c3xxxvf/Makefile      |  0
 .../qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.c     |  0
 .../qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.h     |  0
 .../{ => intel}/qat/qat_c3xxxvf/adf_drv.c     |  0
 .../crypto/{ => intel}/qat/qat_c62x/Makefile  |  0
 .../qat/qat_c62x/adf_c62x_hw_data.c           |  0
 .../qat/qat_c62x/adf_c62x_hw_data.h           |  0
 .../crypto/{ => intel}/qat/qat_c62x/adf_drv.c |  0
 .../{ => intel}/qat/qat_c62xvf/Makefile       |  0
 .../qat/qat_c62xvf/adf_c62xvf_hw_data.c       |  0
 .../qat/qat_c62xvf/adf_c62xvf_hw_data.h       |  0
 .../{ => intel}/qat/qat_c62xvf/adf_drv.c      |  0
 .../{ => intel}/qat/qat_common/Makefile       |  0
 .../qat/qat_common/adf_accel_devices.h        |  0
 .../qat/qat_common/adf_accel_engine.c         |  0
 .../{ => intel}/qat/qat_common/adf_admin.c    |  0
 .../{ => intel}/qat/qat_common/adf_aer.c      |  0
 .../{ => intel}/qat/qat_common/adf_cfg.c      |  0
 .../{ => intel}/qat/qat_common/adf_cfg.h      |  0
 .../qat/qat_common/adf_cfg_common.h           |  0
 .../qat/qat_common/adf_cfg_strings.h          |  0
 .../{ => intel}/qat/qat_common/adf_cfg_user.h |  0
 .../qat/qat_common/adf_common_drv.h           |  0
 .../{ => intel}/qat/qat_common/adf_ctl_drv.c  |  0
 .../{ => intel}/qat/qat_common/adf_dev_mgr.c  |  0
 .../qat/qat_common/adf_gen2_config.c          |  0
 .../qat/qat_common/adf_gen2_config.h          |  0
 .../{ => intel}/qat/qat_common/adf_gen2_dc.c  |  0
 .../{ => intel}/qat/qat_common/adf_gen2_dc.h  |  0
 .../qat/qat_common/adf_gen2_hw_data.c         |  0
 .../qat/qat_common/adf_gen2_hw_data.h         |  0
 .../qat/qat_common/adf_gen2_pfvf.c            |  0
 .../qat/qat_common/adf_gen2_pfvf.h            |  0
 .../{ => intel}/qat/qat_common/adf_gen4_dc.c  |  0
 .../{ => intel}/qat/qat_common/adf_gen4_dc.h  |  0
 .../qat/qat_common/adf_gen4_hw_data.c         |  0
 .../qat/qat_common/adf_gen4_hw_data.h         |  0
 .../qat/qat_common/adf_gen4_pfvf.c            |  0
 .../qat/qat_common/adf_gen4_pfvf.h            |  0
 .../{ => intel}/qat/qat_common/adf_gen4_pm.c  |  0
 .../{ => intel}/qat/qat_common/adf_gen4_pm.h  |  0
 .../qat/qat_common/adf_hw_arbiter.c           |  0
 .../{ => intel}/qat/qat_common/adf_init.c     |  0
 .../{ => intel}/qat/qat_common/adf_isr.c      |  0
 .../{ => intel}/qat/qat_common/adf_pfvf_msg.h |  0
 .../qat/qat_common/adf_pfvf_pf_msg.c          |  0
 .../qat/qat_common/adf_pfvf_pf_msg.h          |  0
 .../qat/qat_common/adf_pfvf_pf_proto.c        |  0
 .../qat/qat_common/adf_pfvf_pf_proto.h        |  0
 .../qat/qat_common/adf_pfvf_utils.c           |  0
 .../qat/qat_common/adf_pfvf_utils.h           |  0
 .../qat/qat_common/adf_pfvf_vf_msg.c          |  0
 .../qat/qat_common/adf_pfvf_vf_msg.h          |  0
 .../qat/qat_common/adf_pfvf_vf_proto.c        |  0
 .../qat/qat_common/adf_pfvf_vf_proto.h        |  0
 .../{ => intel}/qat/qat_common/adf_sriov.c    |  0
 .../{ => intel}/qat/qat_common/adf_sysfs.c    |  0
 .../qat/qat_common/adf_transport.c            |  0
 .../qat/qat_common/adf_transport.h            |  0
 .../qat_common/adf_transport_access_macros.h  |  0
 .../qat/qat_common/adf_transport_debug.c      |  0
 .../qat/qat_common/adf_transport_internal.h   |  0
 .../{ => intel}/qat/qat_common/adf_vf_isr.c   |  0
 .../{ => intel}/qat/qat_common/icp_qat_fw.h   |  0
 .../qat/qat_common/icp_qat_fw_comp.h          |  0
 .../qat/qat_common/icp_qat_fw_init_admin.h    |  0
 .../qat/qat_common/icp_qat_fw_la.h            |  0
 .../qat/qat_common/icp_qat_fw_loader_handle.h |  0
 .../qat/qat_common/icp_qat_fw_pke.h           |  0
 .../{ => intel}/qat/qat_common/icp_qat_hal.h  |  0
 .../{ => intel}/qat/qat_common/icp_qat_hw.h   |  0
 .../qat/qat_common/icp_qat_hw_20_comp.h       |  0
 .../qat/qat_common/icp_qat_hw_20_comp_defs.h  |  0
 .../{ => intel}/qat/qat_common/icp_qat_uclo.h |  0
 .../{ => intel}/qat/qat_common/qat_algs.c     |  0
 .../qat/qat_common/qat_algs_send.c            |  0
 .../qat/qat_common/qat_algs_send.h            |  0
 .../qat/qat_common/qat_asym_algs.c            |  0
 .../{ => intel}/qat/qat_common/qat_bl.c       |  0
 .../{ => intel}/qat/qat_common/qat_bl.h       |  0
 .../qat/qat_common/qat_comp_algs.c            |  0
 .../{ => intel}/qat/qat_common/qat_comp_req.h |  0
 .../qat/qat_common/qat_compression.c          |  0
 .../qat/qat_common/qat_compression.h          |  0
 .../{ => intel}/qat/qat_common/qat_crypto.c   |  0
 .../{ => intel}/qat/qat_common/qat_crypto.h   |  0
 .../{ => intel}/qat/qat_common/qat_hal.c      |  0
 .../{ => intel}/qat/qat_common/qat_uclo.c     |  0
 .../{ => intel}/qat/qat_dh895xcc/Makefile     |  0
 .../qat/qat_dh895xcc/adf_dh895xcc_hw_data.c   |  0
 .../qat/qat_dh895xcc/adf_dh895xcc_hw_data.h   |  0
 .../{ => intel}/qat/qat_dh895xcc/adf_drv.c    |  0
 .../{ => intel}/qat/qat_dh895xccvf/Makefile   |  0
 .../qat_dh895xccvf/adf_dh895xccvf_hw_data.c   |  0
 .../qat_dh895xccvf/adf_dh895xccvf_hw_data.h   |  0
 .../{ => intel}/qat/qat_dh895xccvf/adf_drv.c  |  0
 123 files changed, 38 insertions(+), 36 deletions(-)
 create mode 100644 drivers/crypto/intel/ixp4xx/Kconfig
 create mode 100644 drivers/crypto/intel/ixp4xx/Makefile
 rename drivers/crypto/{ => intel/ixp4xx}/ixp4xx_crypto.c (100%)
 rename drivers/crypto/{ => intel}/keembay/Kconfig (100%)
 rename drivers/crypto/{ => intel}/keembay/Makefile (100%)
 rename drivers/crypto/{ => intel}/keembay/keembay-ocs-aes-core.c (100%)
 rename drivers/crypto/{ => intel}/keembay/keembay-ocs-ecc.c (100%)
 rename drivers/crypto/{ => intel}/keembay/keembay-ocs-hcu-core.c (100%)
 rename drivers/crypto/{ => intel}/keembay/ocs-aes.c (100%)
 rename drivers/crypto/{ => intel}/keembay/ocs-aes.h (100%)
 rename drivers/crypto/{ => intel}/keembay/ocs-hcu.c (100%)
 rename drivers/crypto/{ => intel}/keembay/ocs-hcu.h (100%)
 rename drivers/crypto/{ => intel}/qat/Kconfig (100%)
 rename drivers/crypto/{ => intel}/qat/Makefile (100%)
 rename drivers/crypto/{ => intel}/qat/qat_4xxx/Makefile (100%)
 rename drivers/crypto/{ => intel}/qat/qat_4xxx/adf_4xxx_hw_data.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_4xxx/adf_4xxx_hw_data.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_4xxx/adf_drv.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_c3xxx/Makefile (100%)
 rename drivers/crypto/{ => intel}/qat/qat_c3xxx/adf_c3xxx_hw_data.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_c3xxx/adf_c3xxx_hw_data.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_c3xxx/adf_drv.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_c3xxxvf/Makefile (100%)
 rename drivers/crypto/{ => intel}/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_c3xxxvf/adf_drv.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_c62x/Makefile (100%)
 rename drivers/crypto/{ => intel}/qat/qat_c62x/adf_c62x_hw_data.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_c62x/adf_c62x_hw_data.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_c62x/adf_drv.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_c62xvf/Makefile (100%)
 rename drivers/crypto/{ => intel}/qat/qat_c62xvf/adf_c62xvf_hw_data.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_c62xvf/adf_c62xvf_hw_data.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_c62xvf/adf_drv.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/Makefile (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_accel_devices.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_accel_engine.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_admin.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_aer.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_cfg.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_cfg.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_cfg_common.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_cfg_strings.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_cfg_user.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_common_drv.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_ctl_drv.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_dev_mgr.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_config.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_config.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_dc.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_dc.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_hw_data.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_hw_data.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_pfvf.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_pfvf.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_dc.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_dc.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_hw_data.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_hw_data.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_pfvf.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_pfvf.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_pm.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_pm.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_hw_arbiter.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_init.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_isr.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_msg.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_pf_msg.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_pf_msg.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_pf_proto.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_pf_proto.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_utils.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_utils.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_vf_msg.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_vf_msg.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_vf_proto.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_vf_proto.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_sriov.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_sysfs.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_transport.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_transport.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_transport_access_macros.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_transport_debug.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_transport_internal.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_vf_isr.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_fw.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_fw_comp.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_fw_init_admin.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_fw_la.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_fw_loader_handle.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_fw_pke.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_hal.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_hw.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_hw_20_comp.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_hw_20_comp_defs.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_uclo.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/qat_algs.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/qat_algs_send.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/qat_algs_send.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/qat_asym_algs.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/qat_bl.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/qat_bl.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/qat_comp_algs.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/qat_comp_req.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/qat_compression.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/qat_compression.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/qat_crypto.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/qat_crypto.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/qat_hal.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/qat_uclo.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_dh895xcc/Makefile (100%)
 rename drivers/crypto/{ => intel}/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_dh895xcc/adf_drv.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_dh895xccvf/Makefile (100%)
 rename drivers/crypto/{ => intel}/qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_dh895xccvf/adf_drv.c (100%)

-- 
2.34.1


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 1/3] crypto: keembay - Move driver to drivers/crypto/intel/keembay
  2023-03-28 15:39 [PATCH 0/3] crypto: Move Intel crypto drivers to drivers/crypto/intel Tom Zanussi
@ 2023-03-28 15:39 ` Tom Zanussi
  2023-03-31 15:08   ` Alessandrelli, Daniele
  2023-03-28 15:39 ` [PATCH 2/3] crypto: ixp4xx - Move driver to drivers/crypto/intel/ixp4xx Tom Zanussi
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 7+ messages in thread
From: Tom Zanussi @ 2023-03-28 15:39 UTC (permalink / raw)
  To: herbert, davem, fenghua.yu, vkoul
  Cc: dave.jiang, tony.luck, wajdi.k.feghali, james.guilford,
	kanchana.p.sridhar, giovanni.cabiddu, clabbe,
	daniele.alessandrelli, prabhjot.khurana, mgross, declan.murphy,
	linux-kernel, linux-crypto, dmaengine

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 <tom.zanussi@linux.intel.com>
---
 MAINTAINERS                                   | 26 +++++++++----------
 drivers/crypto/Kconfig                        |  1 -
 drivers/crypto/Makefile                       |  1 -
 drivers/crypto/intel/Kconfig                  |  1 +
 drivers/crypto/intel/Makefile                 |  1 +
 drivers/crypto/{ => intel}/keembay/Kconfig    |  0
 drivers/crypto/{ => intel}/keembay/Makefile   |  0
 .../keembay/keembay-ocs-aes-core.c            |  0
 .../{ => intel}/keembay/keembay-ocs-ecc.c     |  0
 .../keembay/keembay-ocs-hcu-core.c            |  0
 drivers/crypto/{ => intel}/keembay/ocs-aes.c  |  0
 drivers/crypto/{ => intel}/keembay/ocs-aes.h  |  0
 drivers/crypto/{ => intel}/keembay/ocs-hcu.c  |  0
 drivers/crypto/{ => intel}/keembay/ocs-hcu.h  |  0
 14 files changed, 15 insertions(+), 15 deletions(-)
 rename drivers/crypto/{ => intel}/keembay/Kconfig (100%)
 rename drivers/crypto/{ => intel}/keembay/Makefile (100%)
 rename drivers/crypto/{ => intel}/keembay/keembay-ocs-aes-core.c (100%)
 rename drivers/crypto/{ => intel}/keembay/keembay-ocs-ecc.c (100%)
 rename drivers/crypto/{ => intel}/keembay/keembay-ocs-hcu-core.c (100%)
 rename drivers/crypto/{ => intel}/keembay/ocs-aes.c (100%)
 rename drivers/crypto/{ => intel}/keembay/ocs-aes.h (100%)
 rename drivers/crypto/{ => intel}/keembay/ocs-hcu.c (100%)
 rename drivers/crypto/{ => 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 <daniele.alessandrelli@intel.com>
 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
 
 INTEL KEEM BAY OCS ECC CRYPTO DRIVER
 M:	Daniele Alessandrelli <daniele.alessandrelli@intel.com>
@@ -10434,20 +10434,20 @@ M:	Prabhjot Khurana <prabhjot.khurana@intel.com>
 M:	Mark Gross <mgross@linux.intel.com>
 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
 
 INTEL KEEM BAY OCS HCU CRYPTO DRIVER
 M:	Daniele Alessandrelli <daniele.alessandrelli@intel.com>
 M:	Declan Murphy <declan.murphy@intel.com>
 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
 
 INTEL THUNDER BAY EMMC PHY DRIVER
 M:	Nandhini Srikandan <nandhini.srikandan@intel.com>
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.
 
-source "drivers/crypto/keembay/Kconfig"
 source "drivers/crypto/aspeed/Kconfig"
 
 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) += axis/
 obj-y += xilinx/
 obj-y += hisilicon/
 obj-$(CONFIG_CRYPTO_DEV_AMLOGIC_GXL) += amlogic/
-obj-y += keembay/
 obj-y += 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
 
 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
 
 obj-$(CONFIG_CRYPTO_DEV_IAA_CRYPTO) += iaa/
+obj-y += 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/intel/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/keembay/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/keembay/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/keembay/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/keembay/ocs-hcu.h
similarity index 100%
rename from drivers/crypto/keembay/ocs-hcu.h
rename to drivers/crypto/intel/keembay/ocs-hcu.h
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 2/3] crypto: ixp4xx - Move driver to drivers/crypto/intel/ixp4xx
  2023-03-28 15:39 [PATCH 0/3] crypto: Move Intel crypto drivers to drivers/crypto/intel Tom Zanussi
  2023-03-28 15:39 ` [PATCH 1/3] crypto: keembay - Move driver to drivers/crypto/intel/keembay Tom Zanussi
@ 2023-03-28 15:39 ` Tom Zanussi
  2023-04-03 14:54   ` Corentin LABBE
  2023-03-28 15:39 ` [PATCH 3/3] crypto: qat - Move driver to drivers/crypto/intel/qat Tom Zanussi
  2023-04-06  8:50 ` [PATCH 0/3] crypto: Move Intel crypto drivers to drivers/crypto/intel Herbert Xu
  3 siblings, 1 reply; 7+ messages in thread
From: Tom Zanussi @ 2023-03-28 15:39 UTC (permalink / raw)
  To: herbert, davem, fenghua.yu, vkoul
  Cc: dave.jiang, tony.luck, wajdi.k.feghali, james.guilford,
	kanchana.p.sridhar, giovanni.cabiddu, clabbe,
	daniele.alessandrelli, prabhjot.khurana, mgross, declan.murphy,
	linux-kernel, linux-crypto, dmaengine

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 <tom.zanussi@linux.intel.com>
---
 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/{ => 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/{ => 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
 
@@ -10387,7 +10387,7 @@ INTEL IXP4XX CRYPTO SUPPORT
 M:	Corentin Labbe <clabbe@baylibre.com>
 L:	linux-crypto@vger.kernel.org
 S:	Maintained
-F:	drivers/crypto/ixp4xx_crypto.c
+F:	drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c
 
 INTEL ISHTP ECLITE DRIVER
 M:	Sumesh K Naduvalath <sumesh.k.naduvalath@intel.com>
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 ...
 
-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) += caam/
 obj-$(CONFIG_CRYPTO_DEV_GEODE) += geode-aes.o
 obj-$(CONFIG_CRYPTO_DEV_HIFN_795X) += hifn_795x.o
 obj-$(CONFIG_CRYPTO_DEV_IMGTEC_HASH) += img-hash.o
-obj-$(CONFIG_CRYPTO_DEV_IXP4XX) += ixp4xx_crypto.o
 obj-$(CONFIG_CRYPTO_DEV_MARVELL) += marvell/
 obj-$(CONFIG_CRYPTO_DEV_MXS_DCP) += mxs-dcp.o
 obj-$(CONFIG_CRYPTO_DEV_NIAGARA2) += 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 @@
 
 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 @@
 
 obj-$(CONFIG_CRYPTO_DEV_IAA_CRYPTO) += iaa/
 obj-y += keembay/
+obj-y += ixp4xx/
diff --git a/drivers/crypto/intel/ixp4xx/Kconfig b/drivers/crypto/intel/ixp4xx/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/ixp4xx/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) += ixp4xx_crypto.o
diff --git a/drivers/crypto/ixp4xx_crypto.c b/drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c
similarity index 100%
rename from drivers/crypto/ixp4xx_crypto.c
rename to drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 3/3] crypto: qat - Move driver to drivers/crypto/intel/qat
  2023-03-28 15:39 [PATCH 0/3] crypto: Move Intel crypto drivers to drivers/crypto/intel Tom Zanussi
  2023-03-28 15:39 ` [PATCH 1/3] crypto: keembay - Move driver to drivers/crypto/intel/keembay Tom Zanussi
  2023-03-28 15:39 ` [PATCH 2/3] crypto: ixp4xx - Move driver to drivers/crypto/intel/ixp4xx Tom Zanussi
@ 2023-03-28 15:39 ` Tom Zanussi
  2023-04-06  8:50 ` [PATCH 0/3] crypto: Move Intel crypto drivers to drivers/crypto/intel Herbert Xu
  3 siblings, 0 replies; 7+ messages in thread
From: Tom Zanussi @ 2023-03-28 15:39 UTC (permalink / raw)
  To: herbert, davem, fenghua.yu, vkoul
  Cc: dave.jiang, tony.luck, wajdi.k.feghali, james.guilford,
	kanchana.p.sridhar, giovanni.cabiddu, clabbe,
	daniele.alessandrelli, prabhjot.khurana, mgross, declan.murphy,
	linux-kernel, linux-crypto, dmaengine

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 <tom.zanussi@linux.intel.com>
---
 MAINTAINERS                                                     | 2 +-
 drivers/crypto/Kconfig                                          | 1 -
 drivers/crypto/Makefile                                         | 1 -
 drivers/crypto/intel/Kconfig                                    | 1 +
 drivers/crypto/intel/Makefile                                   | 1 +
 drivers/crypto/{ => intel}/qat/Kconfig                          | 0
 drivers/crypto/{ => intel}/qat/Makefile                         | 0
 drivers/crypto/{ => intel}/qat/qat_4xxx/Makefile                | 0
 drivers/crypto/{ => intel}/qat/qat_4xxx/adf_4xxx_hw_data.c      | 0
 drivers/crypto/{ => intel}/qat/qat_4xxx/adf_4xxx_hw_data.h      | 0
 drivers/crypto/{ => intel}/qat/qat_4xxx/adf_drv.c               | 0
 drivers/crypto/{ => intel}/qat/qat_c3xxx/Makefile               | 0
 drivers/crypto/{ => intel}/qat/qat_c3xxx/adf_c3xxx_hw_data.c    | 0
 drivers/crypto/{ => intel}/qat/qat_c3xxx/adf_c3xxx_hw_data.h    | 0
 drivers/crypto/{ => intel}/qat/qat_c3xxx/adf_drv.c              | 0
 drivers/crypto/{ => intel}/qat/qat_c3xxxvf/Makefile             | 0
 .../crypto/{ => intel}/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.c    | 0
 .../crypto/{ => intel}/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.h    | 0
 drivers/crypto/{ => intel}/qat/qat_c3xxxvf/adf_drv.c            | 0
 drivers/crypto/{ => intel}/qat/qat_c62x/Makefile                | 0
 drivers/crypto/{ => intel}/qat/qat_c62x/adf_c62x_hw_data.c      | 0
 drivers/crypto/{ => intel}/qat/qat_c62x/adf_c62x_hw_data.h      | 0
 drivers/crypto/{ => intel}/qat/qat_c62x/adf_drv.c               | 0
 drivers/crypto/{ => intel}/qat/qat_c62xvf/Makefile              | 0
 drivers/crypto/{ => intel}/qat/qat_c62xvf/adf_c62xvf_hw_data.c  | 0
 drivers/crypto/{ => intel}/qat/qat_c62xvf/adf_c62xvf_hw_data.h  | 0
 drivers/crypto/{ => intel}/qat/qat_c62xvf/adf_drv.c             | 0
 drivers/crypto/{ => intel}/qat/qat_common/Makefile              | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_accel_devices.h   | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_accel_engine.c    | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_admin.c           | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_aer.c             | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_cfg.c             | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_cfg.h             | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_cfg_common.h      | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_cfg_strings.h     | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_cfg_user.h        | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_common_drv.h      | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_ctl_drv.c         | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_dev_mgr.c         | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_config.c     | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_config.h     | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_dc.c         | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_dc.h         | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_hw_data.c    | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_hw_data.h    | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_pfvf.c       | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_pfvf.h       | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_dc.c         | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_dc.h         | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_hw_data.c    | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_hw_data.h    | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_pfvf.c       | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_pfvf.h       | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_pm.c         | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_pm.h         | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_hw_arbiter.c      | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_init.c            | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_isr.c             | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_msg.h        | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_pf_msg.c     | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_pf_msg.h     | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_pf_proto.c   | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_pf_proto.h   | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_utils.c      | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_utils.h      | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_vf_msg.c     | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_vf_msg.h     | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_vf_proto.c   | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_vf_proto.h   | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_sriov.c           | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_sysfs.c           | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_transport.c       | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_transport.h       | 0
 .../{ => intel}/qat/qat_common/adf_transport_access_macros.h    | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_transport_debug.c | 0
 .../crypto/{ => intel}/qat/qat_common/adf_transport_internal.h  | 0
 drivers/crypto/{ => intel}/qat/qat_common/adf_vf_isr.c          | 0
 drivers/crypto/{ => intel}/qat/qat_common/icp_qat_fw.h          | 0
 drivers/crypto/{ => intel}/qat/qat_common/icp_qat_fw_comp.h     | 0
 .../crypto/{ => intel}/qat/qat_common/icp_qat_fw_init_admin.h   | 0
 drivers/crypto/{ => intel}/qat/qat_common/icp_qat_fw_la.h       | 0
 .../{ => intel}/qat/qat_common/icp_qat_fw_loader_handle.h       | 0
 drivers/crypto/{ => intel}/qat/qat_common/icp_qat_fw_pke.h      | 0
 drivers/crypto/{ => intel}/qat/qat_common/icp_qat_hal.h         | 0
 drivers/crypto/{ => intel}/qat/qat_common/icp_qat_hw.h          | 0
 drivers/crypto/{ => intel}/qat/qat_common/icp_qat_hw_20_comp.h  | 0
 .../crypto/{ => intel}/qat/qat_common/icp_qat_hw_20_comp_defs.h | 0
 drivers/crypto/{ => intel}/qat/qat_common/icp_qat_uclo.h        | 0
 drivers/crypto/{ => intel}/qat/qat_common/qat_algs.c            | 0
 drivers/crypto/{ => intel}/qat/qat_common/qat_algs_send.c       | 0
 drivers/crypto/{ => intel}/qat/qat_common/qat_algs_send.h       | 0
 drivers/crypto/{ => intel}/qat/qat_common/qat_asym_algs.c       | 0
 drivers/crypto/{ => intel}/qat/qat_common/qat_bl.c              | 0
 drivers/crypto/{ => intel}/qat/qat_common/qat_bl.h              | 0
 drivers/crypto/{ => intel}/qat/qat_common/qat_comp_algs.c       | 0
 drivers/crypto/{ => intel}/qat/qat_common/qat_comp_req.h        | 0
 drivers/crypto/{ => intel}/qat/qat_common/qat_compression.c     | 0
 drivers/crypto/{ => intel}/qat/qat_common/qat_compression.h     | 0
 drivers/crypto/{ => intel}/qat/qat_common/qat_crypto.c          | 0
 drivers/crypto/{ => intel}/qat/qat_common/qat_crypto.h          | 0
 drivers/crypto/{ => intel}/qat/qat_common/qat_hal.c             | 0
 drivers/crypto/{ => intel}/qat/qat_common/qat_uclo.c            | 0
 drivers/crypto/{ => intel}/qat/qat_dh895xcc/Makefile            | 0
 .../crypto/{ => intel}/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c  | 0
 .../crypto/{ => intel}/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h  | 0
 drivers/crypto/{ => intel}/qat/qat_dh895xcc/adf_drv.c           | 0
 drivers/crypto/{ => intel}/qat/qat_dh895xccvf/Makefile          | 0
 .../{ => intel}/qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.c     | 0
 .../{ => intel}/qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.h     | 0
 drivers/crypto/{ => intel}/qat/qat_dh895xccvf/adf_drv.c         | 0
 111 files changed, 3 insertions(+), 3 deletions(-)
 rename drivers/crypto/{ => intel}/qat/Kconfig (100%)
 rename drivers/crypto/{ => intel}/qat/Makefile (100%)
 rename drivers/crypto/{ => intel}/qat/qat_4xxx/Makefile (100%)
 rename drivers/crypto/{ => intel}/qat/qat_4xxx/adf_4xxx_hw_data.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_4xxx/adf_4xxx_hw_data.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_4xxx/adf_drv.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_c3xxx/Makefile (100%)
 rename drivers/crypto/{ => intel}/qat/qat_c3xxx/adf_c3xxx_hw_data.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_c3xxx/adf_c3xxx_hw_data.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_c3xxx/adf_drv.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_c3xxxvf/Makefile (100%)
 rename drivers/crypto/{ => intel}/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_c3xxxvf/adf_drv.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_c62x/Makefile (100%)
 rename drivers/crypto/{ => intel}/qat/qat_c62x/adf_c62x_hw_data.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_c62x/adf_c62x_hw_data.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_c62x/adf_drv.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_c62xvf/Makefile (100%)
 rename drivers/crypto/{ => intel}/qat/qat_c62xvf/adf_c62xvf_hw_data.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_c62xvf/adf_c62xvf_hw_data.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_c62xvf/adf_drv.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/Makefile (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_accel_devices.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_accel_engine.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_admin.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_aer.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_cfg.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_cfg.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_cfg_common.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_cfg_strings.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_cfg_user.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_common_drv.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_ctl_drv.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_dev_mgr.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_config.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_config.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_dc.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_dc.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_hw_data.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_hw_data.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_pfvf.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_pfvf.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_dc.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_dc.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_hw_data.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_hw_data.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_pfvf.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_pfvf.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_pm.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_pm.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_hw_arbiter.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_init.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_isr.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_msg.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_pf_msg.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_pf_msg.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_pf_proto.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_pf_proto.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_utils.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_utils.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_vf_msg.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_vf_msg.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_vf_proto.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_vf_proto.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_sriov.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_sysfs.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_transport.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_transport.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_transport_access_macros.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_transport_debug.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_transport_internal.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/adf_vf_isr.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_fw.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_fw_comp.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_fw_init_admin.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_fw_la.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_fw_loader_handle.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_fw_pke.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_hal.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_hw.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_hw_20_comp.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_hw_20_comp_defs.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_uclo.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/qat_algs.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/qat_algs_send.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/qat_algs_send.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/qat_asym_algs.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/qat_bl.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/qat_bl.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/qat_comp_algs.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/qat_comp_req.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/qat_compression.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/qat_compression.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/qat_crypto.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/qat_crypto.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/qat_hal.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_common/qat_uclo.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_dh895xcc/Makefile (100%)
 rename drivers/crypto/{ => intel}/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h (100%)
 rename drivers/crypto/{ => intel}/qat/qat_dh895xcc/adf_drv.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_dh895xccvf/Makefile (100%)
 rename drivers/crypto/{ => intel}/qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.c (100%)
 rename drivers/crypto/{ => intel}/qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.h (100%)
 rename drivers/crypto/{ => 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 <giovanni.cabiddu@intel.com>
 L:	qat-linux@intel.com
 S:	Supported
-F:	drivers/crypto/qat/
+F:	drivers/crypto/intel/qat/
 
 QCOM AUDIO (ASoC) DRIVERS
 M:	Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
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.
 
-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) += omap-sham.o
 obj-$(CONFIG_CRYPTO_DEV_PADLOCK_AES) += padlock-aes.o
 obj-$(CONFIG_CRYPTO_DEV_PADLOCK_SHA) += padlock-sha.o
 obj-$(CONFIG_CRYPTO_DEV_PPC4XX) += amcc/
-obj-$(CONFIG_CRYPTO_DEV_QAT) += qat/
 obj-$(CONFIG_CRYPTO_DEV_QCE) += qce/
 obj-$(CONFIG_CRYPTO_DEV_QCOM_RNG) += qcom-rng.o
 obj-$(CONFIG_CRYPTO_DEV_ROCKCHIP) += 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) += iaa/
 obj-y += keembay/
 obj-y += ixp4xx/
+obj-$(CONFIG_CRYPTO_DEV_QAT) += 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/qat/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/crypto/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/crypto/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/qat/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/qat/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/crypto/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/crypto/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/intel/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/qat/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/crypto/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/crypto/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/qat/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/crypto/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/crypto/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/crypto/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/crypto/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/intel/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/crypto/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/crypto/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/crypto/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/intel/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/intel/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/crypto/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/crypto/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/intel/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/intel/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/crypto/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/crypto/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/intel/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/intel/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/crypto/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/crypto/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/intel/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/intel/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/crypto/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/intel/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/crypto/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/crypto/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/crypto/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/crypto/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/crypto/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/crypto/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/crypto/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/crypto/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/crypto/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/crypto/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/intel/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/intel/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/drivers/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/intel/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/intel/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/crypto/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/drivers/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/drivers/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/crypto/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/intel/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/intel/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/crypto/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/drivers/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/intel/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/crypto/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/crypto/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/intel/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/intel/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/intel/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/intel/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/drivers/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/drivers/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/intel/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/intel/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/drivers/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/drivers/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/intel/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
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH 1/3] crypto: keembay - Move driver to drivers/crypto/intel/keembay
  2023-03-28 15:39 ` [PATCH 1/3] crypto: keembay - Move driver to drivers/crypto/intel/keembay Tom Zanussi
@ 2023-03-31 15:08   ` Alessandrelli, Daniele
  0 siblings, 0 replies; 7+ messages in thread
From: Alessandrelli, Daniele @ 2023-03-31 15:08 UTC (permalink / raw)
  To: Yu, Fenghua, vkoul, tom.zanussi, herbert, davem
  Cc: Guilford, James, Feghali, Wajdi K, Khurana, Prabhjot, Jiang,
	Dave, linux-crypto, mgross, linux-kernel, Luck, Tony, Sridhar,
	Kanchana P, Cabiddu, Giovanni, clabbe, Murphy, Declan, dmaengine

On Tue, 2023-03-28 at 10:39 -0500, Tom Zanussi wrote:
> 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 <tom.zanussi@linux.intel.com>
> ---
>  MAINTAINERS                                   | 26 +++++++++--------
> --
>  drivers/crypto/Kconfig                        |  1 -
>  drivers/crypto/Makefile                       |  1 -
>  drivers/crypto/intel/Kconfig                  |  1 +
>  drivers/crypto/intel/Makefile                 |  1 +
>  drivers/crypto/{ => intel}/keembay/Kconfig    |  0
>  drivers/crypto/{ => intel}/keembay/Makefile   |  0
>  .../keembay/keembay-ocs-aes-core.c            |  0
>  .../{ => intel}/keembay/keembay-ocs-ecc.c     |  0
>  .../keembay/keembay-ocs-hcu-core.c            |  0
>  drivers/crypto/{ => intel}/keembay/ocs-aes.c  |  0
>  drivers/crypto/{ => intel}/keembay/ocs-aes.h  |  0
>  drivers/crypto/{ => intel}/keembay/ocs-hcu.c  |  0
>  drivers/crypto/{ => intel}/keembay/ocs-hcu.h  |  0
>  14 files changed, 15 insertions(+), 15 deletions(-)
>  rename drivers/crypto/{ => intel}/keembay/Kconfig (100%)
>  rename drivers/crypto/{ => intel}/keembay/Makefile (100%)
>  rename drivers/crypto/{ => intel}/keembay/keembay-ocs-aes-core.c
> (100%)
>  rename drivers/crypto/{ => intel}/keembay/keembay-ocs-ecc.c (100%)
>  rename drivers/crypto/{ => intel}/keembay/keembay-ocs-hcu-core.c
> (100%)
>  rename drivers/crypto/{ => intel}/keembay/ocs-aes.c (100%)
>  rename drivers/crypto/{ => intel}/keembay/ocs-aes.h (100%)
>  rename drivers/crypto/{ => intel}/keembay/ocs-hcu.c (100%)
>  rename drivers/crypto/{ => intel}/keembay/ocs-hcu.h (100%)
> 

Grouping the Intel crypto drivers together makes sense to me.

Acked-by: Daniele Alessandrelli <daniele.alessandrelli@intel.com>

> 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 <daniele.alessandrelli@intel.com>
>  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
>  
>  INTEL KEEM BAY OCS ECC CRYPTO DRIVER
>  M:     Daniele Alessandrelli <daniele.alessandrelli@intel.com>
> @@ -10434,20 +10434,20 @@ M:    Prabhjot Khurana
> <prabhjot.khurana@intel.com>
>  M:     Mark Gross <mgross@linux.intel.com>
>  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
>  
>  INTEL KEEM BAY OCS HCU CRYPTO DRIVER
>  M:     Daniele Alessandrelli <daniele.alessandrelli@intel.com>
>  M:     Declan Murphy <declan.murphy@intel.com>
>  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
>  
>  INTEL THUNDER BAY EMMC PHY DRIVER
>  M:     Nandhini Srikandan <nandhini.srikandan@intel.com>
> 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.
>  
> -source "drivers/crypto/keembay/Kconfig"
>  source "drivers/crypto/aspeed/Kconfig"
>  
>  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) += axis/
>  obj-y += xilinx/
>  obj-y += hisilicon/
>  obj-$(CONFIG_CRYPTO_DEV_AMLOGIC_GXL) += amlogic/
> -obj-y += keembay/
>  obj-y += 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
>  
>  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
>  
>  obj-$(CONFIG_CRYPTO_DEV_IAA_CRYPTO) += iaa/
> +obj-y += 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/intel/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/keembay/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/keembay/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/keembay/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/keembay/ocs-hcu.h
> similarity index 100%
> rename from drivers/crypto/keembay/ocs-hcu.h
> rename to drivers/crypto/intel/keembay/ocs-hcu.h


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 2/3] crypto: ixp4xx - Move driver to drivers/crypto/intel/ixp4xx
  2023-03-28 15:39 ` [PATCH 2/3] crypto: ixp4xx - Move driver to drivers/crypto/intel/ixp4xx Tom Zanussi
@ 2023-04-03 14:54   ` Corentin LABBE
  0 siblings, 0 replies; 7+ messages in thread
From: Corentin LABBE @ 2023-04-03 14:54 UTC (permalink / raw)
  To: Tom Zanussi
  Cc: herbert, davem, fenghua.yu, vkoul, dave.jiang, tony.luck,
	wajdi.k.feghali, james.guilford, kanchana.p.sridhar,
	giovanni.cabiddu, daniele.alessandrelli, prabhjot.khurana,
	mgross, declan.murphy, linux-kernel, linux-crypto, dmaengine

Le Tue, Mar 28, 2023 at 10:39:50AM -0500, Tom Zanussi a écrit :
> 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 <tom.zanussi@linux.intel.com>

Acked-by: Corentin LABBE <clabbe@baylibre.com>

Thanks

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 0/3] crypto: Move Intel crypto drivers to drivers/crypto/intel
  2023-03-28 15:39 [PATCH 0/3] crypto: Move Intel crypto drivers to drivers/crypto/intel Tom Zanussi
                   ` (2 preceding siblings ...)
  2023-03-28 15:39 ` [PATCH 3/3] crypto: qat - Move driver to drivers/crypto/intel/qat Tom Zanussi
@ 2023-04-06  8:50 ` Herbert Xu
  3 siblings, 0 replies; 7+ messages in thread
From: Herbert Xu @ 2023-04-06  8:50 UTC (permalink / raw)
  To: Tom Zanussi
  Cc: davem, fenghua.yu, vkoul, dave.jiang, tony.luck, wajdi.k.feghali,
	james.guilford, kanchana.p.sridhar, giovanni.cabiddu, clabbe,
	daniele.alessandrelli, prabhjot.khurana, mgross, declan.murphy,
	linux-kernel, linux-crypto, dmaengine

On Tue, Mar 28, 2023 at 10:39:48AM -0500, Tom Zanussi wrote:
> As part of the series adding the IAA crypto driver ([PATCH v2 00/15]
> crypto: Add Intel Analytics Accelerator (IAA) crypto compression
> driver) [1] to drivers/crypto, Herbert Xu suggested moving the other
> Intel drivers there too.
> 
> [1] https://lore.kernel.org/lkml/20230328153535.126223-1-tom.zanussi@linux.intel.com/T/#m6d6bff882778a3091317c5295f82373a4ad09e39
> 
> Tom Zanussi (3):
>   crypto: keembay - Move driver to drivers/crypto/intel/keembay
>   crypto: ixp4xx - Move driver to drivers/crypto/intel/ixp4xx
>   crypto: qat - Move driver to drivers/crypto/intel/qat
> 
>  MAINTAINERS                                   | 32 +++++++++----------
>  drivers/crypto/Kconfig                        | 17 ----------
>  drivers/crypto/Makefile                       |  3 --
>  drivers/crypto/intel/Kconfig                  |  3 ++
>  drivers/crypto/intel/Makefile                 |  3 ++
>  drivers/crypto/intel/ixp4xx/Kconfig           | 14 ++++++++
>  drivers/crypto/intel/ixp4xx/Makefile          |  2 ++
>  .../crypto/{ => intel/ixp4xx}/ixp4xx_crypto.c |  0
>  drivers/crypto/{ => intel}/keembay/Kconfig    |  0
>  drivers/crypto/{ => intel}/keembay/Makefile   |  0
>  .../keembay/keembay-ocs-aes-core.c            |  0
>  .../{ => intel}/keembay/keembay-ocs-ecc.c     |  0
>  .../keembay/keembay-ocs-hcu-core.c            |  0
>  drivers/crypto/{ => intel}/keembay/ocs-aes.c  |  0
>  drivers/crypto/{ => intel}/keembay/ocs-aes.h  |  0
>  drivers/crypto/{ => intel}/keembay/ocs-hcu.c  |  0
>  drivers/crypto/{ => intel}/keembay/ocs-hcu.h  |  0
>  drivers/crypto/{ => intel}/qat/Kconfig        |  0
>  drivers/crypto/{ => intel}/qat/Makefile       |  0
>  .../crypto/{ => intel}/qat/qat_4xxx/Makefile  |  0
>  .../qat/qat_4xxx/adf_4xxx_hw_data.c           |  0
>  .../qat/qat_4xxx/adf_4xxx_hw_data.h           |  0
>  .../crypto/{ => intel}/qat/qat_4xxx/adf_drv.c |  0
>  .../crypto/{ => intel}/qat/qat_c3xxx/Makefile |  0
>  .../qat/qat_c3xxx/adf_c3xxx_hw_data.c         |  0
>  .../qat/qat_c3xxx/adf_c3xxx_hw_data.h         |  0
>  .../{ => intel}/qat/qat_c3xxx/adf_drv.c       |  0
>  .../{ => intel}/qat/qat_c3xxxvf/Makefile      |  0
>  .../qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.c     |  0
>  .../qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.h     |  0
>  .../{ => intel}/qat/qat_c3xxxvf/adf_drv.c     |  0
>  .../crypto/{ => intel}/qat/qat_c62x/Makefile  |  0
>  .../qat/qat_c62x/adf_c62x_hw_data.c           |  0
>  .../qat/qat_c62x/adf_c62x_hw_data.h           |  0
>  .../crypto/{ => intel}/qat/qat_c62x/adf_drv.c |  0
>  .../{ => intel}/qat/qat_c62xvf/Makefile       |  0
>  .../qat/qat_c62xvf/adf_c62xvf_hw_data.c       |  0
>  .../qat/qat_c62xvf/adf_c62xvf_hw_data.h       |  0
>  .../{ => intel}/qat/qat_c62xvf/adf_drv.c      |  0
>  .../{ => intel}/qat/qat_common/Makefile       |  0
>  .../qat/qat_common/adf_accel_devices.h        |  0
>  .../qat/qat_common/adf_accel_engine.c         |  0
>  .../{ => intel}/qat/qat_common/adf_admin.c    |  0
>  .../{ => intel}/qat/qat_common/adf_aer.c      |  0
>  .../{ => intel}/qat/qat_common/adf_cfg.c      |  0
>  .../{ => intel}/qat/qat_common/adf_cfg.h      |  0
>  .../qat/qat_common/adf_cfg_common.h           |  0
>  .../qat/qat_common/adf_cfg_strings.h          |  0
>  .../{ => intel}/qat/qat_common/adf_cfg_user.h |  0
>  .../qat/qat_common/adf_common_drv.h           |  0
>  .../{ => intel}/qat/qat_common/adf_ctl_drv.c  |  0
>  .../{ => intel}/qat/qat_common/adf_dev_mgr.c  |  0
>  .../qat/qat_common/adf_gen2_config.c          |  0
>  .../qat/qat_common/adf_gen2_config.h          |  0
>  .../{ => intel}/qat/qat_common/adf_gen2_dc.c  |  0
>  .../{ => intel}/qat/qat_common/adf_gen2_dc.h  |  0
>  .../qat/qat_common/adf_gen2_hw_data.c         |  0
>  .../qat/qat_common/adf_gen2_hw_data.h         |  0
>  .../qat/qat_common/adf_gen2_pfvf.c            |  0
>  .../qat/qat_common/adf_gen2_pfvf.h            |  0
>  .../{ => intel}/qat/qat_common/adf_gen4_dc.c  |  0
>  .../{ => intel}/qat/qat_common/adf_gen4_dc.h  |  0
>  .../qat/qat_common/adf_gen4_hw_data.c         |  0
>  .../qat/qat_common/adf_gen4_hw_data.h         |  0
>  .../qat/qat_common/adf_gen4_pfvf.c            |  0
>  .../qat/qat_common/adf_gen4_pfvf.h            |  0
>  .../{ => intel}/qat/qat_common/adf_gen4_pm.c  |  0
>  .../{ => intel}/qat/qat_common/adf_gen4_pm.h  |  0
>  .../qat/qat_common/adf_hw_arbiter.c           |  0
>  .../{ => intel}/qat/qat_common/adf_init.c     |  0
>  .../{ => intel}/qat/qat_common/adf_isr.c      |  0
>  .../{ => intel}/qat/qat_common/adf_pfvf_msg.h |  0
>  .../qat/qat_common/adf_pfvf_pf_msg.c          |  0
>  .../qat/qat_common/adf_pfvf_pf_msg.h          |  0
>  .../qat/qat_common/adf_pfvf_pf_proto.c        |  0
>  .../qat/qat_common/adf_pfvf_pf_proto.h        |  0
>  .../qat/qat_common/adf_pfvf_utils.c           |  0
>  .../qat/qat_common/adf_pfvf_utils.h           |  0
>  .../qat/qat_common/adf_pfvf_vf_msg.c          |  0
>  .../qat/qat_common/adf_pfvf_vf_msg.h          |  0
>  .../qat/qat_common/adf_pfvf_vf_proto.c        |  0
>  .../qat/qat_common/adf_pfvf_vf_proto.h        |  0
>  .../{ => intel}/qat/qat_common/adf_sriov.c    |  0
>  .../{ => intel}/qat/qat_common/adf_sysfs.c    |  0
>  .../qat/qat_common/adf_transport.c            |  0
>  .../qat/qat_common/adf_transport.h            |  0
>  .../qat_common/adf_transport_access_macros.h  |  0
>  .../qat/qat_common/adf_transport_debug.c      |  0
>  .../qat/qat_common/adf_transport_internal.h   |  0
>  .../{ => intel}/qat/qat_common/adf_vf_isr.c   |  0
>  .../{ => intel}/qat/qat_common/icp_qat_fw.h   |  0
>  .../qat/qat_common/icp_qat_fw_comp.h          |  0
>  .../qat/qat_common/icp_qat_fw_init_admin.h    |  0
>  .../qat/qat_common/icp_qat_fw_la.h            |  0
>  .../qat/qat_common/icp_qat_fw_loader_handle.h |  0
>  .../qat/qat_common/icp_qat_fw_pke.h           |  0
>  .../{ => intel}/qat/qat_common/icp_qat_hal.h  |  0
>  .../{ => intel}/qat/qat_common/icp_qat_hw.h   |  0
>  .../qat/qat_common/icp_qat_hw_20_comp.h       |  0
>  .../qat/qat_common/icp_qat_hw_20_comp_defs.h  |  0
>  .../{ => intel}/qat/qat_common/icp_qat_uclo.h |  0
>  .../{ => intel}/qat/qat_common/qat_algs.c     |  0
>  .../qat/qat_common/qat_algs_send.c            |  0
>  .../qat/qat_common/qat_algs_send.h            |  0
>  .../qat/qat_common/qat_asym_algs.c            |  0
>  .../{ => intel}/qat/qat_common/qat_bl.c       |  0
>  .../{ => intel}/qat/qat_common/qat_bl.h       |  0
>  .../qat/qat_common/qat_comp_algs.c            |  0
>  .../{ => intel}/qat/qat_common/qat_comp_req.h |  0
>  .../qat/qat_common/qat_compression.c          |  0
>  .../qat/qat_common/qat_compression.h          |  0
>  .../{ => intel}/qat/qat_common/qat_crypto.c   |  0
>  .../{ => intel}/qat/qat_common/qat_crypto.h   |  0
>  .../{ => intel}/qat/qat_common/qat_hal.c      |  0
>  .../{ => intel}/qat/qat_common/qat_uclo.c     |  0
>  .../{ => intel}/qat/qat_dh895xcc/Makefile     |  0
>  .../qat/qat_dh895xcc/adf_dh895xcc_hw_data.c   |  0
>  .../qat/qat_dh895xcc/adf_dh895xcc_hw_data.h   |  0
>  .../{ => intel}/qat/qat_dh895xcc/adf_drv.c    |  0
>  .../{ => intel}/qat/qat_dh895xccvf/Makefile   |  0
>  .../qat_dh895xccvf/adf_dh895xccvf_hw_data.c   |  0
>  .../qat_dh895xccvf/adf_dh895xccvf_hw_data.h   |  0
>  .../{ => intel}/qat/qat_dh895xccvf/adf_drv.c  |  0
>  123 files changed, 38 insertions(+), 36 deletions(-)
>  create mode 100644 drivers/crypto/intel/ixp4xx/Kconfig
>  create mode 100644 drivers/crypto/intel/ixp4xx/Makefile
>  rename drivers/crypto/{ => intel/ixp4xx}/ixp4xx_crypto.c (100%)
>  rename drivers/crypto/{ => intel}/keembay/Kconfig (100%)
>  rename drivers/crypto/{ => intel}/keembay/Makefile (100%)
>  rename drivers/crypto/{ => intel}/keembay/keembay-ocs-aes-core.c (100%)
>  rename drivers/crypto/{ => intel}/keembay/keembay-ocs-ecc.c (100%)
>  rename drivers/crypto/{ => intel}/keembay/keembay-ocs-hcu-core.c (100%)
>  rename drivers/crypto/{ => intel}/keembay/ocs-aes.c (100%)
>  rename drivers/crypto/{ => intel}/keembay/ocs-aes.h (100%)
>  rename drivers/crypto/{ => intel}/keembay/ocs-hcu.c (100%)
>  rename drivers/crypto/{ => intel}/keembay/ocs-hcu.h (100%)
>  rename drivers/crypto/{ => intel}/qat/Kconfig (100%)
>  rename drivers/crypto/{ => intel}/qat/Makefile (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_4xxx/Makefile (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_4xxx/adf_4xxx_hw_data.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_4xxx/adf_4xxx_hw_data.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_4xxx/adf_drv.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_c3xxx/Makefile (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_c3xxx/adf_c3xxx_hw_data.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_c3xxx/adf_c3xxx_hw_data.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_c3xxx/adf_drv.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_c3xxxvf/Makefile (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_c3xxxvf/adf_drv.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_c62x/Makefile (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_c62x/adf_c62x_hw_data.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_c62x/adf_c62x_hw_data.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_c62x/adf_drv.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_c62xvf/Makefile (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_c62xvf/adf_c62xvf_hw_data.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_c62xvf/adf_c62xvf_hw_data.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_c62xvf/adf_drv.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/Makefile (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_accel_devices.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_accel_engine.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_admin.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_aer.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_cfg.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_cfg.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_cfg_common.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_cfg_strings.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_cfg_user.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_common_drv.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_ctl_drv.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_dev_mgr.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_config.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_config.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_dc.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_dc.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_hw_data.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_hw_data.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_pfvf.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_pfvf.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_dc.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_dc.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_hw_data.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_hw_data.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_pfvf.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_pfvf.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_pm.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_pm.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_hw_arbiter.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_init.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_isr.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_msg.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_pf_msg.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_pf_msg.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_pf_proto.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_pf_proto.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_utils.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_utils.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_vf_msg.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_vf_msg.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_vf_proto.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_vf_proto.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_sriov.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_sysfs.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_transport.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_transport.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_transport_access_macros.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_transport_debug.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_transport_internal.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/adf_vf_isr.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_fw.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_fw_comp.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_fw_init_admin.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_fw_la.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_fw_loader_handle.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_fw_pke.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_hal.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_hw.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_hw_20_comp.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_hw_20_comp_defs.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_uclo.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/qat_algs.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/qat_algs_send.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/qat_algs_send.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/qat_asym_algs.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/qat_bl.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/qat_bl.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/qat_comp_algs.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/qat_comp_req.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/qat_compression.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/qat_compression.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/qat_crypto.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/qat_crypto.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/qat_hal.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_common/qat_uclo.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_dh895xcc/Makefile (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_dh895xcc/adf_drv.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_dh895xccvf/Makefile (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.c (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.h (100%)
>  rename drivers/crypto/{ => intel}/qat/qat_dh895xccvf/adf_drv.c (100%)
> 
> -- 
> 2.34.1

All applied.  Thanks.
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2023-04-06  8:51 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-28 15:39 [PATCH 0/3] crypto: Move Intel crypto drivers to drivers/crypto/intel Tom Zanussi
2023-03-28 15:39 ` [PATCH 1/3] crypto: keembay - Move driver to drivers/crypto/intel/keembay Tom Zanussi
2023-03-31 15:08   ` Alessandrelli, Daniele
2023-03-28 15:39 ` [PATCH 2/3] crypto: ixp4xx - Move driver to drivers/crypto/intel/ixp4xx Tom Zanussi
2023-04-03 14:54   ` Corentin LABBE
2023-03-28 15:39 ` [PATCH 3/3] crypto: qat - Move driver to drivers/crypto/intel/qat Tom Zanussi
2023-04-06  8:50 ` [PATCH 0/3] crypto: Move Intel crypto drivers to drivers/crypto/intel Herbert Xu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).