From patchwork Wed Jan 3 20:11:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 123335 Delivered-To: patch@linaro.org Received: by 10.80.135.92 with SMTP id 28csp5916154edv; Wed, 3 Jan 2018 12:13:34 -0800 (PST) X-Google-Smtp-Source: ACJfBotPVhiRsRGqyOLkzFE9AWeIHPvixu6ajRTG+zynpq5J8DMLhXgkFc5D+ZxYp3XkmkGG57br X-Received: by 10.98.149.72 with SMTP id p69mr2511143pfd.76.1515010414064; Wed, 03 Jan 2018 12:13:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515010414; cv=none; d=google.com; s=arc-20160816; b=KcUmphbB9g/v5FLwFaEuRe2hA7Rrbf1v7boUAIYcfhXS3rWbsivj9I+bB9BDkxPfa8 f8KOH5TXc0Op9qSVl13Xo2Wk6uVoN5MpkwKouEZ1IIsUoB6PKP19us//ZpES82wiz/ue KYj5GQ75Zc25ZbjEVz7jmJv5mCsPtNRRQa+QK5MkkM1qWcMZLFIfxhKCUV66cuYDpDQa a0MmcJteNopS1d3FUSqui4TWi+eiUafrlXnhEUj1YSIb8+lenqKjzV1ooyWkqgEGvCV3 EPVS3cpGPHkXaZgPW9C2aFDwFG7//WnUj3O2DylyJMO4YZt9Tm+V11HxRKf0ILcJxN3C waBQ== 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:dkim-signature:arc-authentication-results; bh=jshDj9h+QKs88X5CaYnVSG6+6y6vGaTUjoZiRW7EPS4=; b=tQKMub4xF18IWh3Ey1mwCc8UJ7Tr9KuXjXaybhoY0ujA9OK6PhwjAhSYiidN5GBsDW 4Eiqd7Tl76kTGjRjrR4MQtHf+yqvyYgWY1asmG8O1dZGXs/Yw8+XfK9fRe0VZvnxQyk+ eW0yFGgv/Z2TeOMeNL4Q096jxNCv8bnEzG+7gXJQ2aF7eReN3g9ftiOW8FBwYqd6RgWi 2l50EJ2Iy0wsffql2E4uUNFbaEzfLAvEM7sYWczW7eBmHUuvNasrCcHESRBQRbkgzo3A KlnYC5Zb47MrOfjPWs53OkBXKXmoPDH2Ayr/0G8YdKyEQKLH8sEuCzrOujSLbkeYOzH3 xpHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=L2Jz0Cab; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f81si1143972pfh.346.2018.01.03.12.13.33; Wed, 03 Jan 2018 12:13:34 -0800 (PST) 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; dkim=pass header.i=@gmail.com header.s=20161025 header.b=L2Jz0Cab; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752239AbeACUNa (ORCPT + 28 others); Wed, 3 Jan 2018 15:13:30 -0500 Received: from mail-wr0-f193.google.com ([209.85.128.193]:46756 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752177AbeACUNZ (ORCPT ); Wed, 3 Jan 2018 15:13:25 -0500 Received: by mail-wr0-f193.google.com with SMTP id g17so2833103wrd.13; Wed, 03 Jan 2018 12:13:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jshDj9h+QKs88X5CaYnVSG6+6y6vGaTUjoZiRW7EPS4=; b=L2Jz0CabB/kZkazZAVZ3DKN/rt9WLneRWnwyxgnpmcsTp/PVkjfeUjxWdQRFAu4Wd+ rpVVAI3PXL3VynwNhtxikZwE7yEKCDd+BAgotOljAxxRe9JrcIS78C1s0/27I7xL1UoW RK+fwkp0pfhEXhfpdzvVamzCpWVgDxsbK4xOvGq9ZDZbsR0URlinbFAhCZa27z/W8kE/ ZvQPLVRdtJaLyvI4V+akBQMUyMr26HFRTJOrvzc2/QNkCxjXckgt45vfjkl7B0waseer JxwR5FHx1YnikOUIWTyUgLwlmJnRd+acDwoHb+ToZSGLaSdyARMau/Bf55cPaP4iGIfE 2G4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jshDj9h+QKs88X5CaYnVSG6+6y6vGaTUjoZiRW7EPS4=; b=BZB0qdcPOeyGb4jkyPO2XUMim/9mtvGh9xxgzlB1leZMRobdjPUoSIry9sdbuaR2dJ gAWx6bK4qvOIwKGhEhi6fWYyIPgit9pvD1FmvwaJRpJ9O01dIWeMRboP8S1nHpryvuPO rdR78RV5F9AtNISLrTOmoQ9ZtcOIkQzDVRjV8p4giNHUeJs5UNLt5PeFw3ihwnjtR01k dLfKg42/TE80OegNU0gRrvQfg2WYSmVGYXNLRNyFWwsVUeg7VqhysQDTjxbwP86f7+GH /5gPApZkFkdsaQWm+9Wtb/zall9oxzO7+noxowYG/UBCVwpL6DEAWLzcB83EftsRacPU zHiQ== X-Gm-Message-State: AKGB3mIJEUdAUoGVY8fGlPVAWaOdwhCYBs703tyQxdeehOn2Bd1ueryZ GfedUzWuKL9KVPSSps0jhtw= X-Received: by 10.223.157.135 with SMTP id p7mr2735228wre.204.1515010403796; Wed, 03 Jan 2018 12:13:23 -0800 (PST) Received: from Red.local (LFbn-1-6953-20.w90-116.abo.wanadoo.fr. [90.116.134.20]) by smtp.googlemail.com with ESMTPSA id p90sm1800627wmf.3.2018.01.03.12.13.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 12:13:23 -0800 (PST) From: Corentin Labbe To: alexandre.torgue@st.com, arei.gonglei@huawei.com, corbet@lwn.net, davem@davemloft.net, herbert@gondor.apana.org.au, jasowang@redhat.com, mcoquelin.stm32@gmail.com, mst@redhat.com Cc: linux-arm-kernel@lists.infradead.org, linux-crypto@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, fabien.dessenne@st.com, Corentin Labbe Subject: [PATCH 3/6] crypto: omap: convert to new crypto engine API Date: Wed, 3 Jan 2018 21:11:06 +0100 Message-Id: <20180103201109.16077-4-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180103201109.16077-1-clabbe.montjoie@gmail.com> References: <20180103201109.16077-1-clabbe.montjoie@gmail.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch convert the driver to the new crypto engine API. Signed-off-by: Corentin Labbe --- drivers/crypto/omap-aes.c | 17 +++++++++++++---- drivers/crypto/omap-aes.h | 3 +++ drivers/crypto/omap-des.c | 20 ++++++++++++++++---- 3 files changed, 32 insertions(+), 8 deletions(-) -- 2.13.6 diff --git a/drivers/crypto/omap-aes.c b/drivers/crypto/omap-aes.c index fbec0a2e76dd..518b94628166 100644 --- a/drivers/crypto/omap-aes.c +++ b/drivers/crypto/omap-aes.c @@ -414,8 +414,9 @@ static int omap_aes_handle_queue(struct omap_aes_dev *dd, } static int omap_aes_prepare_req(struct crypto_engine *engine, - struct ablkcipher_request *req) + void *areq) { + struct ablkcipher_request *req = container_of(areq, struct ablkcipher_request, base); struct omap_aes_ctx *ctx = crypto_ablkcipher_ctx( crypto_ablkcipher_reqtfm(req)); struct omap_aes_reqctx *rctx = ablkcipher_request_ctx(req); @@ -468,8 +469,9 @@ static int omap_aes_prepare_req(struct crypto_engine *engine, } static int omap_aes_crypt_req(struct crypto_engine *engine, - struct ablkcipher_request *req) + void *areq) { + struct ablkcipher_request *req = container_of(areq, struct ablkcipher_request, base); struct omap_aes_reqctx *rctx = ablkcipher_request_ctx(req); struct omap_aes_dev *dd = rctx->dd; @@ -601,6 +603,11 @@ static int omap_aes_ctr_decrypt(struct ablkcipher_request *req) return omap_aes_crypt(req, FLAGS_CTR); } +static int omap_aes_prepare_req(struct crypto_engine *engine, + void *req); +static int omap_aes_crypt_req(struct crypto_engine *engine, + void *req); + static int omap_aes_cra_init(struct crypto_tfm *tfm) { const char *name = crypto_tfm_alg_name(tfm); @@ -616,6 +623,10 @@ static int omap_aes_cra_init(struct crypto_tfm *tfm) tfm->crt_ablkcipher.reqsize = sizeof(struct omap_aes_reqctx); + ctx->enginectx.op.prepare_request = omap_aes_prepare_req; + ctx->enginectx.op.unprepare_request = NULL; + ctx->enginectx.op.do_one_request = omap_aes_crypt_req; + return 0; } @@ -1119,8 +1130,6 @@ static int omap_aes_probe(struct platform_device *pdev) goto err_engine; } - dd->engine->prepare_cipher_request = omap_aes_prepare_req; - dd->engine->cipher_one_request = omap_aes_crypt_req; err = crypto_engine_start(dd->engine); if (err) goto err_engine; diff --git a/drivers/crypto/omap-aes.h b/drivers/crypto/omap-aes.h index 8906342e2b9a..f6ce94907ade 100644 --- a/drivers/crypto/omap-aes.h +++ b/drivers/crypto/omap-aes.h @@ -13,6 +13,8 @@ #ifndef __OMAP_AES_H__ #define __OMAP_AES_H__ +#include + #define DST_MAXBURST 4 #define DMA_MIN (DST_MAXBURST * sizeof(u32)) @@ -95,6 +97,7 @@ struct omap_aes_gcm_result { }; struct omap_aes_ctx { + struct crypto_engine_reqctx enginectx; int keylen; u32 key[AES_KEYSIZE_256 / sizeof(u32)]; u8 nonce[4]; diff --git a/drivers/crypto/omap-des.c b/drivers/crypto/omap-des.c index ebc5c0f11f03..c6a3b0490616 100644 --- a/drivers/crypto/omap-des.c +++ b/drivers/crypto/omap-des.c @@ -86,6 +86,7 @@ #define FLAGS_OUT_DATA_ST_SHIFT 10 struct omap_des_ctx { + struct crypto_engine_reqctx enginectx; struct omap_des_dev *dd; int keylen; @@ -526,8 +527,9 @@ static int omap_des_handle_queue(struct omap_des_dev *dd, } static int omap_des_prepare_req(struct crypto_engine *engine, - struct ablkcipher_request *req) + void *areq) { + struct ablkcipher_request *req = container_of(areq, struct ablkcipher_request, base); struct omap_des_ctx *ctx = crypto_ablkcipher_ctx( crypto_ablkcipher_reqtfm(req)); struct omap_des_dev *dd = omap_des_find_dev(ctx); @@ -582,8 +584,9 @@ static int omap_des_prepare_req(struct crypto_engine *engine, } static int omap_des_crypt_req(struct crypto_engine *engine, - struct ablkcipher_request *req) + void *areq) { + struct ablkcipher_request *req = container_of(areq, struct ablkcipher_request, base); struct omap_des_ctx *ctx = crypto_ablkcipher_ctx( crypto_ablkcipher_reqtfm(req)); struct omap_des_dev *dd = omap_des_find_dev(ctx); @@ -695,12 +698,23 @@ static int omap_des_cbc_decrypt(struct ablkcipher_request *req) return omap_des_crypt(req, FLAGS_CBC); } +static int omap_des_prepare_req(struct crypto_engine *engine, + void *areq); +static int omap_des_crypt_req(struct crypto_engine *engine, + void *areq); + static int omap_des_cra_init(struct crypto_tfm *tfm) { + struct omap_des_ctx *ctx = crypto_tfm_ctx(tfm); + pr_debug("enter\n"); tfm->crt_ablkcipher.reqsize = sizeof(struct omap_des_reqctx); + ctx->enginectx.op.prepare_request = omap_des_prepare_req; + ctx->enginectx.op.unprepare_request = NULL; + ctx->enginectx.op.do_one_request = omap_des_crypt_req; + return 0; } @@ -1046,8 +1060,6 @@ static int omap_des_probe(struct platform_device *pdev) goto err_engine; } - dd->engine->prepare_cipher_request = omap_des_prepare_req; - dd->engine->cipher_one_request = omap_des_crypt_req; err = crypto_engine_start(dd->engine); if (err) goto err_engine;