hwrng: xilinx - Move xilinx-rng into drivers/char/hw_random/

Since this file just implements a hwrng driver, move it into
drivers/char/hw_random/.  Rename the kconfig option accordingly as well.

Signed-off-by: Eric Biggers <ebiggers@kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/MAINTAINERS b/MAINTAINERS
index afad0783395d7aa3c5904dfe6a956cc51e48b6e1..3036d80710af07ffa5eda25ef0c43250f94301f2 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -29211,7 +29211,7 @@ XILINX TRNG DRIVER
 M:     Mounika Botcha <mounika.botcha@amd.com>
 M:     Harsh Jain <h.jain@amd.com>
 S:     Maintained
-F:     drivers/crypto/xilinx/xilinx-trng.c
+F:     drivers/char/hw_random/xilinx-trng.c
 
 XILINX UARTLITE SERIAL DRIVER
 M:     Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index cbb0ffe0a9d3ad7490e33044bc82ac3176fcfc65..6745189b1fbc29a219cfe0703e648483e0f845d9 100644 (file)
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -551,6 +551,7 @@ CONFIG_IPMI_SI=m
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_VIRTIO=y
 CONFIG_HW_RANDOM_HISI_TRNG=m
+CONFIG_HW_RANDOM_XILINX=m
 CONFIG_TCG_TPM=y
 CONFIG_TCG_TIS=m
 CONFIG_TCG_TIS_SPI=m
@@ -1956,7 +1957,6 @@ CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=m
 CONFIG_CRYPTO_DEV_QCE=m
 CONFIG_CRYPTO_DEV_QCOM_RNG=m
 CONFIG_CRYPTO_DEV_TEGRA=m
-CONFIG_CRYPTO_DEV_XILINX_TRNG=m
 CONFIG_CRYPTO_DEV_ZYNQMP_AES=m
 CONFIG_CRYPTO_DEV_ZYNQMP_SHA3=m
 CONFIG_CRYPTO_DEV_CCREE=m

diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig
index 3ea74f208f069d3c456c95ba043fbdecace9a44c..a5bcef4a54eea96ba160f04f882118c715392cf8 100644 (file)
--- a/drivers/char/hw_random/Kconfig
+++ b/drivers/char/hw_random/Kconfig
@@ -625,6 +625,17 @@ config HW_RANDOM_ROCKCHIP
 
          If unsure, say Y.
 
+config HW_RANDOM_XILINX
+       tristate "Support for Xilinx True Random Generator"
+       depends on ZYNQMP_FIRMWARE || COMPILE_TEST
+       select CRYPTO_LIB_SHA512
+       help
+         Xilinx Versal SoC driver provides kernel-side support for True Random Number
+         Generator and Pseudo random Number in CTR_DRBG mode as defined in NIST SP800-90A.
+
+         To compile this driver as a module, choose M here: the module
+         will be called xilinx-trng.
+
 endif # HW_RANDOM
 
 config UML_RANDOM

diff --git a/drivers/char/hw_random/Makefile b/drivers/char/hw_random/Makefile
index 3e655d6e116b8e5db882fe40b853a5e7d3762b28..95b5adb49560d9a501c05bc9d7f4885585ba5206 100644 (file)
--- a/drivers/char/hw_random/Makefile
+++ b/drivers/char/hw_random/Makefile
@@ -53,3 +53,4 @@ obj-$(CONFIG_HW_RANDOM_CN10K) += cn10k-rng.o
 obj-$(CONFIG_HW_RANDOM_POLARFIRE_SOC) += mpfs-rng.o
 obj-$(CONFIG_HW_RANDOM_ROCKCHIP) += rockchip-rng.o
 obj-$(CONFIG_HW_RANDOM_JH7110) += jh7110-trng.o
+obj-$(CONFIG_HW_RANDOM_XILINX) += xilinx-trng.o

diff --git a/drivers/crypto/xilinx/xilinx-trng.c b/drivers/char/hw_random/xilinx-trng.c
similarity index 100%
rename from drivers/crypto/xilinx/xilinx-trng.c
rename to drivers/char/hw_random/xilinx-trng.c

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index b94ba934e2d8448b1d4eb64b523ad56ff1f90163..216a00bad5d706402dbf61fe3979e16dfbdccd8a 100644 (file)
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -699,18 +699,6 @@ config CRYPTO_DEV_TEGRA
          Select this to enable Tegra Security Engine which accelerates various
          AES encryption/decryption and HASH algorithms.
 
-config CRYPTO_DEV_XILINX_TRNG
-       tristate "Support for Xilinx True Random Generator"
-       depends on ZYNQMP_FIRMWARE || COMPILE_TEST
-       select CRYPTO_LIB_SHA512
-       select HW_RANDOM
-       help
-         Xilinx Versal SoC driver provides kernel-side support for True Random Number
-         Generator and Pseudo random Number in CTR_DRBG mode as defined in NIST SP800-90A.
-
-         To compile this driver as a module, choose M here: the module
-         will be called xilinx-trng.
-
 config CRYPTO_DEV_ZYNQMP_AES
        tristate "Support for Xilinx ZynqMP AES hw accelerator"
        depends on ZYNQMP_FIRMWARE || COMPILE_TEST

diff --git a/drivers/crypto/xilinx/Makefile b/drivers/crypto/xilinx/Makefile
index 9b51636ef75e510eb191dd358eb8dd821e86eeda..730feff5b5f2f428edfc2d7015594bc5aca09f1a 100644 (file)
--- a/drivers/crypto/xilinx/Makefile
+++ b/drivers/crypto/xilinx/Makefile
@@ -1,4 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0-only
-obj-$(CONFIG_CRYPTO_DEV_XILINX_TRNG) += xilinx-trng.o
 obj-$(CONFIG_CRYPTO_DEV_ZYNQMP_AES) += zynqmp-aes-gcm.o
 obj-$(CONFIG_CRYPTO_DEV_ZYNQMP_SHA3) += zynqmp-sha.o