diff options
| author | LEROY Christophe <christophe.leroy@c-s.fr> | 2016-06-06 13:20:44 +0200 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2016-06-08 16:20:04 +0800 |
| commit | b00577639d1970c8075d70f6180be83574712855 (patch) | |
| tree | fd0a6ef8db86ff34a0c7ef53618cc73e2b1f1621 /drivers | |
| parent | e968b49f4d57a28d5e6ada6e92d4937ca0743793 (diff) | |
| download | linux-stable-b00577639d1970c8075d70f6180be83574712855.tar.gz linux-stable-b00577639d1970c8075d70f6180be83574712855.tar.bz2 linux-stable-b00577639d1970c8075d70f6180be83574712855.zip | |
crypto: talitos - implement cra_priority
SEC1 doesn't have IPSEC_ESP descriptor type but it is able to perform
IPSEC using HMAC_SNOOP_NO_AFEU, which is also existing on SEC2
In order to be able to define descriptors templates for SEC1 without
breaking SEC2+, we have to give lower priority to HMAC_SNOOP_NO_AFEU
so that SEC2+ selects IPSEC_ESP and not HMAC_SNOOP_NO_AFEU which is
less performant.
This is done by adding a priority field in the template. If the field
is 0, we use the default priority, otherwise we used the one in the
field.
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/crypto/talitos.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c index ff8cf39dfc63..dfd3a93e4954 100644 --- a/drivers/crypto/talitos.c +++ b/drivers/crypto/talitos.c @@ -2120,6 +2120,7 @@ static int ahash_setkey(struct crypto_ahash *tfm, const u8 *key, struct talitos_alg_template { u32 type; + u32 priority; union { struct crypto_alg crypto; struct ahash_alg hash; @@ -2897,7 +2898,10 @@ static struct talitos_crypto_alg *talitos_alg_alloc(struct device *dev, } alg->cra_module = THIS_MODULE; - alg->cra_priority = TALITOS_CRA_PRIORITY; + if (t_alg->algt.priority) + alg->cra_priority = t_alg->algt.priority; + else + alg->cra_priority = TALITOS_CRA_PRIORITY; alg->cra_alignmask = 0; alg->cra_ctxsize = sizeof(struct talitos_ctx); alg->cra_flags |= CRYPTO_ALG_KERN_DRIVER_ONLY; |