Revert "crypto: run initcalls for generic implementations earlier"

This reverts commit c4741b2305.

Crypto API self-tests no longer run at registration time and now
occur either at late_initcall or upon the first use.

Therefore the premise of the above commit no longer exists.  Revert
it and subsequent additions of subsys_initcall and arch_initcall.

Note that lib/crypto calls will stay at subsys_initcall (or rather
downgraded from arch_initcall) because they may need to occur
before Crypto API registration.

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

arch/arm/crypto/aes-neonbs-glue.c

@@ -407,5 +407,5 @@ static int __init aes_init(void)
 	return crypto_register_skciphers(aes_algs, ARRAY_SIZE(aes_algs));
 }
 
-late_initcall(aes_init);
+module_init(aes_init);
 module_exit(aes_exit);

arch/arm/lib/crypto/chacha-glue.c

@@ -122,7 +122,7 @@ static int __init chacha_arm_mod_init(void)
 	}
 	return 0;
 }
-arch_initcall(chacha_arm_mod_init);
+subsys_initcall(chacha_arm_mod_init);
 
 static void __exit chacha_arm_mod_exit(void)
 {

arch/arm/lib/crypto/poly1305-glue.c

@@ -69,7 +69,7 @@ static int __init arm_poly1305_mod_init(void)
 		static_branch_enable(&have_neon);
 	return 0;
 }
-arch_initcall(arm_poly1305_mod_init);
+subsys_initcall(arm_poly1305_mod_init);
 
 static void __exit arm_poly1305_mod_exit(void)
 {

arch/arm/lib/crypto/sha256.c

@@ -53,7 +53,7 @@ static int __init sha256_arm_mod_init(void)
 	}
 	return 0;
 }
-arch_initcall(sha256_arm_mod_init);
+subsys_initcall(sha256_arm_mod_init);
 
 static void __exit sha256_arm_mod_exit(void)
 {

arch/arm64/lib/crypto/chacha-neon-glue.c

@@ -104,7 +104,7 @@ static int __init chacha_simd_mod_init(void)
 		static_branch_enable(&have_neon);
 	return 0;
 }
-arch_initcall(chacha_simd_mod_init);
+subsys_initcall(chacha_simd_mod_init);
 
 static void __exit chacha_simd_mod_exit(void)
 {

arch/arm64/lib/crypto/poly1305-glue.c

@@ -62,7 +62,7 @@ static int __init neon_poly1305_mod_init(void)
 		static_branch_enable(&have_neon);
 	return 0;
 }
-arch_initcall(neon_poly1305_mod_init);
+subsys_initcall(neon_poly1305_mod_init);
 
 static void __exit neon_poly1305_mod_exit(void)
 {

arch/arm64/lib/crypto/sha256.c

@@ -64,7 +64,7 @@ static int __init sha256_arm64_mod_init(void)
 	}
 	return 0;
 }
-arch_initcall(sha256_arm64_mod_init);
+subsys_initcall(sha256_arm64_mod_init);
 
 static void __exit sha256_arm64_mod_exit(void)
 {

arch/powerpc/lib/crypto/chacha-p10-glue.c

@@ -87,7 +87,7 @@ static int __init chacha_p10_init(void)
 		static_branch_enable(&have_p10);
 	return 0;
 }
-arch_initcall(chacha_p10_init);
+subsys_initcall(chacha_p10_init);
 
 static void __exit chacha_p10_exit(void)
 {

arch/powerpc/lib/crypto/poly1305-p10-glue.c

@@ -76,7 +76,7 @@ static int __init poly1305_p10_init(void)
 		static_branch_enable(&have_p10);
 	return 0;
 }
-arch_initcall(poly1305_p10_init);
+subsys_initcall(poly1305_p10_init);
 
 static void __exit poly1305_p10_exit(void)
 {

arch/riscv/lib/crypto/chacha-riscv64-glue.c

@@ -62,7 +62,7 @@ static int __init riscv64_chacha_mod_init(void)
 		static_branch_enable(&use_zvkb);
 	return 0;
 }
-arch_initcall(riscv64_chacha_mod_init);
+subsys_initcall(riscv64_chacha_mod_init);
 
 static void __exit riscv64_chacha_mod_exit(void)
 {

arch/riscv/lib/crypto/sha256.c

@@ -50,7 +50,7 @@ static int __init riscv64_sha256_mod_init(void)
 		static_branch_enable(&have_extensions);
 	return 0;
 }
-arch_initcall(riscv64_sha256_mod_init);
+subsys_initcall(riscv64_sha256_mod_init);
 
 static void __exit riscv64_sha256_mod_exit(void)
 {

arch/s390/lib/crypto/sha256.c

@@ -36,7 +36,7 @@ static int __init sha256_s390_mod_init(void)
 		static_branch_enable(&have_cpacf_sha256);
 	return 0;
 }
-arch_initcall(sha256_s390_mod_init);
+subsys_initcall(sha256_s390_mod_init);
 
 static void __exit sha256_s390_mod_exit(void)
 {

arch/sparc/lib/crypto/sha256.c

@@ -53,7 +53,7 @@ static int __init sha256_sparc64_mod_init(void)
 	pr_info("Using sparc64 sha256 opcode optimized SHA-256/SHA-224 implementation\n");
 	return 0;
 }
-arch_initcall(sha256_sparc64_mod_init);
+subsys_initcall(sha256_sparc64_mod_init);
 
 static void __exit sha256_sparc64_mod_exit(void)
 {

arch/x86/lib/crypto/chacha_glue.c

@@ -174,7 +174,7 @@ static int __init chacha_simd_mod_init(void)
 	}
 	return 0;
 }
-arch_initcall(chacha_simd_mod_init);
+subsys_initcall(chacha_simd_mod_init);
 
 static void __exit chacha_simd_mod_exit(void)
 {

arch/x86/lib/crypto/poly1305_glue.c

@@ -117,7 +117,7 @@ static int __init poly1305_simd_mod_init(void)
 		static_branch_enable(&poly1305_use_avx512);
 	return 0;
 }
-arch_initcall(poly1305_simd_mod_init);
+subsys_initcall(poly1305_simd_mod_init);
 
 static void __exit poly1305_simd_mod_exit(void)
 {

arch/x86/lib/crypto/sha256.c

@@ -63,7 +63,7 @@ static int __init sha256_x86_mod_init(void)
 	static_branch_enable(&have_sha256_x86);
 	return 0;
 }
-arch_initcall(sha256_x86_mod_init);
+subsys_initcall(sha256_x86_mod_init);
 
 static void __exit sha256_x86_mod_exit(void)
 {

crypto/842.c

@@ -70,7 +70,7 @@ static int __init crypto842_mod_init(void)
 {
 	return crypto_register_scomp(&scomp);
 }
-subsys_initcall(crypto842_mod_init);
+module_init(crypto842_mod_init);
 
 static void __exit crypto842_mod_exit(void)
 {

crypto/adiantum.c

@@ -639,7 +639,7 @@ static void __exit adiantum_module_exit(void)
 	crypto_unregister_template(&adiantum_tmpl);
 }
 
-subsys_initcall(adiantum_module_init);
+module_init(adiantum_module_init);
 module_exit(adiantum_module_exit);
 
 MODULE_DESCRIPTION("Adiantum length-preserving encryption mode");

crypto/aegis128-core.c

@@ -566,7 +566,7 @@ static void __exit crypto_aegis128_module_exit(void)
 	crypto_unregister_aead(&crypto_aegis128_alg_generic);
 }
 
-subsys_initcall(crypto_aegis128_module_init);
+module_init(crypto_aegis128_module_init);
 module_exit(crypto_aegis128_module_exit);
 
 MODULE_LICENSE("GPL");

crypto/aes_generic.c

@@ -1311,7 +1311,7 @@ static void __exit aes_fini(void)
 	crypto_unregister_alg(&aes_alg);
 }
 
-subsys_initcall(aes_init);
+module_init(aes_init);
 module_exit(aes_fini);
 
 MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm");