diff mbox series

[1/3] crypto: keembay - Move driver to drivers/crypto/intel/keembay

Message ID 20230328153951.126564-2-tom.zanussi@linux.intel.com
State New
Headers
Series crypto: Move Intel crypto drivers to drivers/crypto/intel |

Commit Message

Tom Zanussi March 28, 2023, 3:39 p.m. UTC 
  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%)

Comments

Alessandrelli, Daniele March 31, 2023, 3:08 p.m. UTC | #1 
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
diff mbox series

Patch

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