diff options
| author | Jan Glauber <jang@linux.vnet.ibm.com> | 2011-04-19 21:29:14 +0200 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2011-05-04 15:05:49 +1000 |
| commit | 1822bc9093e05059e4144d6041b0f5450ad275e1 (patch) | |
| tree | ceb599625dd6ff3f93f9cf1c1070f4c0c576f718 /arch/s390/crypto/crypt_s390.h | |
| parent | ba0e14acc417eceb895efda1ff46366f4d1728f8 (diff) | |
| download | kernel_samsung_smdk4412-1822bc9093e05059e4144d6041b0f5450ad275e1.zip kernel_samsung_smdk4412-1822bc9093e05059e4144d6041b0f5450ad275e1.tar.gz kernel_samsung_smdk4412-1822bc9093e05059e4144d6041b0f5450ad275e1.tar.bz2 | |
crypto: s390 - extend crypto facility check
The specification which crypto facility is required for an algorithm is added
as a parameter to the availability check which is done before an algorithm is
registered. With this change it is easier to add new algorithms that require
different facilities.
Signed-off-by: Jan Glauber <jang@linux.vnet.ibm.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'arch/s390/crypto/crypt_s390.h')
| -rw-r--r-- | arch/s390/crypto/crypt_s390.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/arch/s390/crypto/crypt_s390.h b/arch/s390/crypto/crypt_s390.h index 7ee9a1b..4b8c96c 100644 --- a/arch/s390/crypto/crypt_s390.h +++ b/arch/s390/crypto/crypt_s390.h @@ -24,6 +24,10 @@ #define CRYPT_S390_PRIORITY 300 #define CRYPT_S390_COMPOSITE_PRIORITY 400 +#define CRYPT_S390_MSA 0x1 +#define CRYPT_S390_MSA3 0x2 +#define CRYPT_S390_MSA4 0x4 + /* s390 cryptographic operations */ enum crypt_s390_operations { CRYPT_S390_KM = 0x0100, @@ -291,13 +295,17 @@ static inline int crypt_s390_kmac(long func, void *param, * * Returns 1 if func available; 0 if func or op in general not available */ -static inline int crypt_s390_func_available(int func) +static inline int crypt_s390_func_available(int func, + unsigned int facility_mask) { unsigned char status[16]; int ret; - /* check if CPACF facility (bit 17) is available */ - if (!test_facility(17)) + if (facility_mask & CRYPT_S390_MSA && !test_facility(17)) + return 0; + if (facility_mask & CRYPT_S390_MSA3 && !test_facility(76)) + return 0; + if (facility_mask & CRYPT_S390_MSA4 && !test_facility(77)) return 0; switch (func & CRYPT_S390_OP_MASK) { |