Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965789AbcLVQQy (ORCPT ); Thu, 22 Dec 2016 11:16:54 -0500 Received: from smtpout.microchip.com ([198.175.253.82]:30258 "EHLO email.microchip.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965439AbcLVQPX (ORCPT ); Thu, 22 Dec 2016 11:15:23 -0500 From: Cyrille Pitchen To: , , CC: , , , Cyrille Pitchen Subject: [PATCH 03/12] crypto: atmel-sha: make atmel_sha_done_task more generic Date: Thu, 22 Dec 2016 17:15:08 +0100 Message-ID: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain X-Brightmail-Tracker: H4sIAAAAAAAAC+NgFupiVWLjYuHi8mHRlfoTHWHwfdHcN7wWhxdOYbR48L6TxWLa9HfMFvc+bWO06JiyismBNYAhijUzLym/IoE149O27cwFvUIVu9buZm9gvMfXxcjFISSwnlHiePtvli5GTg42AUOJtw+OsoLYIgKBEgtbXjGCFDELTGeUeLD6HTtIQljAX2L6xKtMIDaLgKrEs29ngJo5OHgF4iWWblMGCUsIyEncPNfJDGJzCthKPL57D2ymkICNxP+Vd8FsXgFBiZMzn4DtZRaQkDj44gUzRI0a0N4VzBBzAiV+v2tihLCdJJ6vu8kGYdtJHJ5+kR3CdpDoWvCbGabm6eOLULa2xPZX+1ghbB2JbQf7WSBsW4k9MyYyQdjuEg8eLYeyfSVmPWyAqomSaFuymW0Co8QsJKfOQnLqAkamVYzSzh5+usFhuq4Rzh4G5nq5yRkFurmJmXl6yfm5mxgh8ZSzg3HyJP9DjJIcTEqivFsnnQ8X4kvKT6nMSCzOiC8qzUktPsQowcGjJMLLvwwox1tckJhbnJkOk5Lh4FCS4H28FCglWJSanlqRlplTkloEkT7FKCklzvsRJCkA0pdRmgeXu8QoKiXMGwWS4ylILcrNLIGI32IU5njIJMSSl5+XKgV0IgMQaDC+YhTnYFQS5pUGuYEnM68E7oRXQNcxAV23bvdpkOtKEhFSUg2M+iuLTOMfmc377Murxrg3Izm7ca1WhZ3dfaZNrMfc7vXLHtX1O/E8eVaAD+e5pLra2UfsdYvmH+ApED/2/XdeWfvJYsOtivUPKmV+JT54PXNfbIr8zzUW21rNJ508czZQ+kRa7A7xqxV6TcK12QxP3W7eFHzKWGY1ZbOL1p+t6qz25jeMZFKVWIozEg21mIuKEwEKkuXjHQMAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2236 Lines: 79 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) -- 2.7.4