diff mbox series

[2/3] crypto: ixp4xx - Move driver to drivers/crypto/intel/ixp4xx

Message ID 20230328153951.126564-3-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.

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%)

Comments

Corentin LABBE April 3, 2023, 2:54 p.m. UTC | #1 
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
diff mbox series

Patch

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