diff --git a/drivers/crypto/rockchip/Kconfig b/drivers/crypto/rockchip/Kconfig index 22df0d84381f..c900e6cd5cef 100644 --- a/drivers/crypto/rockchip/Kconfig +++ b/drivers/crypto/rockchip/Kconfig @@ -16,6 +16,11 @@ config CRYPTO_DEV_ROCKCHIP_V3 depends on CPU_RV1106 || CPU_RK3506 || CPU_RK3528 || CPU_RK3562 || CPU_RK3576 default y +config CRYPTO_DEV_ROCKCHIP_CRYPTO + tristate + depends on CRYPTO_DEV_ROCKCHIP_V1 || CRYPTO_DEV_ROCKCHIP_V2 || CRYPTO_DEV_ROCKCHIP_V3 + default y + endif config CRYPTO_DEV_ROCKCHIP_DEV diff --git a/drivers/crypto/rockchip/Makefile b/drivers/crypto/rockchip/Makefile index d629bbb38948..6585fa3e7d4e 100644 --- a/drivers/crypto/rockchip/Makefile +++ b/drivers/crypto/rockchip/Makefile @@ -1,40 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-$(CONFIG_CRYPTO_DEV_ROCKCHIP) += rk_crypto.o -rk_crypto-objs := rk_crypto_core.o \ - rk_crypto_utils.o \ - rk_crypto_ahash_utils.o \ - rk_crypto_skcipher_utils.o \ - procfs.o -rk_crypto-$(CONFIG_CRYPTO_DEV_ROCKCHIP_V1) += \ - rk_crypto_v1.o \ - rk_crypto_v1_ahash.o \ - rk_crypto_v1_skcipher.o - -$(obj)/rk_sm2signature.asn1.o: $(obj)/rk_sm2signature.asn1.c $(obj)/rk_sm2signature.asn1.h -$(obj)/rk_ecdsasignature.asn1.o: $(obj)/rk_ecdsasignature.asn1.c $(obj)/rk_ecdsasignature.asn1.h -$(obj)/rk_crypto_v2_akcipher.o: $(obj)/rk_sm2signature.asn1.h $(obj)/rk_ecdsasignature.asn1.h - -rk_crypto-$(CONFIG_CRYPTO_DEV_ROCKCHIP_V2) += \ - rk_crypto_v2.o \ - rk_crypto_v2_ahash.o \ - rk_crypto_v2_skcipher.o \ - rk_crypto_v2_akcipher.o \ - rk_crypto_v2_pka.o \ - rk_crypto_ecc.o \ - rk_sm2signature.asn1.o \ - rk_ecdsasignature.asn1.o \ - rk_crypto_bignum.o - -rk_crypto-$(CONFIG_CRYPTO_DEV_ROCKCHIP_V3) += \ - rk_crypto_v3.o \ - rk_crypto_v3_ahash.o \ - rk_crypto_v3_skcipher.o \ - rk_crypto_v2_akcipher.o \ - rk_crypto_v2_pka.o \ - rk_crypto_ecc.o \ - rk_sm2signature.asn1.o \ - rk_ecdsasignature.asn1.o \ - rk_crypto_bignum.o +obj-$(CONFIG_CRYPTO_DEV_ROCKCHIP_CRYPTO) += rkcrypto/ obj-$(CONFIG_CRYPTO_DEV_ROCKCHIP_DEV) += cryptodev_linux/ diff --git a/drivers/crypto/rockchip/rkcrypto/Makefile b/drivers/crypto/rockchip/rkcrypto/Makefile new file mode 100644 index 000000000000..56e1ccc87921 --- /dev/null +++ b/drivers/crypto/rockchip/rkcrypto/Makefile @@ -0,0 +1,39 @@ +# SPDX-License-Identifier: GPL-2.0-only + +obj-$(CONFIG_CRYPTO_DEV_ROCKCHIP) += rk_crypto.o +rk_crypto-objs := rk_crypto_core.o \ + rk_crypto_utils.o \ + rk_crypto_ahash_utils.o \ + rk_crypto_skcipher_utils.o \ + procfs.o + +rk_crypto-$(CONFIG_CRYPTO_DEV_ROCKCHIP_V1) += \ + rk_crypto_v1.o \ + rk_crypto_v1_ahash.o \ + rk_crypto_v1_skcipher.o + +$(obj)/rk_sm2signature.asn1.o: $(obj)/rk_sm2signature.asn1.c $(obj)/rk_sm2signature.asn1.h +$(obj)/rk_ecdsasignature.asn1.o: $(obj)/rk_ecdsasignature.asn1.c $(obj)/rk_ecdsasignature.asn1.h +$(obj)/rk_crypto_v2_akcipher.o: $(obj)/rk_sm2signature.asn1.h $(obj)/rk_ecdsasignature.asn1.h + +rk_crypto-$(CONFIG_CRYPTO_DEV_ROCKCHIP_V2) += \ + rk_crypto_v2.o \ + rk_crypto_v2_ahash.o \ + rk_crypto_v2_skcipher.o \ + rk_crypto_v2_akcipher.o \ + rk_crypto_v2_pka.o \ + rk_crypto_ecc.o \ + rk_sm2signature.asn1.o \ + rk_ecdsasignature.asn1.o \ + rk_crypto_bignum.o + +rk_crypto-$(CONFIG_CRYPTO_DEV_ROCKCHIP_V3) += \ + rk_crypto_v3.o \ + rk_crypto_v3_ahash.o \ + rk_crypto_v3_skcipher.o \ + rk_crypto_v2_akcipher.o \ + rk_crypto_v2_pka.o \ + rk_crypto_ecc.o \ + rk_sm2signature.asn1.o \ + rk_ecdsasignature.asn1.o \ + rk_crypto_bignum.o diff --git a/drivers/crypto/rockchip/procfs.c b/drivers/crypto/rockchip/rkcrypto/procfs.c similarity index 100% rename from drivers/crypto/rockchip/procfs.c rename to drivers/crypto/rockchip/rkcrypto/procfs.c diff --git a/drivers/crypto/rockchip/procfs.h b/drivers/crypto/rockchip/rkcrypto/procfs.h similarity index 100% rename from drivers/crypto/rockchip/procfs.h rename to drivers/crypto/rockchip/rkcrypto/procfs.h diff --git a/drivers/crypto/rockchip/rk_crypto_ahash_utils.c b/drivers/crypto/rockchip/rkcrypto/rk_crypto_ahash_utils.c similarity index 100% rename from drivers/crypto/rockchip/rk_crypto_ahash_utils.c rename to drivers/crypto/rockchip/rkcrypto/rk_crypto_ahash_utils.c diff --git a/drivers/crypto/rockchip/rk_crypto_ahash_utils.h b/drivers/crypto/rockchip/rkcrypto/rk_crypto_ahash_utils.h similarity index 100% rename from drivers/crypto/rockchip/rk_crypto_ahash_utils.h rename to drivers/crypto/rockchip/rkcrypto/rk_crypto_ahash_utils.h diff --git a/drivers/crypto/rockchip/rk_crypto_bignum.c b/drivers/crypto/rockchip/rkcrypto/rk_crypto_bignum.c similarity index 100% rename from drivers/crypto/rockchip/rk_crypto_bignum.c rename to drivers/crypto/rockchip/rkcrypto/rk_crypto_bignum.c diff --git a/drivers/crypto/rockchip/rk_crypto_bignum.h b/drivers/crypto/rockchip/rkcrypto/rk_crypto_bignum.h similarity index 100% rename from drivers/crypto/rockchip/rk_crypto_bignum.h rename to drivers/crypto/rockchip/rkcrypto/rk_crypto_bignum.h diff --git a/drivers/crypto/rockchip/rk_crypto_core.c b/drivers/crypto/rockchip/rkcrypto/rk_crypto_core.c similarity index 99% rename from drivers/crypto/rockchip/rk_crypto_core.c rename to drivers/crypto/rockchip/rkcrypto/rk_crypto_core.c index 4a75519d214f..afa5aa7f9e8b 100644 --- a/drivers/crypto/rockchip/rk_crypto_core.c +++ b/drivers/crypto/rockchip/rkcrypto/rk_crypto_core.c @@ -25,7 +25,7 @@ #include "rk_crypto_v1.h" #include "rk_crypto_v2.h" #include "rk_crypto_v3.h" -#include "cryptodev_linux/rk_cryptodev.h" +#include "../cryptodev_linux/rk_cryptodev.h" #include "procfs.h" #define CRYPTO_NAME "rkcrypto" diff --git a/drivers/crypto/rockchip/rk_crypto_core.h b/drivers/crypto/rockchip/rkcrypto/rk_crypto_core.h similarity index 100% rename from drivers/crypto/rockchip/rk_crypto_core.h rename to drivers/crypto/rockchip/rkcrypto/rk_crypto_core.h diff --git a/drivers/crypto/rockchip/rk_crypto_ecc.c b/drivers/crypto/rockchip/rkcrypto/rk_crypto_ecc.c similarity index 100% rename from drivers/crypto/rockchip/rk_crypto_ecc.c rename to drivers/crypto/rockchip/rkcrypto/rk_crypto_ecc.c diff --git a/drivers/crypto/rockchip/rk_crypto_ecc.h b/drivers/crypto/rockchip/rkcrypto/rk_crypto_ecc.h similarity index 100% rename from drivers/crypto/rockchip/rk_crypto_ecc.h rename to drivers/crypto/rockchip/rkcrypto/rk_crypto_ecc.h diff --git a/drivers/crypto/rockchip/rk_crypto_skcipher_utils.c b/drivers/crypto/rockchip/rkcrypto/rk_crypto_skcipher_utils.c similarity index 100% rename from drivers/crypto/rockchip/rk_crypto_skcipher_utils.c rename to drivers/crypto/rockchip/rkcrypto/rk_crypto_skcipher_utils.c diff --git a/drivers/crypto/rockchip/rk_crypto_skcipher_utils.h b/drivers/crypto/rockchip/rkcrypto/rk_crypto_skcipher_utils.h similarity index 100% rename from drivers/crypto/rockchip/rk_crypto_skcipher_utils.h rename to drivers/crypto/rockchip/rkcrypto/rk_crypto_skcipher_utils.h diff --git a/drivers/crypto/rockchip/rk_crypto_utils.c b/drivers/crypto/rockchip/rkcrypto/rk_crypto_utils.c similarity index 100% rename from drivers/crypto/rockchip/rk_crypto_utils.c rename to drivers/crypto/rockchip/rkcrypto/rk_crypto_utils.c diff --git a/drivers/crypto/rockchip/rk_crypto_utils.h b/drivers/crypto/rockchip/rkcrypto/rk_crypto_utils.h similarity index 100% rename from drivers/crypto/rockchip/rk_crypto_utils.h rename to drivers/crypto/rockchip/rkcrypto/rk_crypto_utils.h diff --git a/drivers/crypto/rockchip/rk_crypto_v1.c b/drivers/crypto/rockchip/rkcrypto/rk_crypto_v1.c similarity index 100% rename from drivers/crypto/rockchip/rk_crypto_v1.c rename to drivers/crypto/rockchip/rkcrypto/rk_crypto_v1.c diff --git a/drivers/crypto/rockchip/rk_crypto_v1.h b/drivers/crypto/rockchip/rkcrypto/rk_crypto_v1.h similarity index 100% rename from drivers/crypto/rockchip/rk_crypto_v1.h rename to drivers/crypto/rockchip/rkcrypto/rk_crypto_v1.h diff --git a/drivers/crypto/rockchip/rk_crypto_v1_ahash.c b/drivers/crypto/rockchip/rkcrypto/rk_crypto_v1_ahash.c similarity index 100% rename from drivers/crypto/rockchip/rk_crypto_v1_ahash.c rename to drivers/crypto/rockchip/rkcrypto/rk_crypto_v1_ahash.c diff --git a/drivers/crypto/rockchip/rk_crypto_v1_reg.h b/drivers/crypto/rockchip/rkcrypto/rk_crypto_v1_reg.h similarity index 100% rename from drivers/crypto/rockchip/rk_crypto_v1_reg.h rename to drivers/crypto/rockchip/rkcrypto/rk_crypto_v1_reg.h diff --git a/drivers/crypto/rockchip/rk_crypto_v1_skcipher.c b/drivers/crypto/rockchip/rkcrypto/rk_crypto_v1_skcipher.c similarity index 100% rename from drivers/crypto/rockchip/rk_crypto_v1_skcipher.c rename to drivers/crypto/rockchip/rkcrypto/rk_crypto_v1_skcipher.c diff --git a/drivers/crypto/rockchip/rk_crypto_v2.c b/drivers/crypto/rockchip/rkcrypto/rk_crypto_v2.c similarity index 100% rename from drivers/crypto/rockchip/rk_crypto_v2.c rename to drivers/crypto/rockchip/rkcrypto/rk_crypto_v2.c diff --git a/drivers/crypto/rockchip/rk_crypto_v2.h b/drivers/crypto/rockchip/rkcrypto/rk_crypto_v2.h similarity index 100% rename from drivers/crypto/rockchip/rk_crypto_v2.h rename to drivers/crypto/rockchip/rkcrypto/rk_crypto_v2.h diff --git a/drivers/crypto/rockchip/rk_crypto_v2_ahash.c b/drivers/crypto/rockchip/rkcrypto/rk_crypto_v2_ahash.c similarity index 100% rename from drivers/crypto/rockchip/rk_crypto_v2_ahash.c rename to drivers/crypto/rockchip/rkcrypto/rk_crypto_v2_ahash.c diff --git a/drivers/crypto/rockchip/rk_crypto_v2_akcipher.c b/drivers/crypto/rockchip/rkcrypto/rk_crypto_v2_akcipher.c similarity index 100% rename from drivers/crypto/rockchip/rk_crypto_v2_akcipher.c rename to drivers/crypto/rockchip/rkcrypto/rk_crypto_v2_akcipher.c diff --git a/drivers/crypto/rockchip/rk_crypto_v2_pka.c b/drivers/crypto/rockchip/rkcrypto/rk_crypto_v2_pka.c similarity index 100% rename from drivers/crypto/rockchip/rk_crypto_v2_pka.c rename to drivers/crypto/rockchip/rkcrypto/rk_crypto_v2_pka.c diff --git a/drivers/crypto/rockchip/rk_crypto_v2_pka.h b/drivers/crypto/rockchip/rkcrypto/rk_crypto_v2_pka.h similarity index 100% rename from drivers/crypto/rockchip/rk_crypto_v2_pka.h rename to drivers/crypto/rockchip/rkcrypto/rk_crypto_v2_pka.h diff --git a/drivers/crypto/rockchip/rk_crypto_v2_reg.h b/drivers/crypto/rockchip/rkcrypto/rk_crypto_v2_reg.h similarity index 100% rename from drivers/crypto/rockchip/rk_crypto_v2_reg.h rename to drivers/crypto/rockchip/rkcrypto/rk_crypto_v2_reg.h diff --git a/drivers/crypto/rockchip/rk_crypto_v2_skcipher.c b/drivers/crypto/rockchip/rkcrypto/rk_crypto_v2_skcipher.c similarity index 100% rename from drivers/crypto/rockchip/rk_crypto_v2_skcipher.c rename to drivers/crypto/rockchip/rkcrypto/rk_crypto_v2_skcipher.c diff --git a/drivers/crypto/rockchip/rk_crypto_v3.c b/drivers/crypto/rockchip/rkcrypto/rk_crypto_v3.c similarity index 100% rename from drivers/crypto/rockchip/rk_crypto_v3.c rename to drivers/crypto/rockchip/rkcrypto/rk_crypto_v3.c diff --git a/drivers/crypto/rockchip/rk_crypto_v3.h b/drivers/crypto/rockchip/rkcrypto/rk_crypto_v3.h similarity index 100% rename from drivers/crypto/rockchip/rk_crypto_v3.h rename to drivers/crypto/rockchip/rkcrypto/rk_crypto_v3.h diff --git a/drivers/crypto/rockchip/rk_crypto_v3_ahash.c b/drivers/crypto/rockchip/rkcrypto/rk_crypto_v3_ahash.c similarity index 100% rename from drivers/crypto/rockchip/rk_crypto_v3_ahash.c rename to drivers/crypto/rockchip/rkcrypto/rk_crypto_v3_ahash.c diff --git a/drivers/crypto/rockchip/rk_crypto_v3_reg.h b/drivers/crypto/rockchip/rkcrypto/rk_crypto_v3_reg.h similarity index 100% rename from drivers/crypto/rockchip/rk_crypto_v3_reg.h rename to drivers/crypto/rockchip/rkcrypto/rk_crypto_v3_reg.h diff --git a/drivers/crypto/rockchip/rk_crypto_v3_skcipher.c b/drivers/crypto/rockchip/rkcrypto/rk_crypto_v3_skcipher.c similarity index 100% rename from drivers/crypto/rockchip/rk_crypto_v3_skcipher.c rename to drivers/crypto/rockchip/rkcrypto/rk_crypto_v3_skcipher.c diff --git a/drivers/crypto/rockchip/rk_ecdsasignature.asn1 b/drivers/crypto/rockchip/rkcrypto/rk_ecdsasignature.asn1 similarity index 100% rename from drivers/crypto/rockchip/rk_ecdsasignature.asn1 rename to drivers/crypto/rockchip/rkcrypto/rk_ecdsasignature.asn1 diff --git a/drivers/crypto/rockchip/rk_sm2signature.asn1 b/drivers/crypto/rockchip/rkcrypto/rk_sm2signature.asn1 similarity index 100% rename from drivers/crypto/rockchip/rk_sm2signature.asn1 rename to drivers/crypto/rockchip/rkcrypto/rk_sm2signature.asn1