Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d05377c1 authored by Hendrik Brueckner's avatar Hendrik Brueckner Committed by Martin Schwidefsky
Browse files

s390/crypto: add cpu feature modaliases for crypto modules 



Use the module_cpu_feature_match() module init function to add an
module alias based on required CPU features.   The modules are
automatically loaded on hardware that supports the required CPU features.

Signed-off-by: default avatarHendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 8f00b3e2

arch/s390/crypto/aes_s390.c

+2 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <crypto/algapi.h>

#include <linux/err.h>

#include <linux/module.h>

#include <linux/cpufeature.h>

#include <linux/init.h>

#include <linux/spinlock.h>

#include "crypt_s390.h"
@@ -976,7 +977,7 @@ static void __exit aes_s390_fini(void) 
	crypto_unregister_alg(&aes_alg);

}



module_init(aes_s390_init);

module_cpu_feature_match(MSA, aes_s390_init);

module_exit(aes_s390_fini);



MODULE_ALIAS_CRYPTO("aes-all");

arch/s390/crypto/des_s390.c

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


#include <linux/init.h>

#include <linux/module.h>

#include <linux/cpufeature.h>

#include <linux/crypto.h>

#include <crypto/algapi.h>

#include <crypto/des.h>
@@ -616,7 +617,7 @@ static void __exit des_s390_exit(void) 
	crypto_unregister_alg(&des_alg);

}



module_init(des_s390_init);

module_cpu_feature_match(MSA, des_s390_init);

module_exit(des_s390_exit);



MODULE_ALIAS_CRYPTO("des");

arch/s390/crypto/ghash_s390.c

+2 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 


#include <crypto/internal/hash.h>

#include <linux/module.h>

#include <linux/cpufeature.h>



#include "crypt_s390.h"
@@ -158,7 +159,7 @@ static void __exit ghash_mod_exit(void) 
	crypto_unregister_shash(&ghash_alg);

}



module_init(ghash_mod_init);

module_cpu_feature_match(MSA, ghash_mod_init);

module_exit(ghash_mod_exit);



MODULE_ALIAS_CRYPTO("ghash");

arch/s390/crypto/prng.c

+2 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/module.h>

#include <linux/moduleparam.h>

#include <linux/mutex.h>

#include <linux/cpufeature.h>

#include <linux/random.h>

#include <linux/slab.h>

#include <asm/debug.h>
@@ -914,6 +915,5 @@ static void __exit prng_exit(void) 
	}

}





module_init(prng_init);

module_cpu_feature_match(MSA, prng_init);

module_exit(prng_exit);

arch/s390/crypto/sha1_s390.c

+2 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <crypto/internal/hash.h>

#include <linux/init.h>

#include <linux/module.h>

#include <linux/cpufeature.h>

#include <crypto/sha.h>



#include "crypt_s390.h"
@@ -100,7 +101,7 @@ static void __exit sha1_s390_fini(void) 
	crypto_unregister_shash(&alg);

}



module_init(sha1_s390_init);

module_cpu_feature_match(MSA, sha1_s390_init);

module_exit(sha1_s390_fini);



MODULE_ALIAS_CRYPTO("sha1");