From patchwork Wed Jun 1 08:56:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 9146687 X-Patchwork-Delegate: herbert@gondor.apana.org.au 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 D947360777 for ; Wed, 1 Jun 2016 08:58:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CFB581FF60 for ; Wed, 1 Jun 2016 08:58:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C454626538; Wed, 1 Jun 2016 08:58:08 +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=-5.9 required=2.0 tests=BAYES_00,FSL_HELO_HOME, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 77FCB1FF60 for ; Wed, 1 Jun 2016 08:58:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932438AbcFAI5x (ORCPT ); Wed, 1 Jun 2016 04:57:53 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:35537 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932249AbcFAI5v (ORCPT ); Wed, 1 Jun 2016 04:57:51 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id u518v4OH000364; Wed, 1 Jun 2016 03:57:04 -0500 Received: from DLEE70.ent.ti.com (dlee70.ent.ti.com [157.170.170.113]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id u518v8Vf019411; Wed, 1 Jun 2016 03:57:08 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.294.0; Wed, 1 Jun 2016 03:57:07 -0500 Received: from gomoku.home (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id u518ug0X002676; Wed, 1 Jun 2016 03:57:06 -0500 From: Tero Kristo To: , , , , CC: , , Tero Kristo Subject: [PATCH 08/28] crypto: omap-sham: implement context export/import APIs Date: Wed, 1 Jun 2016 11:56:09 +0300 Message-ID: <1464771389-10640-9-git-send-email-t-kristo@ti.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1464771389-10640-1-git-send-email-t-kristo@ti.com> References: <1464771389-10640-1-git-send-email-t-kristo@ti.com> MIME-Version: 1.0 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Context export/import are now required for ahash algorithms due to required support in algif_hash. Implement these for OMAP SHA driver, saving and restoring the internal state of the driver. Signed-off-by: Tero Kristo --- drivers/crypto/omap-sham.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c index 34ebe1d..321c097 100644 --- a/drivers/crypto/omap-sham.c +++ b/drivers/crypto/omap-sham.c @@ -1329,6 +1329,35 @@ static void omap_sham_cra_exit(struct crypto_tfm *tfm) pm_runtime_get_sync(dd->dev); } +static int omap_sham_export(struct ahash_request *req, void *out) +{ + struct crypto_ahash *tfm = crypto_ahash_reqtfm(req); + struct omap_sham_reqctx *rctx = ahash_request_ctx(req); + struct omap_sham_ctx *ctx = crypto_ahash_ctx(tfm); + struct omap_sham_hmac_ctx *bctx = ctx->base; + + memcpy(out, rctx, sizeof(*rctx) + BUFLEN); + memcpy(out + sizeof(*rctx) + BUFLEN, ctx, sizeof(*ctx)); + memcpy(out + sizeof(*rctx) + BUFLEN + sizeof(*ctx), bctx, + sizeof(*bctx)); + + return 0; +} + +static int omap_sham_import(struct ahash_request *req, const void *in) +{ + struct crypto_ahash *tfm = crypto_ahash_reqtfm(req); + struct omap_sham_reqctx *rctx = ahash_request_ctx(req); + struct omap_sham_ctx *ctx = crypto_ahash_ctx(tfm); + struct omap_sham_hmac_ctx *bctx = ctx->base; + + memcpy(rctx, in, sizeof(*rctx) + BUFLEN); + memcpy(ctx, in + sizeof(*rctx) + BUFLEN, sizeof(*ctx)); + memcpy(bctx, in + sizeof(*rctx) + BUFLEN + sizeof(*ctx), sizeof(*bctx)); + + return 0; +} + static struct ahash_alg algs_sha1_md5[] = { { .init = omap_sham_init, @@ -1980,8 +2009,15 @@ static int omap_sham_probe(struct platform_device *pdev) for (i = 0; i < dd->pdata->algs_info_size; i++) { for (j = 0; j < dd->pdata->algs_info[i].size; j++) { - err = crypto_register_ahash( - &dd->pdata->algs_info[i].algs_list[j]); + struct ahash_alg *alg; + + alg = &dd->pdata->algs_info[i].algs_list[j]; + alg->export = omap_sham_export; + alg->import = omap_sham_import; + alg->halg.statesize = sizeof(struct omap_sham_reqctx) + + sizeof(struct omap_sham_ctx) + + sizeof(struct omap_sham_hmac_ctx) + BUFLEN; + err = crypto_register_ahash(alg); if (err) goto err_algs;