Commit ef93f156 authored by Herbert Xu's avatar Herbert Xu
Browse files

Revert "crypto: run initcalls for generic implementations earlier" 



This reverts commit c4741b23.

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: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 89490e6b

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

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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)

{