From: Cyrille Pitchen <cyrille.pitchen@atmel.com> To: <herbert@gondor.apana.org.au>, <davem@davemloft.net>, <nicolas.ferre@atmel.com> Cc: <linux-crypto@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>, Cyrille Pitchen <cyrille.pitchen@atmel.com> Subject: [PATCH v2 03/12] crypto: atmel-sha: make atmel_sha_done_task more generic Date: Thu, 22 Dec 2016 17:37:52 +0100 [thread overview] Message-ID: <ab60d2a275a0ee7c544325c63e8d51444e887804.1482424395.git.cyrille.pitchen@atmel.com> (raw) In-Reply-To: <cover.1482424395.git.cyrille.pitchen@atmel.com> 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 <cyrille.pitchen@atmel.com> --- 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
WARNING: multiple messages have this Message-ID (diff)
From: cyrille.pitchen@atmel.com (Cyrille Pitchen) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 03/12] crypto: atmel-sha: make atmel_sha_done_task more generic Date: Thu, 22 Dec 2016 17:37:52 +0100 [thread overview] Message-ID: <ab60d2a275a0ee7c544325c63e8d51444e887804.1482424395.git.cyrille.pitchen@atmel.com> (raw) In-Reply-To: <cover.1482424395.git.cyrille.pitchen@atmel.com> 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 <cyrille.pitchen@atmel.com> --- 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
next prev parent reply other threads:[~2016-12-22 16:37 UTC|newest] Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-12-22 16:37 [PATCH v2 00/12] crypto: atmel-authenc: add support to authenc(hmac(shaX),Y(aes)) modes Cyrille Pitchen 2016-12-22 16:37 ` [PATCH v2 00/12] crypto: atmel-authenc: add support to authenc(hmac(shaX), Y(aes)) modes Cyrille Pitchen 2016-12-22 16:37 ` [PATCH v2 01/12] crypto: atmel-sha: create function to get an Atmel SHA device Cyrille Pitchen 2016-12-22 16:37 ` Cyrille Pitchen 2016-12-22 16:37 ` Cyrille Pitchen 2016-12-22 16:37 ` [PATCH v2 02/12] crypto: atmel-sha: update request queue management to make it more generic Cyrille Pitchen 2016-12-22 16:37 ` Cyrille Pitchen 2016-12-22 16:37 ` Cyrille Pitchen [this message] 2016-12-22 16:37 ` [PATCH v2 03/12] crypto: atmel-sha: make atmel_sha_done_task " Cyrille Pitchen 2016-12-22 16:37 ` [PATCH v2 04/12] crypto: atmel-sha: redefine SHA_FLAGS_SHA* flags to match SHA_MR_ALGO_SHA* Cyrille Pitchen 2016-12-22 16:37 ` Cyrille Pitchen 2016-12-22 16:37 ` [PATCH v2 05/12] crypto: atmel-sha: add atmel_sha_wait_for_data_ready() Cyrille Pitchen 2016-12-22 16:37 ` Cyrille Pitchen 2016-12-22 16:37 ` Cyrille Pitchen 2016-12-22 16:37 ` [PATCH v2 06/12] crypto: atmel-sha: add SHA_MR_MODE_IDATAR0 Cyrille Pitchen 2016-12-22 16:37 ` Cyrille Pitchen 2016-12-22 16:37 ` [PATCH v2 07/12] crypto: atmel-sha: add atmel_sha_cpu_start() Cyrille Pitchen 2016-12-22 16:37 ` Cyrille Pitchen 2016-12-22 16:37 ` [PATCH v2 08/12] crypto: atmel-sha: add simple DMA transfers Cyrille Pitchen 2016-12-22 16:37 ` Cyrille Pitchen 2016-12-22 16:37 ` [PATCH v2 09/12] crypto: atmel-sha: add support to hmac(shaX) Cyrille Pitchen 2016-12-22 16:37 ` Cyrille Pitchen 2016-12-22 16:37 ` [PATCH v2 10/12] crypto: atmel-aes: fix atmel_aes_handle_queue() Cyrille Pitchen 2016-12-22 16:37 ` Cyrille Pitchen 2016-12-22 16:38 ` [PATCH v2 11/12] crypto: atmel-authenc: add support to authenc(hmac(shaX),Y(aes)) modes Cyrille Pitchen 2016-12-22 16:38 ` [PATCH v2 11/12] crypto: atmel-authenc: add support to authenc(hmac(shaX), Y(aes)) modes Cyrille Pitchen 2016-12-22 21:10 ` [PATCH v2 11/12] crypto: atmel-authenc: add support to authenc(hmac(shaX),Y(aes)) modes kbuild test robot 2016-12-22 21:10 ` kbuild test robot 2016-12-23 11:34 ` [PATCH v2 11/12] crypto: atmel-authenc: add support to authenc(hmac(shaX), Y(aes)) modes Stephan Müller 2016-12-23 11:34 ` Stephan Müller 2016-12-23 11:34 ` [PATCH v2 11/12] crypto: atmel-authenc: add support to authenc(hmac(shaX),Y(aes)) modes Stephan Müller 2017-01-09 18:24 ` Cyrille Pitchen 2017-01-09 18:24 ` Cyrille Pitchen 2017-01-09 18:34 ` Stephan Müller 2017-01-09 18:34 ` [PATCH v2 11/12] crypto: atmel-authenc: add support to authenc(hmac(shaX), Y(aes)) modes Stephan Müller 2016-12-22 16:38 ` [PATCH v2 12/12] crypto: atmel-sha: add verbose debug facilities to print hw register names Cyrille Pitchen 2016-12-22 16:38 ` Cyrille Pitchen
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=ab60d2a275a0ee7c544325c63e8d51444e887804.1482424395.git.cyrille.pitchen@atmel.com \ --to=cyrille.pitchen@atmel.com \ --cc=davem@davemloft.net \ --cc=herbert@gondor.apana.org.au \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-crypto@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=nicolas.ferre@atmel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.