From patchwork Thu Aug 24 14:19:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gilad Ben-Yossef X-Patchwork-Id: 110929 Delivered-To: patch@linaro.org Received: by 10.37.128.210 with SMTP id c18csp8564492ybm; Thu, 24 Aug 2017 07:23:21 -0700 (PDT) X-Received: by 10.84.217.86 with SMTP id e22mr7229266plj.22.1503584601575; Thu, 24 Aug 2017 07:23:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503584601; cv=none; d=google.com; s=arc-20160816; b=VzzAQPyVUt77kXwqzkHFWEvcBqaAany43M7SVHJ6VaZF/e2t1qJhOPVC8XMYharZP5 51MqVYx/2XbXnsBSAImBgKSFsAUn7LHjqjj9pJmtR2RHQw854cTkUyFXyjMJFsqgVbKO hPqVKvXZ/SjkrZkVBOkcdrBOT+KlELszGsb5F3+k+b6gOIFFdjjCLtyNyM3fGHWAzbJi ourQpdM0BEiqf5b+vTxfeadnZa/Op5qT8/MwzKHgdGBrZ4yeEUlzLGv8sAeliGj3F28w Gv1h/3VSbRizOIcoW2qjE5CR6kT5FJ7NlK8KXSBCyQeQ1gJp2vAkwBUzCfiyj96QYZco ySLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=A7zELhOaEjZb/+lrLAbPp1vdePqcxK/3gRtFdVYfz7A=; b=suwhGVGfI7EYgjTCHqRacAZV/Xs41ayWEim1SlQErQZ/o9CYG3lJPllpGaqFzFj5Fp 05jvgxf5RSaeMYB3UNZ37Q3OtnS1Q9YXp5+tcuVD19bYPCmpfqwvfeNx0aAFPOPAtEla Adh3TD0fiSUOk7nSNLtZpKjD8ZWU0vEIYEY+LAGWOH/Xmx2er7FOGUwEpKvPYpN2sgMv oLW2kcYfu/aXh6nR8RjeCfFd4R1zwmfLKYpV2sPzEtTDEfKNrVmRsIaTh2d+mILoOMiH rzBtKQ0/9EkqZa21OW8c65zyEitVcnV9PZdiU4IEDDcnmCmu0tiubPcxZ00NANnQ0/+b h6vw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f4si3178599plm.367.2017.08.24.07.23.21; Thu, 24 Aug 2017 07:23:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753976AbdHXOXS (ORCPT + 26 others); Thu, 24 Aug 2017 10:23:18 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:42448 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753203AbdHXOXN (ORCPT ); Thu, 24 Aug 2017 10:23:13 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 401231AED; Thu, 24 Aug 2017 07:23:13 -0700 (PDT) Received: from gby.kfn.arm.com (unknown [10.45.48.132]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id C8B383F540; Thu, 24 Aug 2017 07:23:04 -0700 (PDT) From: Gilad Ben-Yossef To: Herbert Xu , "David S. Miller" , Jonathan Corbet , David Howells , Tom Lendacky , Gary Hook , Boris Brezillon , Arnaud Ebalard , Matthias Brugger , Alasdair Kergon , Mike Snitzer , dm-devel@redhat.com, Shaohua Li , Steve French , "Theodore Y. Ts'o" , Jaegeuk Kim , Mimi Zohar , Dmitry Kasatkin , James Morris , "Serge E. Hallyn" , linux-crypto@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, keyrings@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-raid@vger.kernel.org, linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-fscrypt@vger.kernel.org, linux-ima-devel@lists.sourceforge.net, linux-ima-user@lists.sourceforge.net, linux-security-module@vger.kernel.org Cc: Ofir Drang Subject: [PATCH v7 18/19] crypto: mediatek: move to generic async completion Date: Thu, 24 Aug 2017 17:19:05 +0300 Message-Id: <1503584350-7831-19-git-send-email-gilad@benyossef.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1503584350-7831-1-git-send-email-gilad@benyossef.com> References: <1503584350-7831-1-git-send-email-gilad@benyossef.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Acked-by: Ryder Lee --- drivers/crypto/mediatek/mtk-aes.c | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) -- 2.1.4 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;