From patchwork Thu Dec 22 16:37:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cyrille Pitchen X-Patchwork-Id: 9485335 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8DAEE601C0 for ; Thu, 22 Dec 2016 16:40:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8071928066 for ; Thu, 22 Dec 2016 16:40:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 754AE2811E; Thu, 22 Dec 2016 16:40:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0CC7728066 for ; Thu, 22 Dec 2016 16:40:10 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1cK6OJ-0004Or-Hq; Thu, 22 Dec 2016 16:38:51 +0000 Received: from exsmtp02.microchip.com ([198.175.253.38] helo=email.microchip.com) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1cK6Nh-0003x3-FN for linux-arm-kernel@lists.infradead.org; Thu, 22 Dec 2016 16:38:14 +0000 Received: from tenerife.corp.atmel.com (10.10.76.4) by chn-sv-exch02.mchp-main.com (10.10.76.38) with Microsoft SMTP Server id 14.3.181.6; Thu, 22 Dec 2016 09:37:55 -0700 From: Cyrille Pitchen To: , , Subject: [PATCH v2 03/12] crypto: atmel-sha: make atmel_sha_done_task more generic Date: Thu, 22 Dec 2016 17:37:52 +0100 Message-ID: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAC+NgFupgVWLjYuHi8mHRTWGMiTBovjVzC6PF4YVTGC0evO9ksZg2/R2zxb1P2xgtOqasYnJgDWCIYs3MS8qvSGDN+LRtO3NBr1DFrrW72RsY7/F1MXJyCAmsY5R4figOxGYTMJR4++AoK4gtIhAosbDlFWMXIxcHs8B0RokHq9+xgySEBYIkGpY/ZgOxWQRUJU51PGLpYuTg4BWIl/j9QR0kLCEgJ3HzXCcziM0pYCuxfu49VpASIQEbiYNvhUDCvAKCEidnPmEBsZkFJCQOvnjBDHGOGtDaFcwQYwIl1i9ZBGU7Scz6uZkFwraTODz9IjuEbS9xad8lFpiaSx9fMEHY2hLbX+1jhbB1JLYd7IeqsZXYM2MiVI27xINHy6FsX4lZDxugaqIkbjfvYp/AKDELyamzkJy6gJFpFaO0s4efbnCYrmuEs4eBkV5uckaBbm5iZp5ecn7uJkZILKntYJzZ43+IUZKDSUmUd+uk8+FCfEn5KZUZicUZ8UWlOanFhxglOHiURHg3LgfK8RYXJOYWZ6bDpGQ4OJQkeCNAUoJFqempFWmZOSWpRRDpU4ySUuK80SBJAZC+jNI8uNwlRlEpYd6opUA5noLUotzMEoj4LUZhjodMQix5+XmpUkAnMgCBBuMrRnEORiVh3v0gs3gy80rgTngFdB0T0HXrdp8Gua4kESEl1cA4sf2c8uGVARFuZz+Gp8xynWzztfmHQpMd0292uQ0Ll0p1ftmycsbaoNX/ai/+nVYr8F9CpVF3L4N+ttMau1PrBbdpqjVmvNquY6zXpFm5kn1GlPjdeUvLyhz0WfwbFk2MnPNjh/arFyJr3nCefx71NfMWi5a0lvOKKUYHp3zofPjS6Fcm65IjSizFGYmGWsxFxYkAZxnryhsDAAA= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161222_083813_632450_865C40CA X-CRM114-Status: GOOD ( 12.43 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Cyrille Pitchen , linux-crypto@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This patch is a transitional patch. It updates atmel_sha_done_task() to make it more generic. Indeed, it adds a new .resume() member in the atmel_sha_dev structure. This hook is called from atmel_sha_done_task() to resume processing an asynchronous request. Signed-off-by: Cyrille Pitchen --- drivers/crypto/atmel-sha.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/drivers/crypto/atmel-sha.c b/drivers/crypto/atmel-sha.c index 2dbed8bb8d26..643d79a05dda 100644 --- a/drivers/crypto/atmel-sha.c +++ b/drivers/crypto/atmel-sha.c @@ -138,6 +138,7 @@ struct atmel_sha_dev { struct crypto_queue queue; struct ahash_request *req; bool is_async; + atmel_sha_fn_t resume; struct atmel_sha_dma dma_lch_in; @@ -946,6 +947,8 @@ static int atmel_sha_handle_queue(struct atmel_sha_dev *dd, return (start_async) ? ret : err; } +static int atmel_sha_done(struct atmel_sha_dev *dd); + static int atmel_sha_start(struct atmel_sha_dev *dd) { struct ahash_request *req = dd->req; @@ -960,6 +963,7 @@ static int atmel_sha_start(struct atmel_sha_dev *dd) if (err) goto err1; + dd->resume = atmel_sha_done; if (ctx->op == SHA_OP_UPDATE) { err = atmel_sha_update_req(dd); if (err != -EINPROGRESS && (ctx->flags & SHA_FLAGS_FINUP)) @@ -1215,13 +1219,10 @@ static void atmel_sha_queue_task(unsigned long data) atmel_sha_handle_queue(dd, NULL); } -static void atmel_sha_done_task(unsigned long data) +static int atmel_sha_done(struct atmel_sha_dev *dd) { - struct atmel_sha_dev *dd = (struct atmel_sha_dev *)data; int err = 0; - dd->is_async = true; - if (SHA_FLAGS_CPU & dd->flags) { if (SHA_FLAGS_OUTPUT_READY & dd->flags) { dd->flags &= ~SHA_FLAGS_OUTPUT_READY; @@ -1245,11 +1246,21 @@ static void atmel_sha_done_task(unsigned long data) goto finish; } } - return; + return err; finish: /* finish curent request */ atmel_sha_finish_req(dd->req, err); + + return err; +} + +static void atmel_sha_done_task(unsigned long data) +{ + struct atmel_sha_dev *dd = (struct atmel_sha_dev *)data; + + dd->is_async = true; + (void)dd->resume(dd); } static irqreturn_t atmel_sha_irq(int irq, void *dev_id)