Re: [PATCH v5 18/19] crypto: mediatek: move to generic async completion

[Ryder Lee <ryder.lee@mediatek.com>]

On Mon, 2017-08-14 at 18:21 +0300, Gilad Ben-Yossef wrote:
> 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>

>  drivers/crypto/mediatek/mtk-aes.c | 31 +++++--------------------------
>  1 file changed, 5 insertions(+), 26 deletions(-)
> 
> diff --git a/drivers/crypto/mediatek/mtk-aes.c b/drivers/crypto/mediatek/mtk-aes.c
> index 9e845e8..e2c7c95 100644
> --- a/drivers/crypto/mediatek/mtk-aes.c
> +++ b/drivers/crypto/mediatek/mtk-aes.c
> @@ -137,11 +137,6 @@ struct mtk_aes_gcm_ctx {
>  	struct crypto_skcipher *ctr;
>  };
>  
> -struct mtk_aes_gcm_setkey_result {
> -	int err;
> -	struct completion completion;
> -};
> -
>  struct mtk_aes_drv {
>  	struct list_head dev_list;
>  	/* Device list lock */
> @@ -936,17 +931,6 @@ static int mtk_aes_gcm_crypt(struct aead_request *req, u64 mode)
>  				    &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)
>   * for the GHASH operation. The result of the encryption operation
> @@ -962,7 +946,7 @@ static int mtk_aes_gcm_setkey(struct crypto_aead *aead, const u8 *key,
>  		u32 hash[4];
>  		u8 iv[8];
>  
> -		struct mtk_aes_gcm_setkey_result result;
> +		struct crypto_wait wait;
>  
>  		struct scatterlist sg[1];
>  		struct skcipher_request req;
> @@ -1002,22 +986,17 @@ static int mtk_aes_gcm_setkey(struct crypto_aead *aead, const u8 *key,
>  	if (!data)
>  		return -ENOMEM;
>  
> -	init_completion(&data->result.completion);
> +	crypto_init_wait(&data->wait);
>  	sg_init_one(data->sg, &data->hash, AES_BLOCK_SIZE);
>  	skcipher_request_set_tfm(&data->req, ctr);
>  	skcipher_request_set_callback(&data->req, CRYPTO_TFM_REQ_MAY_SLEEP |
>  				      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,
>  				   AES_BLOCK_SIZE, data->iv);
>  
> -	err = crypto_skcipher_encrypt(&data->req);
> -	if (err == -EINPROGRESS || err == -EBUSY) {
> -		err = wait_for_completion_interruptible(
> -			&data->result.completion);
> -		if (!err)
> -			err = data->result.err;
> -	}
> +	err = crypto_wait_req(crypto_skcipher_encrypt(&data->req),
> +			      &data->wait);
>  	if (err)
>  		goto out;
>