leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

crypto: mediatek - move to generic async completion

Browse Source 
The mediatek driver starts several async crypto ops and waits for their
completions. Move it over to generic code doing the same.

Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com>
Acked-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Gilad Ben-Yossef 2017-10-18 08:00:51 +01:00 committed by Herbert Xu
parent c70e5f9403
commit 591b95af3d
1 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/crypto/mediatek/mtk-aes.c
View File

@ -138,11 +138,6 @@ struct mtk_aes_gcm_ctx {
struct crypto_skcipher *ctr; struct crypto_skcipher *ctr;
}; };
struct mtk_aes_gcm_setkey_result {
int err;
struct completion completion;
};
struct mtk_aes_drv { struct mtk_aes_drv {
struct list_head dev_list; struct list_head dev_list;
/* Device list lock */ /* Device list lock */
@ -942,17 +937,6 @@ static int mtk_aes_gcm_crypt(struct aead_request *req, u64 mode)
&req->base); &req->base);
} }
static void mtk_gcm_setkey_done(struct crypto_async_request *req, int err)
{
struct mtk_aes_gcm_setkey_result *result = req->data;
if (err == -EINPROGRESS)
return;
result->err = err;
complete(&result->completion);
}
/* /*
* Because of the hardware limitation, we need to pre-calculate key(H) * Because of the hardware limitation, we need to pre-calculate key(H)
* for the GHASH operation. The result of the encryption operation * for the GHASH operation. The result of the encryption operation
@ -968,7 +952,7 @@ static int mtk_aes_gcm_setkey(struct crypto_aead *aead, const u8 *key,
u32 hash[4]; u32 hash[4];
u8 iv[8]; u8 iv[8];
struct mtk_aes_gcm_setkey_result result; struct crypto_wait wait;
struct scatterlist sg[1]; struct scatterlist sg[1];
struct skcipher_request req; struct skcipher_request req;
@ -1008,22 +992,17 @@ static int mtk_aes_gcm_setkey(struct crypto_aead *aead, const u8 *key,
if (!data) if (!data)
return -ENOMEM; return -ENOMEM;
init_completion(&data->result.completion); crypto_init_wait(&data->wait);
sg_init_one(data->sg, &data->hash, AES_BLOCK_SIZE); sg_init_one(data->sg, &data->hash, AES_BLOCK_SIZE);
skcipher_request_set_tfm(&data->req, ctr); skcipher_request_set_tfm(&data->req, ctr);
skcipher_request_set_callback(&data->req, CRYPTO_TFM_REQ_MAY_SLEEP | skcipher_request_set_callback(&data->req, CRYPTO_TFM_REQ_MAY_SLEEP |
CRYPTO_TFM_REQ_MAY_BACKLOG, CRYPTO_TFM_REQ_MAY_BACKLOG,
mtk_gcm_setkey_done, &data->result); crypto_req_done, &data->wait);
skcipher_request_set_crypt(&data->req, data->sg, data->sg, skcipher_request_set_crypt(&data->req, data->sg, data->sg,
AES_BLOCK_SIZE, data->iv); AES_BLOCK_SIZE, data->iv);
err = crypto_skcipher_encrypt(&data->req); err = crypto_wait_req(crypto_skcipher_encrypt(&data->req),
if (err == -EINPROGRESS || err == -EBUSY) { &data->wait);
err = wait_for_completion_interruptible(
&data->result.completion);
if (!err)
err = data->result.err;
}
if (err) if (err)
goto out; goto out;