Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp2208039pxp; Mon, 21 Mar 2022 13:55:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyg1GMylzPokOfulFrCClohlaqq0x266m0Ando5d53Q7STRfJb67uzrfUbcRlPL2oTjabEk X-Received: by 2002:a17:903:1cb:b0:154:4bee:c034 with SMTP id e11-20020a17090301cb00b001544beec034mr8754847plh.155.1647896108522; Mon, 21 Mar 2022 13:55:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647896108; cv=none; d=google.com; s=arc-20160816; b=zCzLt3tEcSDrQzYY0BbRtPmpIfYHUqdkRjrN2V53yoNgAN0Sf9hMmwyeIaH7HS3pIM Gfc3OFdTxCLwHo9oVI1iZkV3E9Zx6ibhF4VJrENMTFTj+SQSJ3n0GjiJ5zJCcBVEwZRa MPWyU8JQzECiPDrJcW4KEVx1glDn3HiwoHnNsfG1Ow0+msfH7UI3um/2EClE0SR+6RHg Sh/DZyDovb/YTCyuJ10OnExTNATzbClfpgqfwXgd0YtYglfxHpZmh47v8O4m29drHpIA AERBJbBRiBtjRwVvyuWl2sG9ZPPioz8N3hXkkBVOz97wBEjM7Bngd/WlLdrmhhKKZdGG gg6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=UQNU+zESf8LDh+yao8Oc3gO6dXSE2ne6kHnyQ9VdhdQ=; b=V+l5ykb0+U5ZacoKfT1YKEyy3MsksvtFcNFSV0nF+ssGP9AGDyici6UKYB+wZZSKdR nz7LAfJF6jowCPbERBBBcJsm6K0GV789RSLUVgsm9sFuiDnKrgu4hokGmUwVl2Kald0M rT4UZ2HEAwkeLi0Lxfo99WAyAGZ8ru/B4jOH0qaf6J1wlx/JpwTRCFZgbu+gH1kQkXK3 PSn3x3GtSi1CabjmCAmeoO6bURI/wREkM7YkATgcRD5z+Y+f8letnLcPHEUJn6Hovodq 1PZeg0xi4r/TWGuiMfq1bxb5anfxvZTj0DXLYCMdXllevAmQFSsXFoOUEKdyhm2PBLHE ppXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20210112.gappssmtp.com header.s=20210112 header.b=bCWuedgE; spf=softfail (google.com: domain of transitioning linux-crypto-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id d195-20020a6336cc000000b003816043f02asi13895911pga.543.2022.03.21.13.55.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Mar 2022 13:55:08 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-crypto-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20210112.gappssmtp.com header.s=20210112 header.b=bCWuedgE; spf=softfail (google.com: domain of transitioning linux-crypto-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 7D31713F70; Mon, 21 Mar 2022 13:52:59 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352925AbiCUUJk (ORCPT + 99 others); Mon, 21 Mar 2022 16:09:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44032 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352941AbiCUUJh (ORCPT ); Mon, 21 Mar 2022 16:09:37 -0400 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 30618DC7 for ; Mon, 21 Mar 2022 13:07:56 -0700 (PDT) Received: by mail-wr1-x42c.google.com with SMTP id h23so21608086wrb.8 for ; Mon, 21 Mar 2022 13:07:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UQNU+zESf8LDh+yao8Oc3gO6dXSE2ne6kHnyQ9VdhdQ=; b=bCWuedgEdxQ7ZPcn7Zt8Lml8+iEWLNQVUY0rUru/QtoYn0MOrpEUsyLpekVCNDYCJ+ YeEdphO1oqFtPGEyEIBfxShBostEBw7ElvU8b5Hb6BRr+ZDTU7P2/s8WLpAcW4WNNjqL dy0io7iO7xqlE/pYqgFzVtYTt+zUOE5WjMEhFrPmLiCXtOIe/fMI6Hi/PRu9fzg36a70 YUfaeSodXPYFR5VsIiKvhxSORikLu9Gh6Ou8lcaBABQ6O6Z3AUI4FWn3jC+iEUihnC+y Jc4yvH4jmgX/8RFmeqAyG1h4DG/9+QCquKHhPAqEq2RVYHhlSVURqhgGR141duC/bvV1 B89Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UQNU+zESf8LDh+yao8Oc3gO6dXSE2ne6kHnyQ9VdhdQ=; b=AUtVcEjhIU1KNRyyoIDVgJ/Vot8UX1bhLPb2KzJAPviXzFP461uQXrjYo3VC0TYOeI yWMqbBlKZg/YUOUoDRUg19wjamKVswbPCQNPDArmAgmlWV1qdxx84qqxGHC+ORRuFUK1 Sfgvy9dPLo3lhgF0RAzT6CmA4S4T0xwcI/m6t9JKMj32f53bbWhag22AnN2Okiwl+QWb ohrou9w73rUvsvhqE2oPqtwv/0pkotZQlYDhoYKwGFoswuQ50zxdLX7eeTvwvxgWDBad Ma4waQERjX91wKosBnth8keh0ocdG7knW60oued6hFPX0qtzDNffHm1kF1q0qDeL+X5b LeHQ== X-Gm-Message-State: AOAM533pCP9Vrd2QbiIsXukof1kJkXED4breN6GwpJ+E1S9A9ATnl5FQ 47t1E2KUF0cf7XIgSeCh8XSdkQ== X-Received: by 2002:a5d:6442:0:b0:203:dff2:866c with SMTP id d2-20020a5d6442000000b00203dff2866cmr19241487wrw.465.1647893274691; Mon, 21 Mar 2022 13:07:54 -0700 (PDT) Received: from localhost.localdomain (laubervilliers-658-1-213-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.googlemail.com with ESMTPSA id i14-20020a0560001ace00b00203da1fa749sm24426988wry.72.2022.03.21.13.07.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Mar 2022 13:07:54 -0700 (PDT) From: Corentin Labbe To: heiko@sntech.de, herbert@gondor.apana.org.au, krzk+dt@kernel.org, mturquette@baylibre.com, robh+dt@kernel.org, sboyd@kernel.org Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Corentin Labbe Subject: [PATCH v3 07/26] crypto: rockchip: add fallback for ahash Date: Mon, 21 Mar 2022 20:07:20 +0000 Message-Id: <20220321200739.3572792-8-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220321200739.3572792-1-clabbe@baylibre.com> References: <20220321200739.3572792-1-clabbe@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RDNS_NONE, SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Adds a fallback for all case hardware cannot handle. Fixes: ce0183cb6464b ("crypto: rockchip - switch to skcipher API") Signed-off-by: Corentin Labbe --- drivers/crypto/rockchip/rk3288_crypto_ahash.c | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/drivers/crypto/rockchip/rk3288_crypto_ahash.c b/drivers/crypto/rockchip/rk3288_crypto_ahash.c index 49017d1fb510..16009bb0bf16 100644 --- a/drivers/crypto/rockchip/rk3288_crypto_ahash.c +++ b/drivers/crypto/rockchip/rk3288_crypto_ahash.c @@ -16,6 +16,40 @@ * so we put the fixed hash out when met zero message. */ +static bool rk_ahash_need_fallback(struct ahash_request *req) +{ + struct scatterlist *sg; + + sg = req->src; + while (sg) { + if (!IS_ALIGNED(sg->offset, sizeof(u32))) { + return true; + } + if (sg->length % 4) { + return true; + } + sg = sg_next(sg); + } + return false; +} + +static int rk_ahash_digest_fb(struct ahash_request *areq) +{ + struct rk_ahash_rctx *rctx = ahash_request_ctx(areq); + struct crypto_ahash *tfm = crypto_ahash_reqtfm(areq); + struct rk_ahash_ctx *tfmctx = crypto_ahash_ctx(tfm); + + ahash_request_set_tfm(&rctx->fallback_req, tfmctx->fallback_tfm); + rctx->fallback_req.base.flags = areq->base.flags & + CRYPTO_TFM_REQ_MAY_SLEEP; + + rctx->fallback_req.nbytes = areq->nbytes; + rctx->fallback_req.src = areq->src; + rctx->fallback_req.result = areq->result; + + return crypto_ahash_digest(&rctx->fallback_req); +} + static int zero_message_process(struct ahash_request *req) { struct crypto_ahash *tfm = crypto_ahash_reqtfm(req); @@ -167,6 +201,9 @@ static int rk_ahash_digest(struct ahash_request *req) struct rk_ahash_ctx *tctx = crypto_tfm_ctx(req->base.tfm); struct rk_crypto_info *dev = tctx->dev; + if (rk_ahash_need_fallback(req)) + return rk_ahash_digest_fb(req); + if (!req->nbytes) return zero_message_process(req); else @@ -309,6 +346,7 @@ static void rk_cra_hash_exit(struct crypto_tfm *tfm) struct rk_ahash_ctx *tctx = crypto_tfm_ctx(tfm); free_page((unsigned long)tctx->dev->addr_vir); + crypto_free_ahash(tctx->fallback_tfm); } struct rk_crypto_tmp rk_ahash_sha1 = { -- 2.34.1