From nobody Sun May 10 19:51:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7C130C433EF for ; Mon, 25 Apr 2022 20:21:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245207AbiDYUYk (ORCPT ); Mon, 25 Apr 2022 16:24:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245191AbiDYUYg (ORCPT ); Mon, 25 Apr 2022 16:24:36 -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 22CA81240F3 for ; Mon, 25 Apr 2022 13:21:30 -0700 (PDT) Received: by mail-wr1-x42c.google.com with SMTP id k2so2042526wrd.5 for ; Mon, 25 Apr 2022 13:21:30 -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=6k9bKJA41frCR0pmOk9SA+9AKNxBSbRS1tpgQTa/e4I=; b=iVygEJI5sek2lCtA59VX0g2JTIJPfOrprLb1yt1gSc9dKlRNF6I2HxVGvcgvHWQ5+C CVTZpYxmmAD90VQBw2Y7JOjoqSBExuo+c1v7tRMMiNhmYj7a+qBVKH/wLVLKybiHijS2 aP/cqx5SBHi8lfTlWU+dbwlIx8Z4fX0o3gqObjYJ1RKSvRQEM/ws84ZfQB0gtaUx1466 q1aHDyUYVAdvJY9hi5QKmoIaMnvweM44muPrdT7b55ziPfU1BEazN6/PXKKm+x5qbld2 FEeqSN/bzwHM1wlVEHYOLRnKocb3EJHrXg2gB4H3S22jCZgxHJVArk/QCPhDzvqVAqQk 2krw== 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=6k9bKJA41frCR0pmOk9SA+9AKNxBSbRS1tpgQTa/e4I=; b=FR4REJa30NXadXAlkXyqUkqZfZZCq16hddCg4UcJBxJEvA/uzMhPfxKOlh0MXI2Sun VdaHKVC0Hvzo8pjfpaR7wnLM5ISUWMUSDvcafp6kexpg6wdpA9OYL2TS6dTJIN9ZBa0y 8Yz25WkY7pYK+iucCNgPA11eXunnn7OEYbDQFzuP9WW9LBKb6+gFBTJrZzdvaY7auqsC ALM6IJPXotjN8ejYHZf52swyv9ouVOx2EmARuQqedbtWKhNNnHgY8ahOYIOpQqFvgbSX pVzGGj56BWbKt1zQpRaSAkzG0PkXAJ/Et4de8UKzZV0KWC5QCHQDt807V9bn5WTXFqmR 3+9Q== X-Gm-Message-State: AOAM532Iw/j76O6r5Zb/5rLPnly4gxgMr7J5WeXJCVuRdiwVVlBoamtG cMu7O5mbyyfL+EUfbGx0qYcc1w== X-Google-Smtp-Source: ABdhPJwFGMyIGVr2bDkLKpz3m2r4r/xoym7+kMDjAI//J76Valv15mCRD8UaLNFfa1MROLOkLnNQJA== X-Received: by 2002:a05:6000:156d:b0:20a:e015:315f with SMTP id 13-20020a056000156d00b0020ae015315fmr2982111wrz.140.1650918088724; Mon, 25 Apr 2022 13:21:28 -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 p3-20020a5d59a3000000b0020a9132d1fbsm11101003wrr.37.2022.04.25.13.21.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 13:21:28 -0700 (PDT) From: Corentin Labbe To: heiko@sntech.de, herbert@gondor.apana.org.au, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org Cc: linux-crypto@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Corentin Labbe Subject: [PATCH v6 01/33] crypto: rockchip: use dev_err for error message about interrupt Date: Mon, 25 Apr 2022 20:20:47 +0000 Message-Id: <20220425202119.3566743-2-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220425202119.3566743-1-clabbe@baylibre.com> References: <20220425202119.3566743-1-clabbe@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Interrupt is mandatory so the message should be printed as error. Signed-off-by: Corentin Labbe --- drivers/crypto/rockchip/rk3288_crypto.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/crypto/rockchip/rk3288_crypto.c b/drivers/crypto/rockc= hip/rk3288_crypto.c index 35d73061d156..45cc5f766788 100644 --- a/drivers/crypto/rockchip/rk3288_crypto.c +++ b/drivers/crypto/rockchip/rk3288_crypto.c @@ -371,8 +371,7 @@ static int rk_crypto_probe(struct platform_device *pdev) =20 crypto_info->irq =3D platform_get_irq(pdev, 0); if (crypto_info->irq < 0) { - dev_warn(crypto_info->dev, - "control Interrupt is not available.\n"); + dev_err(&pdev->dev, "control Interrupt is not available.\n"); err =3D crypto_info->irq; goto err_crypto; } --=20 2.35.1 From nobody Sun May 10 19:51:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9E292C433EF for ; Mon, 25 Apr 2022 20:21:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245250AbiDYUYq (ORCPT ); Mon, 25 Apr 2022 16:24:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38640 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245198AbiDYUYg (ORCPT ); Mon, 25 Apr 2022 16:24:36 -0400 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 59178124D86 for ; Mon, 25 Apr 2022 13:21:31 -0700 (PDT) Received: by mail-wm1-x32a.google.com with SMTP id u17-20020a05600c211100b0038eaf4cdaaeso251992wml.1 for ; Mon, 25 Apr 2022 13:21:31 -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=yV669w6ThAcunb2ptGEHL08NqOMgexsX7UsYGNNFxgw=; b=dI5RMWQEfNwOiJWNjQByihhh2EF9r/7KiCccoj1Z85lHvuo2cKvBRm0C8hgIwI+UWQ ibGR/ObFkwHqTvrcVk9Z9zqn3MYPWvbjdOsZGzmHN30Hv5qKaMIw6pgYNWVi7mYoUQOp ggRUfIIO5YkvMWpRFwK3pD/riKDox7f9X00q6tsJnwhES1xCKTqRRr2V5QeznTCzGXKm 30dLwbBr4gw9Sa5bGallbQTciVH2C4KbAq+OlDBuuVL1HqsH96f6X4HIC5Swce9imECd 7v+Wx3FtNnjyWU95xp+wDeSeBZwJzpLFP7+LnXTE6/537Xl4nCzbSIjGMJNSB1F2bfDy B0Rg== 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=yV669w6ThAcunb2ptGEHL08NqOMgexsX7UsYGNNFxgw=; b=poHr9rdw9sx33lJZGv851OdJu4yLysj6WIMUREzOfGjpaU6y0Cu1kIGeD/1OZl+8gp wc2c6w7KrfcZIoewlc78ihbX89plbyqD2rEzh7YQfzB51a3jCa4CYdjYx9VswgaprV/2 eodnSmRkJVO/7iG8jau4BTGUQoIYeR4Qu2rngrqLripHZxXPmBDRxiBfwcu34wIL6Flf WhXnguxUFx83zqnGxxahJhefwr0sd+nL7Yl2TfPL9td+SE+8qeYgRG+f9BRhhXyGYJjb hYIRfiUiK92BUNj8JzeWv5YeZewEcDXQwO2+2R+BmWelIWx6SPeid2NSzzUP+8YjCxbW //pA== X-Gm-Message-State: AOAM530JxzZg4w5s0R9NRAwSlJcXzbkrx/u/CKsYj80NRoRe8g/xJt51 m7PgPsxHU/jJOkZ23GtXePCsOPMtciPzuA== X-Google-Smtp-Source: ABdhPJzf+IWyaPzP6ab2c63O2WXiPtIH/R7xsVInXnktPeeMpfP6sz3SI8RQ7FqDcmI0Jt60tCRbDQ== X-Received: by 2002:a7b:c403:0:b0:38e:7c57:9af7 with SMTP id k3-20020a7bc403000000b0038e7c579af7mr17528292wmi.144.1650918089738; Mon, 25 Apr 2022 13:21:29 -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 p3-20020a5d59a3000000b0020a9132d1fbsm11101003wrr.37.2022.04.25.13.21.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 13:21:29 -0700 (PDT) From: Corentin Labbe To: heiko@sntech.de, herbert@gondor.apana.org.au, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org Cc: linux-crypto@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Corentin Labbe Subject: [PATCH v6 02/33] crypto: rockchip: do not use uninitialized variable Date: Mon, 25 Apr 2022 20:20:48 +0000 Message-Id: <20220425202119.3566743-3-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220425202119.3566743-1-clabbe@baylibre.com> References: <20220425202119.3566743-1-clabbe@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" crypto_info->dev is not yet set, so use pdev->dev instead. Signed-off-by: Corentin Labbe --- drivers/crypto/rockchip/rk3288_crypto.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/crypto/rockchip/rk3288_crypto.c b/drivers/crypto/rockc= hip/rk3288_crypto.c index 45cc5f766788..21d3f1458584 100644 --- a/drivers/crypto/rockchip/rk3288_crypto.c +++ b/drivers/crypto/rockchip/rk3288_crypto.c @@ -381,7 +381,7 @@ static int rk_crypto_probe(struct platform_device *pdev) "rk-crypto", pdev); =20 if (err) { - dev_err(crypto_info->dev, "irq request failed.\n"); + dev_err(&pdev->dev, "irq request failed.\n"); goto err_crypto; } =20 --=20 2.35.1 From nobody Sun May 10 19:51:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 718A0C43219 for ; Mon, 25 Apr 2022 20:21:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245242AbiDYUYn (ORCPT ); Mon, 25 Apr 2022 16:24:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38670 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245203AbiDYUYh (ORCPT ); Mon, 25 Apr 2022 16:24: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 1FD6D1267DA for ; Mon, 25 Apr 2022 13:21:32 -0700 (PDT) Received: by mail-wr1-x42c.google.com with SMTP id d5so7271849wrb.6 for ; Mon, 25 Apr 2022 13:21:32 -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=7/VLG1dlj3zpu6COMXUYDrFqGjEneQqP9DO34Aaku7s=; b=4uH4j3ch+yXi4leFKe7In9qqcSBrcYprSU1GattxAeiSDEiZHfjvtDhw4lkCz8MmSd ePFKS4e99hp0zY7CwSWWuXWG9i9BhL/RYw3OOptcI+NsSM2qv2hCfZ7NwG6tR/iVIqSv IWCNlEvXri+jITLqk4uJms0yKb2uyWNtX0eGABARXI4a6CEifICBD4K8E3fEyWDNvGsb 8ju07MIlt2wVtDwfI1LVuafp9xbWNbhx5xDWu+vL6hOOpscsPryhbZvAxTWQr76VsL2l M4u/ZOIQBxK/cvB4Hq4WHbhFl3f8NXuDoCPPniQFty2/fsbLL9u+2wyk9dI1rgN8H8TR O9sw== 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=7/VLG1dlj3zpu6COMXUYDrFqGjEneQqP9DO34Aaku7s=; b=dRHN8LrfALvxfqxxCUBE3T16kDvwcGXbwGwAh+ORv1pWju9ZxQAVOVu/r5P9o5MyO3 rVdOZQJiadmIgD7PNc03TbUuAZWmaVBAUGSZ6OdMXzh3KaS5SOFptayi6Q9C2mg+M6e2 bFyogi1eTDr008xSDOshJi79GjO3EetpVViVO7d5Vtp1uE1tpM8u4SAAnG2bxox/8wQp +8V6n3DOjmK6NwWhDhXUovRL84EMPIZpqVvtJXyAzXF1IUH1JE7nELQHgH6hgRZ7ZhR4 ZkDhlJYNkWbMWWX7M+EaGZMczUP02U0Gbjy4IghqJh0nw3n4k4oh/eF3YO3gSnyNcbOW Zp/A== X-Gm-Message-State: AOAM5330oIaEoaiYra8DZyP/ysll9xjuzhGthoO5zZ7f3xAai4kwVVEf pKFXfK5YVMq4LQ05+az54dnPVg== X-Google-Smtp-Source: ABdhPJynU8/kJdnZEBZ5SifGxxFydrn4IAUA7zi/7vStRZMfRuUEBxhsUEiApXBUoraa1avzz8vMxg== X-Received: by 2002:a05:6000:1547:b0:20a:79dd:28bf with SMTP id 7-20020a056000154700b0020a79dd28bfmr15140151wry.505.1650918090642; Mon, 25 Apr 2022 13:21:30 -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 p3-20020a5d59a3000000b0020a9132d1fbsm11101003wrr.37.2022.04.25.13.21.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 13:21:30 -0700 (PDT) From: Corentin Labbe To: heiko@sntech.de, herbert@gondor.apana.org.au, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org Cc: linux-crypto@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Corentin Labbe Subject: [PATCH v6 03/33] crypto: rockchip: do not do custom power management Date: Mon, 25 Apr 2022 20:20:49 +0000 Message-Id: <20220425202119.3566743-4-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220425202119.3566743-1-clabbe@baylibre.com> References: <20220425202119.3566743-1-clabbe@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The clock enable/disable at tfm init/exit is fragile, if 2 tfm are init in the same time and one is removed just after, it will leave the hardware uncloked even if a user remains. Instead simply enable clocks at probe time. We will do PM later. Fixes: ce0183cb6464b ("crypto: rockchip - switch to skcipher API") Signed-off-by: Corentin Labbe --- drivers/crypto/rockchip/rk3288_crypto.c | 4 ++-- drivers/crypto/rockchip/rk3288_crypto.h | 2 -- drivers/crypto/rockchip/rk3288_crypto_ahash.c | 3 +-- drivers/crypto/rockchip/rk3288_crypto_skcipher.c | 5 +++-- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/crypto/rockchip/rk3288_crypto.c b/drivers/crypto/rockc= hip/rk3288_crypto.c index 21d3f1458584..4cff49b82983 100644 --- a/drivers/crypto/rockchip/rk3288_crypto.c +++ b/drivers/crypto/rockchip/rk3288_crypto.c @@ -394,8 +394,7 @@ static int rk_crypto_probe(struct platform_device *pdev) rk_crypto_done_task_cb, (unsigned long)crypto_info); crypto_init_queue(&crypto_info->queue, 50); =20 - crypto_info->enable_clk =3D rk_crypto_enable_clk; - crypto_info->disable_clk =3D rk_crypto_disable_clk; + rk_crypto_enable_clk(crypto_info); crypto_info->load_data =3D rk_load_data; crypto_info->unload_data =3D rk_unload_data; crypto_info->enqueue =3D rk_crypto_enqueue; @@ -422,6 +421,7 @@ static int rk_crypto_remove(struct platform_device *pde= v) struct rk_crypto_info *crypto_tmp =3D platform_get_drvdata(pdev); =20 rk_crypto_unregister(); + rk_crypto_disable_clk(crypto_tmp); tasklet_kill(&crypto_tmp->done_task); tasklet_kill(&crypto_tmp->queue_task); return 0; diff --git a/drivers/crypto/rockchip/rk3288_crypto.h b/drivers/crypto/rockc= hip/rk3288_crypto.h index 97278c2574ff..2fa7131e4060 100644 --- a/drivers/crypto/rockchip/rk3288_crypto.h +++ b/drivers/crypto/rockchip/rk3288_crypto.h @@ -220,8 +220,6 @@ struct rk_crypto_info { int (*start)(struct rk_crypto_info *dev); int (*update)(struct rk_crypto_info *dev); void (*complete)(struct crypto_async_request *base, int err); - int (*enable_clk)(struct rk_crypto_info *dev); - void (*disable_clk)(struct rk_crypto_info *dev); int (*load_data)(struct rk_crypto_info *dev, struct scatterlist *sg_src, struct scatterlist *sg_dst); diff --git a/drivers/crypto/rockchip/rk3288_crypto_ahash.c b/drivers/crypto= /rockchip/rk3288_crypto_ahash.c index ed03058497bc..49017d1fb510 100644 --- a/drivers/crypto/rockchip/rk3288_crypto_ahash.c +++ b/drivers/crypto/rockchip/rk3288_crypto_ahash.c @@ -301,7 +301,7 @@ static int rk_cra_hash_init(struct crypto_tfm *tfm) sizeof(struct rk_ahash_rctx) + crypto_ahash_reqsize(tctx->fallback_tfm)); =20 - return tctx->dev->enable_clk(tctx->dev); + return 0; } =20 static void rk_cra_hash_exit(struct crypto_tfm *tfm) @@ -309,7 +309,6 @@ static void rk_cra_hash_exit(struct crypto_tfm *tfm) struct rk_ahash_ctx *tctx =3D crypto_tfm_ctx(tfm); =20 free_page((unsigned long)tctx->dev->addr_vir); - return tctx->dev->disable_clk(tctx->dev); } =20 struct rk_crypto_tmp rk_ahash_sha1 =3D { diff --git a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c b/drivers/cry= pto/rockchip/rk3288_crypto_skcipher.c index 5bbf0d2722e1..8c44a19eab75 100644 --- a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c +++ b/drivers/crypto/rockchip/rk3288_crypto_skcipher.c @@ -388,8 +388,10 @@ static int rk_ablk_init_tfm(struct crypto_skcipher *tf= m) ctx->dev->update =3D rk_ablk_rx; ctx->dev->complete =3D rk_crypto_complete; ctx->dev->addr_vir =3D (char *)__get_free_page(GFP_KERNEL); + if (!ctx->dev->addr_vir) + return -ENOMEM; =20 - return ctx->dev->addr_vir ? ctx->dev->enable_clk(ctx->dev) : -ENOMEM; + return 0; } =20 static void rk_ablk_exit_tfm(struct crypto_skcipher *tfm) @@ -397,7 +399,6 @@ static void rk_ablk_exit_tfm(struct crypto_skcipher *tf= m) struct rk_cipher_ctx *ctx =3D crypto_skcipher_ctx(tfm); =20 free_page((unsigned long)ctx->dev->addr_vir); - ctx->dev->disable_clk(ctx->dev); } =20 struct rk_crypto_tmp rk_ecb_aes_alg =3D { --=20 2.35.1 From nobody Sun May 10 19:51:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 31F5DC433F5 for ; Mon, 25 Apr 2022 20:21:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245265AbiDYUY5 (ORCPT ); Mon, 25 Apr 2022 16:24:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245215AbiDYUYk (ORCPT ); Mon, 25 Apr 2022 16:24:40 -0400 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DEAA41240E7 for ; Mon, 25 Apr 2022 13:21:32 -0700 (PDT) Received: by mail-wr1-x42f.google.com with SMTP id s21so7783697wrb.8 for ; Mon, 25 Apr 2022 13:21:32 -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=w4B/nkw6c+X0giFcf3xLDnzS4+ocxAJWfds+bZ7Txos=; b=cjdUL5ziwMdVVzxEZfjvHaBI6lZy+g4kq+A+FnrRkmEkrc1OCo1c8EOePImy851jRh VtX6/UqmPqERLcaYk7hQUdHDg/s12FxN3i5UtlSfCAkMklTiyFCXjfj42xGgCic9g/nX bUZzne+cMIxyiImXuVpHZWU9rYO9rgS99eCwtWZvNymgjGqQWEqibDQIHjTCZ+lfjcus NhZDP6bEC32OZSBmgcQp76ToZliVUG5jBSMPXKUeK7hTUPSePsFXyGNqa56shlptqGQF ok0UC9qZerwTR6GhsZ2B4vzKk17v+JS1MM4dO1v2ht5xnVgCrJb3PjAWcCCIG43qYn/p p3hQ== 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=w4B/nkw6c+X0giFcf3xLDnzS4+ocxAJWfds+bZ7Txos=; b=RDZ3kLmYVdAS5UEdoNxoBZqKwD9I9Bw1RV+hCRXRRZ+InDeJpIFrdHbBAK0CP4Zvhg kjbPhF0k84fz6qhTiAX5ygS8HLzw6Uj2QT08vvI+C+dLAyqdFWq160+31SvhOmX8ialw GXvDGTtINpIDwqv1lBRiVCyic3+wpucb3RNt3cov4DUYz6Gpk4sCUmt5TgNiy0uVspV6 DIT2RVsybstWSIQ/Hd6GOYkR/JQyd00I8MrlGI8ZU3TEo/6e9alXvCx0Y5FyWr4ksxgm dz+KHHuiNougWcJzrYr8qEb8D4zSRQ4G0gQUdPTrDnO/F8ZovNPjw1eeiNkPUsQvAFb4 oXrQ== X-Gm-Message-State: AOAM531w0FDihwYmH8Hgbg9p+vgePm5Yc6l2orY2izqD+0c5aIZgLlES 72KVgVQ8UabmguQ/J//DCSw9vw== X-Google-Smtp-Source: ABdhPJzL6+kxK9MVCVjQ4Y/GIq9uyP+e4ezvDNb7cOKbfr1jUlJXTmUrz7NENZTHhyxXzHwxo+k7QQ== X-Received: by 2002:adf:c64c:0:b0:20a:79c7:4bf2 with SMTP id u12-20020adfc64c000000b0020a79c74bf2mr15549306wrg.587.1650918091538; Mon, 25 Apr 2022 13:21:31 -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 p3-20020a5d59a3000000b0020a9132d1fbsm11101003wrr.37.2022.04.25.13.21.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 13:21:31 -0700 (PDT) From: Corentin Labbe To: heiko@sntech.de, herbert@gondor.apana.org.au, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org Cc: linux-crypto@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Corentin Labbe Subject: [PATCH v6 04/33] crypto: rockchip: fix privete/private typo Date: Mon, 25 Apr 2022 20:20:50 +0000 Message-Id: <20220425202119.3566743-5-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220425202119.3566743-1-clabbe@baylibre.com> References: <20220425202119.3566743-1-clabbe@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This fix a simple typo on private word. Signed-off-by: Corentin Labbe --- drivers/crypto/rockchip/rk3288_crypto.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/crypto/rockchip/rk3288_crypto.h b/drivers/crypto/rockc= hip/rk3288_crypto.h index 2fa7131e4060..656d6795d400 100644 --- a/drivers/crypto/rockchip/rk3288_crypto.h +++ b/drivers/crypto/rockchip/rk3288_crypto.h @@ -235,7 +235,7 @@ struct rk_ahash_ctx { struct crypto_ahash *fallback_tfm; }; =20 -/* the privete variable of hash for fallback */ +/* the private variable of hash for fallback */ struct rk_ahash_rctx { struct ahash_request fallback_req; u32 mode; --=20 2.35.1 From nobody Sun May 10 19:51:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 146F2C433F5 for ; Mon, 25 Apr 2022 20:21:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245229AbiDYUYy (ORCPT ); Mon, 25 Apr 2022 16:24:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38964 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245201AbiDYUYj (ORCPT ); Mon, 25 Apr 2022 16:24:39 -0400 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D2EED1240E8 for ; Mon, 25 Apr 2022 13:21:33 -0700 (PDT) Received: by mail-wr1-x429.google.com with SMTP id j15so9233046wrb.2 for ; Mon, 25 Apr 2022 13:21:33 -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=kQ7tISy8K+0cgFIOzo6JwID81BS3DiD07ImA91vTtec=; b=fl6sfDhUhX+TIGs0u+nDDV3ypFVam6b4nSqoSahuILKhkmBwJMU8qioNb5S0zrnL25 4Wa95bIPjGm8rOjWdXlnn/0xWKDyLlWzk+giTyDV01ahFpIeLsVk3vRcaAiKgt+qJUx0 SJkp7LpH5jyG14Ng5NeXjErph/LlVxicAbC5xLcwN7KLL6CPOWg3S1LE8EJ1n5lK6PSe D2JenCYUB0TZhNSBO1OY3E4gGVapS62ehJisNc5EJGaVVN7RY2in7YXlxYzo44PThyu6 JCaUBAnNGfgqMnGEKnRQvrdrHo8Jdv15wSrOQLazu98eigrgWxcpQuzLMzZi85hyDtjf 1bMw== 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=kQ7tISy8K+0cgFIOzo6JwID81BS3DiD07ImA91vTtec=; b=6/UPi4I9iaODS41/WpI4S1DPAK5gsNLT568wHjmsohIRHEfx1FIlitQ0RGGkrIaKsb B4A7eJV/wLyBP32v1NJPFXpxJOczcimJvXWtIq92c5Gnek5AGwipXEm0Hl4Lrnmn30K6 0HOdilChhB9DqMxzUZ7FytQUl1ic33zsH47lZ29Zff45Sx0wHeOudfWWlMHxthmZUXrs od+/tQDaEfH7IVqANwRbjDivXqJQI/oEjKv+7W3OJVuXpna4WC+xt7THX86G9MzJetO5 x+womHmrsZREnzhps0cbVx8xUn8KOUrCzzEyhILggM+UuB/xvUlQJZtQR0R6PzUVlZd7 O6kw== X-Gm-Message-State: AOAM533UIiK8L3yHi7IJHEMEPlsGskCRy5E1Plm0QriSVYKFlM9f9XFN XiYfDttj7flblSXR1//KSf8rCQ== X-Google-Smtp-Source: ABdhPJxMXJaK3QBL1o8EYx/32MwS+Vnb20xHUx+BXrP6jv7aafVt/e0tId7DbjngAU0SkQSto47UOg== X-Received: by 2002:a05:6000:18cb:b0:207:8c65:3fd4 with SMTP id w11-20020a05600018cb00b002078c653fd4mr15606230wrq.131.1650918092411; Mon, 25 Apr 2022 13:21:32 -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 p3-20020a5d59a3000000b0020a9132d1fbsm11101003wrr.37.2022.04.25.13.21.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 13:21:32 -0700 (PDT) From: Corentin Labbe To: heiko@sntech.de, herbert@gondor.apana.org.au, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org Cc: linux-crypto@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Corentin Labbe Subject: [PATCH v6 05/33] crypto: rockchip: do not store mode globally Date: Mon, 25 Apr 2022 20:20:51 +0000 Message-Id: <20220425202119.3566743-6-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220425202119.3566743-1-clabbe@baylibre.com> References: <20220425202119.3566743-1-clabbe@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Storing the mode globally does not work if 2 requests are handled in the same time. We should store it in a request context. Fixes: ce0183cb6464b ("crypto: rockchip - switch to skcipher API") Signed-off-by: Corentin Labbe --- drivers/crypto/rockchip/rk3288_crypto.h | 5 +- .../crypto/rockchip/rk3288_crypto_skcipher.c | 58 ++++++++++++------- 2 files changed, 41 insertions(+), 22 deletions(-) diff --git a/drivers/crypto/rockchip/rk3288_crypto.h b/drivers/crypto/rockc= hip/rk3288_crypto.h index 656d6795d400..c919d9a43a08 100644 --- a/drivers/crypto/rockchip/rk3288_crypto.h +++ b/drivers/crypto/rockchip/rk3288_crypto.h @@ -245,10 +245,13 @@ struct rk_ahash_rctx { struct rk_cipher_ctx { struct rk_crypto_info *dev; unsigned int keylen; - u32 mode; u8 iv[AES_BLOCK_SIZE]; }; =20 +struct rk_cipher_rctx { + u32 mode; +}; + enum alg_type { ALG_TYPE_HASH, ALG_TYPE_CIPHER, diff --git a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c b/drivers/cry= pto/rockchip/rk3288_crypto_skcipher.c index 8c44a19eab75..bbd0bf52bf07 100644 --- a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c +++ b/drivers/crypto/rockchip/rk3288_crypto_skcipher.c @@ -76,9 +76,10 @@ static int rk_aes_ecb_encrypt(struct skcipher_request *r= eq) { struct crypto_skcipher *tfm =3D crypto_skcipher_reqtfm(req); struct rk_cipher_ctx *ctx =3D crypto_skcipher_ctx(tfm); + struct rk_cipher_rctx *rctx =3D skcipher_request_ctx(req); struct rk_crypto_info *dev =3D ctx->dev; =20 - ctx->mode =3D RK_CRYPTO_AES_ECB_MODE; + rctx->mode =3D RK_CRYPTO_AES_ECB_MODE; return rk_handle_req(dev, req); } =20 @@ -86,9 +87,10 @@ static int rk_aes_ecb_decrypt(struct skcipher_request *r= eq) { struct crypto_skcipher *tfm =3D crypto_skcipher_reqtfm(req); struct rk_cipher_ctx *ctx =3D crypto_skcipher_ctx(tfm); + struct rk_cipher_rctx *rctx =3D skcipher_request_ctx(req); struct rk_crypto_info *dev =3D ctx->dev; =20 - ctx->mode =3D RK_CRYPTO_AES_ECB_MODE | RK_CRYPTO_DEC; + rctx->mode =3D RK_CRYPTO_AES_ECB_MODE | RK_CRYPTO_DEC; return rk_handle_req(dev, req); } =20 @@ -96,9 +98,10 @@ static int rk_aes_cbc_encrypt(struct skcipher_request *r= eq) { struct crypto_skcipher *tfm =3D crypto_skcipher_reqtfm(req); struct rk_cipher_ctx *ctx =3D crypto_skcipher_ctx(tfm); + struct rk_cipher_rctx *rctx =3D skcipher_request_ctx(req); struct rk_crypto_info *dev =3D ctx->dev; =20 - ctx->mode =3D RK_CRYPTO_AES_CBC_MODE; + rctx->mode =3D RK_CRYPTO_AES_CBC_MODE; return rk_handle_req(dev, req); } =20 @@ -106,9 +109,10 @@ static int rk_aes_cbc_decrypt(struct skcipher_request = *req) { struct crypto_skcipher *tfm =3D crypto_skcipher_reqtfm(req); struct rk_cipher_ctx *ctx =3D crypto_skcipher_ctx(tfm); + struct rk_cipher_rctx *rctx =3D skcipher_request_ctx(req); struct rk_crypto_info *dev =3D ctx->dev; =20 - ctx->mode =3D RK_CRYPTO_AES_CBC_MODE | RK_CRYPTO_DEC; + rctx->mode =3D RK_CRYPTO_AES_CBC_MODE | RK_CRYPTO_DEC; return rk_handle_req(dev, req); } =20 @@ -116,9 +120,10 @@ static int rk_des_ecb_encrypt(struct skcipher_request = *req) { struct crypto_skcipher *tfm =3D crypto_skcipher_reqtfm(req); struct rk_cipher_ctx *ctx =3D crypto_skcipher_ctx(tfm); + struct rk_cipher_rctx *rctx =3D skcipher_request_ctx(req); struct rk_crypto_info *dev =3D ctx->dev; =20 - ctx->mode =3D 0; + rctx->mode =3D 0; return rk_handle_req(dev, req); } =20 @@ -126,9 +131,10 @@ static int rk_des_ecb_decrypt(struct skcipher_request = *req) { struct crypto_skcipher *tfm =3D crypto_skcipher_reqtfm(req); struct rk_cipher_ctx *ctx =3D crypto_skcipher_ctx(tfm); + struct rk_cipher_rctx *rctx =3D skcipher_request_ctx(req); struct rk_crypto_info *dev =3D ctx->dev; =20 - ctx->mode =3D RK_CRYPTO_DEC; + rctx->mode =3D RK_CRYPTO_DEC; return rk_handle_req(dev, req); } =20 @@ -136,9 +142,10 @@ static int rk_des_cbc_encrypt(struct skcipher_request = *req) { struct crypto_skcipher *tfm =3D crypto_skcipher_reqtfm(req); struct rk_cipher_ctx *ctx =3D crypto_skcipher_ctx(tfm); + struct rk_cipher_rctx *rctx =3D skcipher_request_ctx(req); struct rk_crypto_info *dev =3D ctx->dev; =20 - ctx->mode =3D RK_CRYPTO_TDES_CHAINMODE_CBC; + rctx->mode =3D RK_CRYPTO_TDES_CHAINMODE_CBC; return rk_handle_req(dev, req); } =20 @@ -146,9 +153,10 @@ static int rk_des_cbc_decrypt(struct skcipher_request = *req) { struct crypto_skcipher *tfm =3D crypto_skcipher_reqtfm(req); struct rk_cipher_ctx *ctx =3D crypto_skcipher_ctx(tfm); + struct rk_cipher_rctx *rctx =3D skcipher_request_ctx(req); struct rk_crypto_info *dev =3D ctx->dev; =20 - ctx->mode =3D RK_CRYPTO_TDES_CHAINMODE_CBC | RK_CRYPTO_DEC; + rctx->mode =3D RK_CRYPTO_TDES_CHAINMODE_CBC | RK_CRYPTO_DEC; return rk_handle_req(dev, req); } =20 @@ -156,9 +164,10 @@ static int rk_des3_ede_ecb_encrypt(struct skcipher_req= uest *req) { struct crypto_skcipher *tfm =3D crypto_skcipher_reqtfm(req); struct rk_cipher_ctx *ctx =3D crypto_skcipher_ctx(tfm); + struct rk_cipher_rctx *rctx =3D skcipher_request_ctx(req); struct rk_crypto_info *dev =3D ctx->dev; =20 - ctx->mode =3D RK_CRYPTO_TDES_SELECT; + rctx->mode =3D RK_CRYPTO_TDES_SELECT; return rk_handle_req(dev, req); } =20 @@ -166,9 +175,10 @@ static int rk_des3_ede_ecb_decrypt(struct skcipher_req= uest *req) { struct crypto_skcipher *tfm =3D crypto_skcipher_reqtfm(req); struct rk_cipher_ctx *ctx =3D crypto_skcipher_ctx(tfm); + struct rk_cipher_rctx *rctx =3D skcipher_request_ctx(req); struct rk_crypto_info *dev =3D ctx->dev; =20 - ctx->mode =3D RK_CRYPTO_TDES_SELECT | RK_CRYPTO_DEC; + rctx->mode =3D RK_CRYPTO_TDES_SELECT | RK_CRYPTO_DEC; return rk_handle_req(dev, req); } =20 @@ -176,9 +186,10 @@ static int rk_des3_ede_cbc_encrypt(struct skcipher_req= uest *req) { struct crypto_skcipher *tfm =3D crypto_skcipher_reqtfm(req); struct rk_cipher_ctx *ctx =3D crypto_skcipher_ctx(tfm); + struct rk_cipher_rctx *rctx =3D skcipher_request_ctx(req); struct rk_crypto_info *dev =3D ctx->dev; =20 - ctx->mode =3D RK_CRYPTO_TDES_SELECT | RK_CRYPTO_TDES_CHAINMODE_CBC; + rctx->mode =3D RK_CRYPTO_TDES_SELECT | RK_CRYPTO_TDES_CHAINMODE_CBC; return rk_handle_req(dev, req); } =20 @@ -186,9 +197,10 @@ static int rk_des3_ede_cbc_decrypt(struct skcipher_req= uest *req) { struct crypto_skcipher *tfm =3D crypto_skcipher_reqtfm(req); struct rk_cipher_ctx *ctx =3D crypto_skcipher_ctx(tfm); + struct rk_cipher_rctx *rctx =3D skcipher_request_ctx(req); struct rk_crypto_info *dev =3D ctx->dev; =20 - ctx->mode =3D RK_CRYPTO_TDES_SELECT | RK_CRYPTO_TDES_CHAINMODE_CBC | + rctx->mode =3D RK_CRYPTO_TDES_SELECT | RK_CRYPTO_TDES_CHAINMODE_CBC | RK_CRYPTO_DEC; return rk_handle_req(dev, req); } @@ -199,6 +211,7 @@ static void rk_ablk_hw_init(struct rk_crypto_info *dev) skcipher_request_cast(dev->async_req); struct crypto_skcipher *cipher =3D crypto_skcipher_reqtfm(req); struct crypto_tfm *tfm =3D crypto_skcipher_tfm(cipher); + struct rk_cipher_rctx *rctx =3D skcipher_request_ctx(req); struct rk_cipher_ctx *ctx =3D crypto_skcipher_ctx(cipher); u32 ivsize, block, conf_reg =3D 0; =20 @@ -206,22 +219,22 @@ static void rk_ablk_hw_init(struct rk_crypto_info *de= v) ivsize =3D crypto_skcipher_ivsize(cipher); =20 if (block =3D=3D DES_BLOCK_SIZE) { - ctx->mode |=3D RK_CRYPTO_TDES_FIFO_MODE | + rctx->mode |=3D RK_CRYPTO_TDES_FIFO_MODE | RK_CRYPTO_TDES_BYTESWAP_KEY | RK_CRYPTO_TDES_BYTESWAP_IV; - CRYPTO_WRITE(dev, RK_CRYPTO_TDES_CTRL, ctx->mode); + CRYPTO_WRITE(dev, RK_CRYPTO_TDES_CTRL, rctx->mode); memcpy_toio(dev->reg + RK_CRYPTO_TDES_IV_0, req->iv, ivsize); conf_reg =3D RK_CRYPTO_DESSEL; } else { - ctx->mode |=3D RK_CRYPTO_AES_FIFO_MODE | + rctx->mode |=3D RK_CRYPTO_AES_FIFO_MODE | RK_CRYPTO_AES_KEY_CHANGE | RK_CRYPTO_AES_BYTESWAP_KEY | RK_CRYPTO_AES_BYTESWAP_IV; if (ctx->keylen =3D=3D AES_KEYSIZE_192) - ctx->mode |=3D RK_CRYPTO_AES_192BIT_key; + rctx->mode |=3D RK_CRYPTO_AES_192BIT_key; else if (ctx->keylen =3D=3D AES_KEYSIZE_256) - ctx->mode |=3D RK_CRYPTO_AES_256BIT_key; - CRYPTO_WRITE(dev, RK_CRYPTO_AES_CTRL, ctx->mode); + rctx->mode |=3D RK_CRYPTO_AES_256BIT_key; + CRYPTO_WRITE(dev, RK_CRYPTO_AES_CTRL, rctx->mode); memcpy_toio(dev->reg + RK_CRYPTO_AES_IV_0, req->iv, ivsize); } conf_reg |=3D RK_CRYPTO_BYTESWAP_BTFIFO | @@ -246,6 +259,7 @@ static int rk_set_data_start(struct rk_crypto_info *dev) struct skcipher_request *req =3D skcipher_request_cast(dev->async_req); struct crypto_skcipher *tfm =3D crypto_skcipher_reqtfm(req); + struct rk_cipher_rctx *rctx =3D skcipher_request_ctx(req); struct rk_cipher_ctx *ctx =3D crypto_skcipher_ctx(tfm); u32 ivsize =3D crypto_skcipher_ivsize(tfm); u8 *src_last_blk =3D page_address(sg_page(dev->sg_src)) + @@ -254,7 +268,7 @@ static int rk_set_data_start(struct rk_crypto_info *dev) /* Store the iv that need to be updated in chain mode. * And update the IV buffer to contain the next IV for decryption mode. */ - if (ctx->mode & RK_CRYPTO_DEC) { + if (rctx->mode & RK_CRYPTO_DEC) { memcpy(ctx->iv, src_last_blk, ivsize); sg_pcopy_to_buffer(dev->first, dev->src_nents, req->iv, ivsize, dev->total - ivsize); @@ -294,11 +308,12 @@ static void rk_iv_copyback(struct rk_crypto_info *dev) struct skcipher_request *req =3D skcipher_request_cast(dev->async_req); struct crypto_skcipher *tfm =3D crypto_skcipher_reqtfm(req); + struct rk_cipher_rctx *rctx =3D skcipher_request_ctx(req); struct rk_cipher_ctx *ctx =3D crypto_skcipher_ctx(tfm); u32 ivsize =3D crypto_skcipher_ivsize(tfm); =20 /* Update the IV buffer to contain the next IV for encryption mode. */ - if (!(ctx->mode & RK_CRYPTO_DEC)) { + if (!(rctx->mode & RK_CRYPTO_DEC)) { if (dev->aligned) { memcpy(req->iv, sg_virt(dev->sg_dst) + dev->sg_dst->length - ivsize, ivsize); @@ -314,11 +329,12 @@ static void rk_update_iv(struct rk_crypto_info *dev) struct skcipher_request *req =3D skcipher_request_cast(dev->async_req); struct crypto_skcipher *tfm =3D crypto_skcipher_reqtfm(req); + struct rk_cipher_rctx *rctx =3D skcipher_request_ctx(req); struct rk_cipher_ctx *ctx =3D crypto_skcipher_ctx(tfm); u32 ivsize =3D crypto_skcipher_ivsize(tfm); u8 *new_iv =3D NULL; =20 - if (ctx->mode & RK_CRYPTO_DEC) { + if (rctx->mode & RK_CRYPTO_DEC) { new_iv =3D ctx->iv; } else { new_iv =3D page_address(sg_page(dev->sg_dst)) + --=20 2.35.1 From nobody Sun May 10 19:51:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 41820C433EF for ; Mon, 25 Apr 2022 20:22:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237292AbiDYUZS (ORCPT ); Mon, 25 Apr 2022 16:25:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39066 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245221AbiDYUYk (ORCPT ); Mon, 25 Apr 2022 16:24:40 -0400 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C0AE7128CFB for ; Mon, 25 Apr 2022 13:21:34 -0700 (PDT) Received: by mail-wm1-x329.google.com with SMTP id n126-20020a1c2784000000b0038e8af3e788so260122wmn.1 for ; Mon, 25 Apr 2022 13:21:34 -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=NBtkTtzZx99G/0qB6r+axIZfB65vvPlvwuFVXfvR0eo=; b=yv92CrCwZp4h3g0wXD5siw3OQjPzmK533dAajtbBSid3gKAUhNyhqVDuVtkl+IFDME GWC0crCUplHWAO94zczshUbJ1pRS2Rw7WvisVNPqn/cok8JJe09nyRLXeGblZfhB/ubq sWsYtCOJz0dsY6juq67xPfBl3w8bP0kDvE6EZYqfRxKnty/A2ecy4BSyKv6R0mKDA1p4 6etrBhHo1so2HCj/9nidbif6pFl2GCCXR6RK9yT5rLdgtt6hNIf0+Z85kGKBPD2Q6PnL CiLjtvvmjzs47HxAn8WLq9+tsS/fZ+zJhKMJwbiIcwA/JQW9EzqVoCkpLjMh38oOPj6c WFOw== 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=NBtkTtzZx99G/0qB6r+axIZfB65vvPlvwuFVXfvR0eo=; b=dCRBZk+pVfjf749U7mlsNRxN7VPJsO5rWPSQ2MAd8OXw2r3FTKsD77qyaYXs60Pxfx EZW7hOu6v247aUa/0eA7ziyc2UrB/MArhF+fFtwMxflxP5PkSyUu1UBNNROvmC4BACgS 83u6P+SXlTlyDIyDh8srV77RFnGfduj7ipmOvFzVEIhXL00rg6vaORncChABoT8w/Tx/ x0CGqIKNpgrKEYIkuE3M2CdpHS/cdmmqg0M0gtahau20lHT8W+t5I9aibp8roR0sTn9V quAb0SyHk4Xq/15c5xla9n3x6ZOaSLXXd8nNL+wb+NusF9kG2XV9m98ufTy3dqbnBVni 7C7g== X-Gm-Message-State: AOAM530vauTt1gGezmOO0oFWR4xb+xYOoaPPsF7lUPGtT3iyapPSrvoK vau84HKOI1+WpBY2Ao28kU7K6Q== X-Google-Smtp-Source: ABdhPJwOSqL+tx2+w1nYCB7klczylA5LPZ70TqZb6/QzO7hvXNxgeaCBQiGpxpvBs5Zf8pU0kscu1g== X-Received: by 2002:a7b:c394:0:b0:38e:b415:96af with SMTP id s20-20020a7bc394000000b0038eb41596afmr27264138wmj.68.1650918093344; Mon, 25 Apr 2022 13:21:33 -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 p3-20020a5d59a3000000b0020a9132d1fbsm11101003wrr.37.2022.04.25.13.21.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 13:21:32 -0700 (PDT) From: Corentin Labbe To: heiko@sntech.de, herbert@gondor.apana.org.au, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org Cc: linux-crypto@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Corentin Labbe Subject: [PATCH v6 06/33] crypto: rockchip: add fallback for cipher Date: Mon, 25 Apr 2022 20:20:52 +0000 Message-Id: <20220425202119.3566743-7-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220425202119.3566743-1-clabbe@baylibre.com> References: <20220425202119.3566743-1-clabbe@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The hardware does not handle 0 size length request, let's add a fallback. Furthermore fallback will be used for all unaligned case the hardware cannot handle. Fixes: ce0183cb6464b ("crypto: rockchip - switch to skcipher API") Signed-off-by: Corentin Labbe --- drivers/crypto/Kconfig | 4 + drivers/crypto/rockchip/rk3288_crypto.h | 2 + .../crypto/rockchip/rk3288_crypto_skcipher.c | 97 ++++++++++++++++--- 3 files changed, 90 insertions(+), 13 deletions(-) diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index 7b2d138bc83e..84ab14afcbd9 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig @@ -784,6 +784,10 @@ config CRYPTO_DEV_IMGTEC_HASH config CRYPTO_DEV_ROCKCHIP tristate "Rockchip's Cryptographic Engine driver" depends on OF && ARCH_ROCKCHIP + depends on PM + select CRYPTO_ECB + select CRYPTO_CBC + select CRYPTO_DES select CRYPTO_AES select CRYPTO_LIB_DES select CRYPTO_MD5 diff --git a/drivers/crypto/rockchip/rk3288_crypto.h b/drivers/crypto/rockc= hip/rk3288_crypto.h index c919d9a43a08..8b1e15d8ddc6 100644 --- a/drivers/crypto/rockchip/rk3288_crypto.h +++ b/drivers/crypto/rockchip/rk3288_crypto.h @@ -246,10 +246,12 @@ struct rk_cipher_ctx { struct rk_crypto_info *dev; unsigned int keylen; u8 iv[AES_BLOCK_SIZE]; + struct crypto_skcipher *fallback_tfm; }; =20 struct rk_cipher_rctx { u32 mode; + struct skcipher_request fallback_req; // keep at the end }; =20 enum alg_type { diff --git a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c b/drivers/cry= pto/rockchip/rk3288_crypto_skcipher.c index bbd0bf52bf07..eac5bba66e25 100644 --- a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c +++ b/drivers/crypto/rockchip/rk3288_crypto_skcipher.c @@ -13,6 +13,63 @@ =20 #define RK_CRYPTO_DEC BIT(0) =20 +static int rk_cipher_need_fallback(struct skcipher_request *req) +{ + struct crypto_skcipher *tfm =3D crypto_skcipher_reqtfm(req); + unsigned int bs =3D crypto_skcipher_blocksize(tfm); + struct scatterlist *sgs, *sgd; + unsigned int stodo, dtodo, len; + + if (!req->cryptlen) + return true; + + len =3D req->cryptlen; + sgs =3D req->src; + sgd =3D req->dst; + while (sgs && sgd) { + if (!IS_ALIGNED(sgs->offset, sizeof(u32))) { + return true; + } + if (!IS_ALIGNED(sgd->offset, sizeof(u32))) { + return true; + } + stodo =3D min(len, sgs->length); + if (stodo % bs) { + return true; + } + dtodo =3D min(len, sgd->length); + if (dtodo % bs) { + return true; + } + if (stodo !=3D dtodo) { + return true; + } + len -=3D stodo; + sgs =3D sg_next(sgs); + sgd =3D sg_next(sgd); + } + return false; +} + +static int rk_cipher_fallback(struct skcipher_request *areq) +{ + struct crypto_skcipher *tfm =3D crypto_skcipher_reqtfm(areq); + struct rk_cipher_ctx *op =3D crypto_skcipher_ctx(tfm); + struct rk_cipher_rctx *rctx =3D skcipher_request_ctx(areq); + int err; + + skcipher_request_set_tfm(&rctx->fallback_req, op->fallback_tfm); + skcipher_request_set_callback(&rctx->fallback_req, areq->base.flags, + areq->base.complete, areq->base.data); + skcipher_request_set_crypt(&rctx->fallback_req, areq->src, areq->dst, + areq->cryptlen, areq->iv); + if (rctx->mode & RK_CRYPTO_DEC) + err =3D crypto_skcipher_decrypt(&rctx->fallback_req); + else + err =3D crypto_skcipher_encrypt(&rctx->fallback_req); + return err; +} + static void rk_crypto_complete(struct crypto_async_request *base, int err) { if (base->complete) @@ -22,10 +79,10 @@ static void rk_crypto_complete(struct crypto_async_requ= est *base, int err) static int rk_handle_req(struct rk_crypto_info *dev, struct skcipher_request *req) { - if (!IS_ALIGNED(req->cryptlen, dev->align_size)) - return -EINVAL; - else - return dev->enqueue(dev, &req->base); + if (rk_cipher_need_fallback(req)) + return rk_cipher_fallback(req); + + return dev->enqueue(dev, &req->base); } =20 static int rk_aes_setkey(struct crypto_skcipher *cipher, @@ -39,7 +96,8 @@ static int rk_aes_setkey(struct crypto_skcipher *cipher, return -EINVAL; ctx->keylen =3D keylen; memcpy_toio(ctx->dev->reg + RK_CRYPTO_AES_KEY_0, key, keylen); - return 0; + + return crypto_skcipher_setkey(ctx->fallback_tfm, key, keylen); } =20 static int rk_des_setkey(struct crypto_skcipher *cipher, @@ -54,7 +112,8 @@ static int rk_des_setkey(struct crypto_skcipher *cipher, =20 ctx->keylen =3D keylen; memcpy_toio(ctx->dev->reg + RK_CRYPTO_TDES_KEY1_0, key, keylen); - return 0; + + return crypto_skcipher_setkey(ctx->fallback_tfm, key, keylen); } =20 static int rk_tdes_setkey(struct crypto_skcipher *cipher, @@ -69,7 +128,7 @@ static int rk_tdes_setkey(struct crypto_skcipher *cipher, =20 ctx->keylen =3D keylen; memcpy_toio(ctx->dev->reg + RK_CRYPTO_TDES_KEY1_0, key, keylen); - return 0; + return crypto_skcipher_setkey(ctx->fallback_tfm, key, keylen); } =20 static int rk_aes_ecb_encrypt(struct skcipher_request *req) @@ -394,6 +453,7 @@ static int rk_ablk_init_tfm(struct crypto_skcipher *tfm) { struct rk_cipher_ctx *ctx =3D crypto_skcipher_ctx(tfm); struct skcipher_alg *alg =3D crypto_skcipher_alg(tfm); + const char *name =3D crypto_tfm_alg_name(&tfm->base); struct rk_crypto_tmp *algt; =20 algt =3D container_of(alg, struct rk_crypto_tmp, alg.skcipher); @@ -407,6 +467,16 @@ static int rk_ablk_init_tfm(struct crypto_skcipher *tf= m) if (!ctx->dev->addr_vir) return -ENOMEM; =20 + ctx->fallback_tfm =3D crypto_alloc_skcipher(name, 0, CRYPTO_ALG_NEED_FALL= BACK); + if (IS_ERR(ctx->fallback_tfm)) { + dev_err(ctx->dev->dev, "ERROR: Cannot allocate fallback for %s %ld\n", + name, PTR_ERR(ctx->fallback_tfm)); + return PTR_ERR(ctx->fallback_tfm); + } + + tfm->reqsize =3D sizeof(struct rk_cipher_rctx) + + crypto_skcipher_reqsize(ctx->fallback_tfm); + return 0; } =20 @@ -415,6 +485,7 @@ static void rk_ablk_exit_tfm(struct crypto_skcipher *tf= m) struct rk_cipher_ctx *ctx =3D crypto_skcipher_ctx(tfm); =20 free_page((unsigned long)ctx->dev->addr_vir); + crypto_free_skcipher(ctx->fallback_tfm); } =20 struct rk_crypto_tmp rk_ecb_aes_alg =3D { @@ -423,7 +494,7 @@ struct rk_crypto_tmp rk_ecb_aes_alg =3D { .base.cra_name =3D "ecb(aes)", .base.cra_driver_name =3D "ecb-aes-rk", .base.cra_priority =3D 300, - .base.cra_flags =3D CRYPTO_ALG_ASYNC, + .base.cra_flags =3D CRYPTO_ALG_ASYNC | CRYPTO_ALG_NEED_FALLBACK, .base.cra_blocksize =3D AES_BLOCK_SIZE, .base.cra_ctxsize =3D sizeof(struct rk_cipher_ctx), .base.cra_alignmask =3D 0x0f, @@ -445,7 +516,7 @@ struct rk_crypto_tmp rk_cbc_aes_alg =3D { .base.cra_name =3D "cbc(aes)", .base.cra_driver_name =3D "cbc-aes-rk", .base.cra_priority =3D 300, - .base.cra_flags =3D CRYPTO_ALG_ASYNC, + .base.cra_flags =3D CRYPTO_ALG_ASYNC | CRYPTO_ALG_NEED_FALLBACK, .base.cra_blocksize =3D AES_BLOCK_SIZE, .base.cra_ctxsize =3D sizeof(struct rk_cipher_ctx), .base.cra_alignmask =3D 0x0f, @@ -468,7 +539,7 @@ struct rk_crypto_tmp rk_ecb_des_alg =3D { .base.cra_name =3D "ecb(des)", .base.cra_driver_name =3D "ecb-des-rk", .base.cra_priority =3D 300, - .base.cra_flags =3D CRYPTO_ALG_ASYNC, + .base.cra_flags =3D CRYPTO_ALG_ASYNC | CRYPTO_ALG_NEED_FALLBACK, .base.cra_blocksize =3D DES_BLOCK_SIZE, .base.cra_ctxsize =3D sizeof(struct rk_cipher_ctx), .base.cra_alignmask =3D 0x07, @@ -490,7 +561,7 @@ struct rk_crypto_tmp rk_cbc_des_alg =3D { .base.cra_name =3D "cbc(des)", .base.cra_driver_name =3D "cbc-des-rk", .base.cra_priority =3D 300, - .base.cra_flags =3D CRYPTO_ALG_ASYNC, + .base.cra_flags =3D CRYPTO_ALG_ASYNC | CRYPTO_ALG_NEED_FALLBACK, .base.cra_blocksize =3D DES_BLOCK_SIZE, .base.cra_ctxsize =3D sizeof(struct rk_cipher_ctx), .base.cra_alignmask =3D 0x07, @@ -513,7 +584,7 @@ struct rk_crypto_tmp rk_ecb_des3_ede_alg =3D { .base.cra_name =3D "ecb(des3_ede)", .base.cra_driver_name =3D "ecb-des3-ede-rk", .base.cra_priority =3D 300, - .base.cra_flags =3D CRYPTO_ALG_ASYNC, + .base.cra_flags =3D CRYPTO_ALG_ASYNC | CRYPTO_ALG_NEED_FALLBACK, .base.cra_blocksize =3D DES_BLOCK_SIZE, .base.cra_ctxsize =3D sizeof(struct rk_cipher_ctx), .base.cra_alignmask =3D 0x07, @@ -535,7 +606,7 @@ struct rk_crypto_tmp rk_cbc_des3_ede_alg =3D { .base.cra_name =3D "cbc(des3_ede)", .base.cra_driver_name =3D "cbc-des3-ede-rk", .base.cra_priority =3D 300, - .base.cra_flags =3D CRYPTO_ALG_ASYNC, + .base.cra_flags =3D CRYPTO_ALG_ASYNC | CRYPTO_ALG_NEED_FALLBACK, .base.cra_blocksize =3D DES_BLOCK_SIZE, .base.cra_ctxsize =3D sizeof(struct rk_cipher_ctx), .base.cra_alignmask =3D 0x07, --=20 2.35.1 From nobody Sun May 10 19:51:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F3F58C433F5 for ; Mon, 25 Apr 2022 20:22:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245301AbiDYUZN (ORCPT ); Mon, 25 Apr 2022 16:25:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39298 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245234AbiDYUYm (ORCPT ); Mon, 25 Apr 2022 16:24:42 -0400 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B52A91291E7 for ; Mon, 25 Apr 2022 13:21:35 -0700 (PDT) Received: by mail-wr1-x42d.google.com with SMTP id b19so22451350wrh.11 for ; Mon, 25 Apr 2022 13:21:35 -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=yzvgVyreo6slTFAo6yIfKz7ssJtwxUt4QGb+bB9VZnw=; b=g0W+RBEU2DVpJOcyQb0vAUSv0HySUb4wrQLTjDRQrYCkExGUJA/3kkqNl0TsH6B07P G/BdSyXPm/hK9AbPy6f0CrBKYAQNBJmoe9sQtUdwCzylYu/94cy9W6P5Wl7539OpClEm ubCViQLyOoHAgmatfdvMXkQrqlad3KNyTv4cE6vE9tTgWvmCkblTaD0r6Uzkq4GGnL57 22BAgHrvM7j+J2otUMXw4psRsRtPR8+unx7wQLZfJdGHmwE87mss0UoI88KNbCtgCt9U zcW5E58jf+v3OMBs0KIq8FYMFa6WNSZqWZK3/BCSfwVRfTvlySDTa5SEhxCO+c45NIcs oLSA== 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=yzvgVyreo6slTFAo6yIfKz7ssJtwxUt4QGb+bB9VZnw=; b=hFSxVN1I6Cgkubqk+rFUK0NuRN6XggcpSEEsgCsbNrWUaCLK0+SzjIUDctMR+YBW9G VTsHTIzB8Vwww2Ti5Z6zxUMMca+ZGjDorABkA28xqzUzSJK6zIWFrLSC14wAsBZ0oxl5 vN6YLOPoD/wX8EJqkFFAMHj7ArmHx1bjK14GJLx6xEKK5BlKLcR3zg/nez2BjwZuB4uo Dc8DV1neAXHABDo1MS9oO2SGsOuSqLZXiJ8MwB6dBF0ELqmGxEcFksbnafYBekmwHCZL QIpHoir9AY0aR6aXt3E/YmOnboA2mxFElW6NHE7ImAGl2VVYgBA2CvHv6vTHhA7X8+dN sY2w== X-Gm-Message-State: AOAM5328l60waj7qqNQEIzrFBf1vKs2Or/B+gtbPYBH+0noBKSWXtECg QwyXQb9os96LU5i6GVG6gcZB9qHLxj6Lzg== X-Google-Smtp-Source: ABdhPJwaSWCN4u/OFWV2DnC80dUm1T8fYKILu0YE8V/VULdmNc7nx+qeTGdxShpo3cm0Mud1zMUXlg== X-Received: by 2002:adf:db86:0:b0:205:bccf:8cbf with SMTP id u6-20020adfdb86000000b00205bccf8cbfmr15278513wri.346.1650918094282; Mon, 25 Apr 2022 13:21:34 -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 p3-20020a5d59a3000000b0020a9132d1fbsm11101003wrr.37.2022.04.25.13.21.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 13:21:33 -0700 (PDT) From: Corentin Labbe To: heiko@sntech.de, herbert@gondor.apana.org.au, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org Cc: linux-crypto@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Corentin Labbe Subject: [PATCH v6 07/33] crypto: rockchip: add fallback for ahash Date: Mon, 25 Apr 2022 20:20:53 +0000 Message-Id: <20220425202119.3566743-8-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220425202119.3566743-1-clabbe@baylibre.com> References: <20220425202119.3566743-1-clabbe@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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. */ =20 +static bool rk_ahash_need_fallback(struct ahash_request *req) +{ + struct scatterlist *sg; + + sg =3D req->src; + while (sg) { + if (!IS_ALIGNED(sg->offset, sizeof(u32))) { + return true; + } + if (sg->length % 4) { + return true; + } + sg =3D sg_next(sg); + } + return false; +} + +static int rk_ahash_digest_fb(struct ahash_request *areq) +{ + struct rk_ahash_rctx *rctx =3D ahash_request_ctx(areq); + struct crypto_ahash *tfm =3D crypto_ahash_reqtfm(areq); + struct rk_ahash_ctx *tfmctx =3D crypto_ahash_ctx(tfm); + + ahash_request_set_tfm(&rctx->fallback_req, tfmctx->fallback_tfm); + rctx->fallback_req.base.flags =3D areq->base.flags & + CRYPTO_TFM_REQ_MAY_SLEEP; + + rctx->fallback_req.nbytes =3D areq->nbytes; + rctx->fallback_req.src =3D areq->src; + rctx->fallback_req.result =3D areq->result; + + return crypto_ahash_digest(&rctx->fallback_req); +} + static int zero_message_process(struct ahash_request *req) { struct crypto_ahash *tfm =3D crypto_ahash_reqtfm(req); @@ -167,6 +201,9 @@ static int rk_ahash_digest(struct ahash_request *req) struct rk_ahash_ctx *tctx =3D crypto_tfm_ctx(req->base.tfm); struct rk_crypto_info *dev =3D tctx->dev; =20 + 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 =3D crypto_tfm_ctx(tfm); =20 free_page((unsigned long)tctx->dev->addr_vir); + crypto_free_ahash(tctx->fallback_tfm); } =20 struct rk_crypto_tmp rk_ahash_sha1 =3D { --=20 2.35.1 From nobody Sun May 10 19:51:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DDD8AC433FE for ; Mon, 25 Apr 2022 20:22:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245285AbiDYUZC (ORCPT ); Mon, 25 Apr 2022 16:25:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245230AbiDYUYm (ORCPT ); Mon, 25 Apr 2022 16:24:42 -0400 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B9D771240E8 for ; Mon, 25 Apr 2022 13:21:36 -0700 (PDT) Received: by mail-wr1-x42f.google.com with SMTP id b19so22451415wrh.11 for ; Mon, 25 Apr 2022 13:21:36 -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=OBsPBZvatJoTqYtGzbRZZV/xp+iQpDNUBfwoL1YNSYU=; b=iss93Y0A3QBBtwVfhL1GZR/arYYdHhzNMyg7NJKANbYYigJugMo7jX8PRXExCv6YJW dkic6TOcyiX8dTr2fNyXOaMc5tibnlKEs9b+jnX0zl2q8XrJeiihVnncuFEy/90OxOEf /on3kW6kT1dHemhA8fXkGiIyMkeE1lQNlWQR6o373ACQS4JgiA0srwo7wcSw+bIkuovD jiTdhfEuEsnm810FCg2DAwYvhMRdVKRt9sPaYOqMxz9bvc9PW/4lULbmwKN6frdY5HjU p+DO7F9qFZVN+fF8Xzz9ufIU6xAvZ4qkB3sjNx06jCExkwP6Qd8fwSm6WB5DBPn/rVi/ ItpA== 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=OBsPBZvatJoTqYtGzbRZZV/xp+iQpDNUBfwoL1YNSYU=; b=XCC1+jtFG98rprh66esHk/RPZVXPTm8ikRtnNUsx1YbHDUYtILxHiMuD0Iijp3cM7R 1HJOAflmHL9gA0mSlYDzKf74AzNIBSGOJc+aDv5U2A68OPUWY5yHgZaJJE3AsZ+U0EpV icRELvLv5meJxFWxpAUTWDIPk2qZoUp/tRCT6Hqc1k/6PGYUakoApZ1GtLZcAPl8tIVE hjh5tQ6z9+L9UkaAi+MyiADQ+NESw2CccCZN+z0xktwGGv1/KM0htwLAX4kaBekU15vR Rfjrv4rPaOLPVhR42at5G11JASQupMjFUHrsuKRT5F7DGJcQ8EpGOqAcysrWSVTHfv2d fDrw== X-Gm-Message-State: AOAM531CtBxO/18cd42wOVyFsULVV4tLy1o62mX1n6aTIlkka+CBv3wH uMNURKCzeEstVuaVPr8v+7rUfA== X-Google-Smtp-Source: ABdhPJweThuIWUHj2riTG1rQnLQHIkoyRebwFgYyqETt2uBCblPjTc3PC2+fybrU2zW3SQU3JsGHIQ== X-Received: by 2002:a5d:4348:0:b0:206:1c79:fd57 with SMTP id u8-20020a5d4348000000b002061c79fd57mr15932551wrr.344.1650918095263; Mon, 25 Apr 2022 13:21:35 -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 p3-20020a5d59a3000000b0020a9132d1fbsm11101003wrr.37.2022.04.25.13.21.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 13:21:34 -0700 (PDT) From: Corentin Labbe To: heiko@sntech.de, herbert@gondor.apana.org.au, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org Cc: linux-crypto@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Corentin Labbe Subject: [PATCH v6 08/33] crypto: rockchip: better handle cipher key Date: Mon, 25 Apr 2022 20:20:54 +0000 Message-Id: <20220425202119.3566743-9-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220425202119.3566743-1-clabbe@baylibre.com> References: <20220425202119.3566743-1-clabbe@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The key should not be set in hardware too much in advance, this will fail it 2 TFM with different keys generate alternative requests. The key should be stored and used just before doing cipher operations. Fixes: ce0183cb6464b ("crypto: rockchip - switch to skcipher API") Signed-off-by: Corentin Labbe --- drivers/crypto/rockchip/rk3288_crypto.h | 1 + drivers/crypto/rockchip/rk3288_crypto_skcipher.c | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/crypto/rockchip/rk3288_crypto.h b/drivers/crypto/rockc= hip/rk3288_crypto.h index 8b1e15d8ddc6..540b81a14b9b 100644 --- a/drivers/crypto/rockchip/rk3288_crypto.h +++ b/drivers/crypto/rockchip/rk3288_crypto.h @@ -245,6 +245,7 @@ struct rk_ahash_rctx { struct rk_cipher_ctx { struct rk_crypto_info *dev; unsigned int keylen; + u8 key[AES_MAX_KEY_SIZE]; u8 iv[AES_BLOCK_SIZE]; struct crypto_skcipher *fallback_tfm; }; diff --git a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c b/drivers/cry= pto/rockchip/rk3288_crypto_skcipher.c index eac5bba66e25..1ef94f8db2c5 100644 --- a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c +++ b/drivers/crypto/rockchip/rk3288_crypto_skcipher.c @@ -95,7 +95,7 @@ static int rk_aes_setkey(struct crypto_skcipher *cipher, keylen !=3D AES_KEYSIZE_256) return -EINVAL; ctx->keylen =3D keylen; - memcpy_toio(ctx->dev->reg + RK_CRYPTO_AES_KEY_0, key, keylen); + memcpy(ctx->key, key, keylen); =20 return crypto_skcipher_setkey(ctx->fallback_tfm, key, keylen); } @@ -111,7 +111,7 @@ static int rk_des_setkey(struct crypto_skcipher *cipher, return err; =20 ctx->keylen =3D keylen; - memcpy_toio(ctx->dev->reg + RK_CRYPTO_TDES_KEY1_0, key, keylen); + memcpy(ctx->key, key, keylen); =20 return crypto_skcipher_setkey(ctx->fallback_tfm, key, keylen); } @@ -127,7 +127,8 @@ static int rk_tdes_setkey(struct crypto_skcipher *ciphe= r, return err; =20 ctx->keylen =3D keylen; - memcpy_toio(ctx->dev->reg + RK_CRYPTO_TDES_KEY1_0, key, keylen); + memcpy(ctx->key, key, keylen); + return crypto_skcipher_setkey(ctx->fallback_tfm, key, keylen); } =20 @@ -283,6 +284,7 @@ static void rk_ablk_hw_init(struct rk_crypto_info *dev) RK_CRYPTO_TDES_BYTESWAP_IV; CRYPTO_WRITE(dev, RK_CRYPTO_TDES_CTRL, rctx->mode); memcpy_toio(dev->reg + RK_CRYPTO_TDES_IV_0, req->iv, ivsize); + memcpy_toio(ctx->dev->reg + RK_CRYPTO_TDES_KEY1_0, ctx->key, ctx->keylen= ); conf_reg =3D RK_CRYPTO_DESSEL; } else { rctx->mode |=3D RK_CRYPTO_AES_FIFO_MODE | @@ -295,6 +297,7 @@ static void rk_ablk_hw_init(struct rk_crypto_info *dev) rctx->mode |=3D RK_CRYPTO_AES_256BIT_key; CRYPTO_WRITE(dev, RK_CRYPTO_AES_CTRL, rctx->mode); memcpy_toio(dev->reg + RK_CRYPTO_AES_IV_0, req->iv, ivsize); + memcpy_toio(ctx->dev->reg + RK_CRYPTO_AES_KEY_0, ctx->key, ctx->keylen); } conf_reg |=3D RK_CRYPTO_BYTESWAP_BTFIFO | RK_CRYPTO_BYTESWAP_BRFIFO; @@ -484,6 +487,7 @@ static void rk_ablk_exit_tfm(struct crypto_skcipher *tf= m) { struct rk_cipher_ctx *ctx =3D crypto_skcipher_ctx(tfm); =20 + memzero_explicit(ctx->key, ctx->keylen); free_page((unsigned long)ctx->dev->addr_vir); crypto_free_skcipher(ctx->fallback_tfm); } --=20 2.35.1 From nobody Sun May 10 19:51:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2CD02C433F5 for ; Mon, 25 Apr 2022 20:22:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245291AbiDYUZI (ORCPT ); Mon, 25 Apr 2022 16:25:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245248AbiDYUYn (ORCPT ); Mon, 25 Apr 2022 16:24:43 -0400 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC73312A2B7 for ; Mon, 25 Apr 2022 13:21:37 -0700 (PDT) Received: by mail-wr1-x42d.google.com with SMTP id s21so7783946wrb.8 for ; Mon, 25 Apr 2022 13:21:37 -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=aJnJqffMjaG0ri/QRclvSYw2aUWdoPTVCuwI5Qrju5o=; b=sl7ra+j6Bt9qCA5YA9CCSZEO92AZ7zg4XXJAYqPMRxoSage16TCBcLAmWNI0o7mjzb 8/fSewOxvkEL1Md3FkxPb9s8bXvMSfVLJRJMXGD4Esd4C5DlYbMHNcYpUr/97zQgCvlz iuYpfJap9e00KUdixh7yVm7JvTALOU5zy4Rwqc1wwJajn7z+X8vOKafFpRHTs7Ie/WYC TyvXmowDSmhTx7ZIWVwAmLEKII4XtW9JvsZZnvo7fKiL33rN0rnIppUCYyxqeWHWNeJK ny6zt+G5oV9w3kMPeMzszKhbS2Q+s3im0sGznk7rIYvTpC5Vx6LwTAEHC2Kr3RQ+Wzrd 9bdw== 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=aJnJqffMjaG0ri/QRclvSYw2aUWdoPTVCuwI5Qrju5o=; b=KUA74kLXdf6cuWUhqjlIL4mT0WkslfL1IveosZ87908AAO31eItVWz7G/V21evdFDO tg+CQ/ycIQSOs9XBqxiRSCjJr8nqTWCC7Gm26CtaIrgscAE6+OviT8oH3w6LXmD7ZzgV MQe6qdnrxAUisEvVpchPredmxStng4MlYbTSGXmsGDs1n/yEmZwp6Z57MGU7b9akejoX ottfmwcgdCzXVFKJhK/hIa644bTW0K8tJNjEJi42UDnC3Uigtm+ihMz5euUWebqfoQDf vgQnTVEPMhNX45DLsT7s2jhL6OYygR2wwjyiPoYCR55R0LyA5ZSf24q4k5Jqb9KKls2x V8iQ== X-Gm-Message-State: AOAM531PJ2+HMdKR5C11J/lys6VvJ+8gF/sqMgfHtq9Je6QpWHv4NZxh IEp/KlbqbjLHU7hwEyYKnjVI2A== X-Google-Smtp-Source: ABdhPJwJmkxTG94X6EHc3EFU9IwqrOD//AwsgowEtN9tWuA1pca0pxKZby7Fy+7XLuqtKH9p5bz+1Q== X-Received: by 2002:a5d:64cb:0:b0:20a:903f:5d70 with SMTP id f11-20020a5d64cb000000b0020a903f5d70mr15352919wri.138.1650918096202; Mon, 25 Apr 2022 13:21:36 -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 p3-20020a5d59a3000000b0020a9132d1fbsm11101003wrr.37.2022.04.25.13.21.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 13:21:35 -0700 (PDT) From: Corentin Labbe To: heiko@sntech.de, herbert@gondor.apana.org.au, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org Cc: linux-crypto@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Corentin Labbe Subject: [PATCH v6 09/33] crypto: rockchip: remove non-aligned handling Date: Mon, 25 Apr 2022 20:20:55 +0000 Message-Id: <20220425202119.3566743-10-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220425202119.3566743-1-clabbe@baylibre.com> References: <20220425202119.3566743-1-clabbe@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Now driver have fallback for un-aligned cases, remove all code handling those cases. Fixes: ce0183cb6464b ("crypto: rockchip - switch to skcipher API") Signed-off-by: Corentin Labbe --- drivers/crypto/rockchip/rk3288_crypto.c | 69 +++++-------------- drivers/crypto/rockchip/rk3288_crypto.h | 4 -- drivers/crypto/rockchip/rk3288_crypto_ahash.c | 22 ++---- .../crypto/rockchip/rk3288_crypto_skcipher.c | 39 +++-------- 4 files changed, 31 insertions(+), 103 deletions(-) diff --git a/drivers/crypto/rockchip/rk3288_crypto.c b/drivers/crypto/rockc= hip/rk3288_crypto.c index 4cff49b82983..b3db096e2ec2 100644 --- a/drivers/crypto/rockchip/rk3288_crypto.c +++ b/drivers/crypto/rockchip/rk3288_crypto.c @@ -88,63 +88,26 @@ static int rk_load_data(struct rk_crypto_info *dev, { unsigned int count; =20 - dev->aligned =3D dev->aligned ? - check_alignment(sg_src, sg_dst, dev->align_size) : - dev->aligned; - if (dev->aligned) { - count =3D min(dev->left_bytes, sg_src->length); - dev->left_bytes -=3D count; - - if (!dma_map_sg(dev->dev, sg_src, 1, DMA_TO_DEVICE)) { - dev_err(dev->dev, "[%s:%d] dma_map_sg(src) error\n", + count =3D min(dev->left_bytes, sg_src->length); + dev->left_bytes -=3D count; + + if (!dma_map_sg(dev->dev, sg_src, 1, DMA_TO_DEVICE)) { + dev_err(dev->dev, "[%s:%d] dma_map_sg(src) error\n", __func__, __LINE__); - return -EINVAL; - } - dev->addr_in =3D sg_dma_address(sg_src); + return -EINVAL; + } + dev->addr_in =3D sg_dma_address(sg_src); =20 - if (sg_dst) { - if (!dma_map_sg(dev->dev, sg_dst, 1, DMA_FROM_DEVICE)) { - dev_err(dev->dev, + if (sg_dst) { + if (!dma_map_sg(dev->dev, sg_dst, 1, DMA_FROM_DEVICE)) { + dev_err(dev->dev, "[%s:%d] dma_map_sg(dst) error\n", __func__, __LINE__); - dma_unmap_sg(dev->dev, sg_src, 1, - DMA_TO_DEVICE); - return -EINVAL; - } - dev->addr_out =3D sg_dma_address(sg_dst); - } - } else { - count =3D (dev->left_bytes > PAGE_SIZE) ? - PAGE_SIZE : dev->left_bytes; - - if (!sg_pcopy_to_buffer(dev->first, dev->src_nents, - dev->addr_vir, count, - dev->total - dev->left_bytes)) { - dev_err(dev->dev, "[%s:%d] pcopy err\n", - __func__, __LINE__); + dma_unmap_sg(dev->dev, sg_src, 1, + DMA_TO_DEVICE); return -EINVAL; } - dev->left_bytes -=3D count; - sg_init_one(&dev->sg_tmp, dev->addr_vir, count); - if (!dma_map_sg(dev->dev, &dev->sg_tmp, 1, DMA_TO_DEVICE)) { - dev_err(dev->dev, "[%s:%d] dma_map_sg(sg_tmp) error\n", - __func__, __LINE__); - return -ENOMEM; - } - dev->addr_in =3D sg_dma_address(&dev->sg_tmp); - - if (sg_dst) { - if (!dma_map_sg(dev->dev, &dev->sg_tmp, 1, - DMA_FROM_DEVICE)) { - dev_err(dev->dev, - "[%s:%d] dma_map_sg(sg_tmp) error\n", - __func__, __LINE__); - dma_unmap_sg(dev->dev, &dev->sg_tmp, 1, - DMA_TO_DEVICE); - return -ENOMEM; - } - dev->addr_out =3D sg_dma_address(&dev->sg_tmp); - } + dev->addr_out =3D sg_dma_address(sg_dst); } dev->count =3D count; return 0; @@ -154,11 +117,11 @@ static void rk_unload_data(struct rk_crypto_info *dev) { struct scatterlist *sg_in, *sg_out; =20 - sg_in =3D dev->aligned ? dev->sg_src : &dev->sg_tmp; + sg_in =3D dev->sg_src; dma_unmap_sg(dev->dev, sg_in, 1, DMA_TO_DEVICE); =20 if (dev->sg_dst) { - sg_out =3D dev->aligned ? dev->sg_dst : &dev->sg_tmp; + sg_out =3D dev->sg_dst; dma_unmap_sg(dev->dev, sg_out, 1, DMA_FROM_DEVICE); } } diff --git a/drivers/crypto/rockchip/rk3288_crypto.h b/drivers/crypto/rockc= hip/rk3288_crypto.h index 540b81a14b9b..a7de5738f6dc 100644 --- a/drivers/crypto/rockchip/rk3288_crypto.h +++ b/drivers/crypto/rockchip/rk3288_crypto.h @@ -204,12 +204,8 @@ struct rk_crypto_info { /* the public variable */ struct scatterlist *sg_src; struct scatterlist *sg_dst; - struct scatterlist sg_tmp; struct scatterlist *first; unsigned int left_bytes; - void *addr_vir; - int aligned; - int align_size; size_t src_nents; size_t dst_nents; unsigned int total; diff --git a/drivers/crypto/rockchip/rk3288_crypto_ahash.c b/drivers/crypto= /rockchip/rk3288_crypto_ahash.c index 16009bb0bf16..c762e462eb57 100644 --- a/drivers/crypto/rockchip/rk3288_crypto_ahash.c +++ b/drivers/crypto/rockchip/rk3288_crypto_ahash.c @@ -236,8 +236,6 @@ static int rk_ahash_start(struct rk_crypto_info *dev) =20 dev->total =3D req->nbytes; dev->left_bytes =3D req->nbytes; - dev->aligned =3D 0; - dev->align_size =3D 4; dev->sg_dst =3D NULL; dev->sg_src =3D req->src; dev->first =3D req->src; @@ -272,15 +270,13 @@ static int rk_ahash_crypto_rx(struct rk_crypto_info *= dev) =20 dev->unload_data(dev); if (dev->left_bytes) { - if (dev->aligned) { - if (sg_is_last(dev->sg_src)) { - dev_warn(dev->dev, "[%s:%d], Lack of data\n", - __func__, __LINE__); - err =3D -ENOMEM; - goto out_rx; - } - dev->sg_src =3D sg_next(dev->sg_src); + if (sg_is_last(dev->sg_src)) { + dev_warn(dev->dev, "[%s:%d], Lack of data\n", + __func__, __LINE__); + err =3D -ENOMEM; + goto out_rx; } + dev->sg_src =3D sg_next(dev->sg_src); err =3D rk_ahash_set_data_start(dev); } else { /* @@ -318,11 +314,6 @@ static int rk_cra_hash_init(struct crypto_tfm *tfm) algt =3D container_of(alg, struct rk_crypto_tmp, alg.hash); =20 tctx->dev =3D algt->dev; - tctx->dev->addr_vir =3D (void *)__get_free_page(GFP_KERNEL); - if (!tctx->dev->addr_vir) { - dev_err(tctx->dev->dev, "failed to kmalloc for addr_vir\n"); - return -ENOMEM; - } tctx->dev->start =3D rk_ahash_start; tctx->dev->update =3D rk_ahash_crypto_rx; tctx->dev->complete =3D rk_ahash_crypto_complete; @@ -345,7 +336,6 @@ static void rk_cra_hash_exit(struct crypto_tfm *tfm) { struct rk_ahash_ctx *tctx =3D crypto_tfm_ctx(tfm); =20 - free_page((unsigned long)tctx->dev->addr_vir); crypto_free_ahash(tctx->fallback_tfm); } =20 diff --git a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c b/drivers/cry= pto/rockchip/rk3288_crypto_skcipher.c index 1ef94f8db2c5..d067b7f09165 100644 --- a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c +++ b/drivers/crypto/rockchip/rk3288_crypto_skcipher.c @@ -356,7 +356,6 @@ static int rk_ablk_start(struct rk_crypto_info *dev) dev->src_nents =3D sg_nents(req->src); dev->sg_dst =3D req->dst; dev->dst_nents =3D sg_nents(req->dst); - dev->aligned =3D 1; =20 spin_lock_irqsave(&dev->lock, flags); rk_ablk_hw_init(dev); @@ -376,13 +375,9 @@ static void rk_iv_copyback(struct rk_crypto_info *dev) =20 /* Update the IV buffer to contain the next IV for encryption mode. */ if (!(rctx->mode & RK_CRYPTO_DEC)) { - if (dev->aligned) { - memcpy(req->iv, sg_virt(dev->sg_dst) + - dev->sg_dst->length - ivsize, ivsize); - } else { - memcpy(req->iv, dev->addr_vir + - dev->count - ivsize, ivsize); - } + memcpy(req->iv, + sg_virt(dev->sg_dst) + dev->sg_dst->length - ivsize, + ivsize); } } =20 @@ -420,27 +415,16 @@ static int rk_ablk_rx(struct rk_crypto_info *dev) skcipher_request_cast(dev->async_req); =20 dev->unload_data(dev); - if (!dev->aligned) { - if (!sg_pcopy_from_buffer(req->dst, dev->dst_nents, - dev->addr_vir, dev->count, - dev->total - dev->left_bytes - - dev->count)) { - err =3D -EINVAL; - goto out_rx; - } - } if (dev->left_bytes) { rk_update_iv(dev); - if (dev->aligned) { - if (sg_is_last(dev->sg_src)) { - dev_err(dev->dev, "[%s:%d] Lack of data\n", + if (sg_is_last(dev->sg_src)) { + dev_err(dev->dev, "[%s:%d] Lack of data\n", __func__, __LINE__); - err =3D -ENOMEM; - goto out_rx; - } - dev->sg_src =3D sg_next(dev->sg_src); - dev->sg_dst =3D sg_next(dev->sg_dst); + err =3D -ENOMEM; + goto out_rx; } + dev->sg_src =3D sg_next(dev->sg_src); + dev->sg_dst =3D sg_next(dev->sg_dst); err =3D rk_set_data_start(dev); } else { rk_iv_copyback(dev); @@ -462,13 +446,9 @@ static int rk_ablk_init_tfm(struct crypto_skcipher *tf= m) algt =3D container_of(alg, struct rk_crypto_tmp, alg.skcipher); =20 ctx->dev =3D algt->dev; - ctx->dev->align_size =3D crypto_tfm_alg_alignmask(crypto_skcipher_tfm(tfm= )) + 1; ctx->dev->start =3D rk_ablk_start; ctx->dev->update =3D rk_ablk_rx; ctx->dev->complete =3D rk_crypto_complete; - ctx->dev->addr_vir =3D (char *)__get_free_page(GFP_KERNEL); - if (!ctx->dev->addr_vir) - return -ENOMEM; =20 ctx->fallback_tfm =3D crypto_alloc_skcipher(name, 0, CRYPTO_ALG_NEED_FALL= BACK); if (IS_ERR(ctx->fallback_tfm)) { @@ -488,7 +468,6 @@ static void rk_ablk_exit_tfm(struct crypto_skcipher *tf= m) struct rk_cipher_ctx *ctx =3D crypto_skcipher_ctx(tfm); =20 memzero_explicit(ctx->key, ctx->keylen); - free_page((unsigned long)ctx->dev->addr_vir); crypto_free_skcipher(ctx->fallback_tfm); } =20 --=20 2.35.1 From nobody Sun May 10 19:51:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 218B1C433FE for ; Mon, 25 Apr 2022 20:22:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245296AbiDYUZK (ORCPT ); Mon, 25 Apr 2022 16:25:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245243AbiDYUYq (ORCPT ); Mon, 25 Apr 2022 16:24:46 -0400 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0238C1240E9 for ; Mon, 25 Apr 2022 13:21:38 -0700 (PDT) Received: by mail-wm1-x333.google.com with SMTP id k36-20020a05600c1ca400b00393f18c8fc5so253478wms.4 for ; Mon, 25 Apr 2022 13:21:38 -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=Slgl4O/FRbBbWh1V6h92qQFovbg5OqIt8ICwkwg4E94=; b=oj/kwLq5Hn4cbSg1IH9zmsZxyL71jkatQOMD5Iw9dIar4GHID9FZ3hIyf3nfKXiP/3 OryW/m80wBl+zidrkSQeezxLdx1Lu88M6iIEKdGagiG7lBPw5qwGGVUixWnNc5xkAPyY VzNoF3cu4haCB2ra0Pugep6Qi+YhNs0HCyV8idkDlXSps/9vWpTUDxXuJ3T6rP13QHb9 BYXDPWVUolrKdpq7KLD7qNPOwinVN2+EH/2Qb/mHFDhbPguFvppNpf79cIGDJek60dAH UXaCrFNydL/Zmd4ICbooSVRmgZpyLuEz359tDYKmJl6xcJesuy5ZWkk+3pofHbDYYmuU VIZQ== 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=Slgl4O/FRbBbWh1V6h92qQFovbg5OqIt8ICwkwg4E94=; b=MH09fvXOOsOf+iY9RJb5lFQ/Yaprb+e3z8pwDti3DbZKD43DwsICjBjP3mJCPQ3Xwl NKVFqqfDn8JDlNcnt685bLlx9fu+1BytuN166bt71CKs6e6el6BtXpTwwomsg2+6qmZu SsulNGzSDL1iQdBwJntot+b205baFW9AtVSZ5hGQ4O2/OHiUbjYqrKeP5tPMLirpq0aO O1Zcr1FdSFzRsL3BRvw02d8NQZXxFOqwwrFzwqPWpeSS9lYxbUQ0AR31rDe658jRCcBV DjXAZhklD03Jbbfxb5KD5OGWHb50dAuEON1faQ7Ed9mWn+MGsJwl/87BGarV8KE4FXBy 8Apw== X-Gm-Message-State: AOAM533CkV9GiWxRI20hAZ9aM1RsXW8dlghkjoB3jT0AcgnuTLaTm2FN /XEOAt6EO2NaUSsmYMAGEXSuJA== X-Google-Smtp-Source: ABdhPJxGtyMzqm6s6efkO68V6sCzQKP9cHh4epRgdFLsFvSzyfeB1bI+wqs4fTmYYZg7rSuGxh2fUA== X-Received: by 2002:a05:600c:4f89:b0:392:8959:f8e7 with SMTP id n9-20020a05600c4f8900b003928959f8e7mr27105821wmq.164.1650918097184; Mon, 25 Apr 2022 13:21:37 -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 p3-20020a5d59a3000000b0020a9132d1fbsm11101003wrr.37.2022.04.25.13.21.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 13:21:36 -0700 (PDT) From: Corentin Labbe To: heiko@sntech.de, herbert@gondor.apana.org.au, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org Cc: linux-crypto@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Corentin Labbe Subject: [PATCH v6 10/33] crypto: rockchip: rework by using crypto_engine Date: Mon, 25 Apr 2022 20:20:56 +0000 Message-Id: <20220425202119.3566743-11-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220425202119.3566743-1-clabbe@baylibre.com> References: <20220425202119.3566743-1-clabbe@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Instead of doing manual queue management, let's use the crypto/engine for that. In the same time, rework the requests handling to be easier to understand (and fix all bugs related to them). Fixes: ce0183cb6464b ("crypto: rockchip - switch to skcipher API") Signed-off-by: Corentin Labbe --- drivers/crypto/Kconfig | 1 + drivers/crypto/rockchip/rk3288_crypto.c | 152 +---------- drivers/crypto/rockchip/rk3288_crypto.h | 39 +-- drivers/crypto/rockchip/rk3288_crypto_ahash.c | 144 +++++----- .../crypto/rockchip/rk3288_crypto_skcipher.c | 250 +++++++++--------- 5 files changed, 221 insertions(+), 365 deletions(-) diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index 84ab14afcbd9..d68cc2dc2bd5 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig @@ -789,6 +789,7 @@ config CRYPTO_DEV_ROCKCHIP select CRYPTO_CBC select CRYPTO_DES select CRYPTO_AES + select CRYPTO_ENGINE select CRYPTO_LIB_DES select CRYPTO_MD5 select CRYPTO_SHA1 diff --git a/drivers/crypto/rockchip/rk3288_crypto.c b/drivers/crypto/rockc= hip/rk3288_crypto.c index b3db096e2ec2..1afb65eee6c9 100644 --- a/drivers/crypto/rockchip/rk3288_crypto.c +++ b/drivers/crypto/rockchip/rk3288_crypto.c @@ -65,149 +65,24 @@ static void rk_crypto_disable_clk(struct rk_crypto_inf= o *dev) clk_disable_unprepare(dev->sclk); } =20 -static int check_alignment(struct scatterlist *sg_src, - struct scatterlist *sg_dst, - int align_mask) -{ - int in, out, align; - - in =3D IS_ALIGNED((uint32_t)sg_src->offset, 4) && - IS_ALIGNED((uint32_t)sg_src->length, align_mask); - if (!sg_dst) - return in; - out =3D IS_ALIGNED((uint32_t)sg_dst->offset, 4) && - IS_ALIGNED((uint32_t)sg_dst->length, align_mask); - align =3D in && out; - - return (align && (sg_src->length =3D=3D sg_dst->length)); -} - -static int rk_load_data(struct rk_crypto_info *dev, - struct scatterlist *sg_src, - struct scatterlist *sg_dst) -{ - unsigned int count; - - count =3D min(dev->left_bytes, sg_src->length); - dev->left_bytes -=3D count; - - if (!dma_map_sg(dev->dev, sg_src, 1, DMA_TO_DEVICE)) { - dev_err(dev->dev, "[%s:%d] dma_map_sg(src) error\n", - __func__, __LINE__); - return -EINVAL; - } - dev->addr_in =3D sg_dma_address(sg_src); - - if (sg_dst) { - if (!dma_map_sg(dev->dev, sg_dst, 1, DMA_FROM_DEVICE)) { - dev_err(dev->dev, - "[%s:%d] dma_map_sg(dst) error\n", - __func__, __LINE__); - dma_unmap_sg(dev->dev, sg_src, 1, - DMA_TO_DEVICE); - return -EINVAL; - } - dev->addr_out =3D sg_dma_address(sg_dst); - } - dev->count =3D count; - return 0; -} - -static void rk_unload_data(struct rk_crypto_info *dev) -{ - struct scatterlist *sg_in, *sg_out; - - sg_in =3D dev->sg_src; - dma_unmap_sg(dev->dev, sg_in, 1, DMA_TO_DEVICE); - - if (dev->sg_dst) { - sg_out =3D dev->sg_dst; - dma_unmap_sg(dev->dev, sg_out, 1, DMA_FROM_DEVICE); - } -} - static irqreturn_t rk_crypto_irq_handle(int irq, void *dev_id) { struct rk_crypto_info *dev =3D platform_get_drvdata(dev_id); u32 interrupt_status; =20 - spin_lock(&dev->lock); interrupt_status =3D CRYPTO_READ(dev, RK_CRYPTO_INTSTS); CRYPTO_WRITE(dev, RK_CRYPTO_INTSTS, interrupt_status); =20 + dev->status =3D 1; if (interrupt_status & 0x0a) { dev_warn(dev->dev, "DMA Error\n"); - dev->err =3D -EFAULT; + dev->status =3D 0; } - tasklet_schedule(&dev->done_task); + complete(&dev->complete); =20 - spin_unlock(&dev->lock); return IRQ_HANDLED; } =20 -static int rk_crypto_enqueue(struct rk_crypto_info *dev, - struct crypto_async_request *async_req) -{ - unsigned long flags; - int ret; - - spin_lock_irqsave(&dev->lock, flags); - ret =3D crypto_enqueue_request(&dev->queue, async_req); - if (dev->busy) { - spin_unlock_irqrestore(&dev->lock, flags); - return ret; - } - dev->busy =3D true; - spin_unlock_irqrestore(&dev->lock, flags); - tasklet_schedule(&dev->queue_task); - - return ret; -} - -static void rk_crypto_queue_task_cb(unsigned long data) -{ - struct rk_crypto_info *dev =3D (struct rk_crypto_info *)data; - struct crypto_async_request *async_req, *backlog; - unsigned long flags; - int err =3D 0; - - dev->err =3D 0; - spin_lock_irqsave(&dev->lock, flags); - backlog =3D crypto_get_backlog(&dev->queue); - async_req =3D crypto_dequeue_request(&dev->queue); - - if (!async_req) { - dev->busy =3D false; - spin_unlock_irqrestore(&dev->lock, flags); - return; - } - spin_unlock_irqrestore(&dev->lock, flags); - - if (backlog) { - backlog->complete(backlog, -EINPROGRESS); - backlog =3D NULL; - } - - dev->async_req =3D async_req; - err =3D dev->start(dev); - if (err) - dev->complete(dev->async_req, err); -} - -static void rk_crypto_done_task_cb(unsigned long data) -{ - struct rk_crypto_info *dev =3D (struct rk_crypto_info *)data; - - if (dev->err) { - dev->complete(dev->async_req, dev->err); - return; - } - - dev->err =3D dev->update(dev); - if (dev->err) - dev->complete(dev->async_req, dev->err); -} - static struct rk_crypto_tmp *rk_cipher_algs[] =3D { &rk_ecb_aes_alg, &rk_cbc_aes_alg, @@ -300,8 +175,6 @@ static int rk_crypto_probe(struct platform_device *pdev) if (err) goto err_crypto; =20 - spin_lock_init(&crypto_info->lock); - crypto_info->reg =3D devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(crypto_info->reg)) { err =3D PTR_ERR(crypto_info->reg); @@ -351,17 +224,11 @@ static int rk_crypto_probe(struct platform_device *pd= ev) crypto_info->dev =3D &pdev->dev; platform_set_drvdata(pdev, crypto_info); =20 - tasklet_init(&crypto_info->queue_task, - rk_crypto_queue_task_cb, (unsigned long)crypto_info); - tasklet_init(&crypto_info->done_task, - rk_crypto_done_task_cb, (unsigned long)crypto_info); - crypto_init_queue(&crypto_info->queue, 50); + crypto_info->engine =3D crypto_engine_alloc_init(&pdev->dev, true); + crypto_engine_start(crypto_info->engine); + init_completion(&crypto_info->complete); =20 rk_crypto_enable_clk(crypto_info); - crypto_info->load_data =3D rk_load_data; - crypto_info->unload_data =3D rk_unload_data; - crypto_info->enqueue =3D rk_crypto_enqueue; - crypto_info->busy =3D false; =20 err =3D rk_crypto_register(crypto_info); if (err) { @@ -373,9 +240,9 @@ static int rk_crypto_probe(struct platform_device *pdev) return 0; =20 err_register_alg: - tasklet_kill(&crypto_info->queue_task); - tasklet_kill(&crypto_info->done_task); + crypto_engine_exit(crypto_info->engine); err_crypto: + dev_err(dev, "Crypto Accelerator not successfully registered\n"); return err; } =20 @@ -385,8 +252,7 @@ static int rk_crypto_remove(struct platform_device *pde= v) =20 rk_crypto_unregister(); rk_crypto_disable_clk(crypto_tmp); - tasklet_kill(&crypto_tmp->done_task); - tasklet_kill(&crypto_tmp->queue_task); + crypto_engine_exit(crypto_tmp->engine); return 0; } =20 diff --git a/drivers/crypto/rockchip/rk3288_crypto.h b/drivers/crypto/rockc= hip/rk3288_crypto.h index a7de5738f6dc..65ed645e0168 100644 --- a/drivers/crypto/rockchip/rk3288_crypto.h +++ b/drivers/crypto/rockchip/rk3288_crypto.h @@ -5,9 +5,11 @@ #include #include #include +#include #include #include #include +#include #include #include =20 @@ -193,39 +195,15 @@ struct rk_crypto_info { struct reset_control *rst; void __iomem *reg; int irq; - struct crypto_queue queue; - struct tasklet_struct queue_task; - struct tasklet_struct done_task; - struct crypto_async_request *async_req; - int err; - /* device lock */ - spinlock_t lock; - - /* the public variable */ - struct scatterlist *sg_src; - struct scatterlist *sg_dst; - struct scatterlist *first; - unsigned int left_bytes; - size_t src_nents; - size_t dst_nents; - unsigned int total; - unsigned int count; - dma_addr_t addr_in; - dma_addr_t addr_out; - bool busy; - int (*start)(struct rk_crypto_info *dev); - int (*update)(struct rk_crypto_info *dev); - void (*complete)(struct crypto_async_request *base, int err); - int (*load_data)(struct rk_crypto_info *dev, - struct scatterlist *sg_src, - struct scatterlist *sg_dst); - void (*unload_data)(struct rk_crypto_info *dev); - int (*enqueue)(struct rk_crypto_info *dev, - struct crypto_async_request *async_req); + + struct crypto_engine *engine; + struct completion complete; + int status; }; =20 /* the private variable of hash */ struct rk_ahash_ctx { + struct crypto_engine_ctx enginectx; struct rk_crypto_info *dev; /* for fallback */ struct crypto_ahash *fallback_tfm; @@ -235,10 +213,12 @@ struct rk_ahash_ctx { struct rk_ahash_rctx { struct ahash_request fallback_req; u32 mode; + int nrsg; }; =20 /* the private variable of cipher */ struct rk_cipher_ctx { + struct crypto_engine_ctx enginectx; struct rk_crypto_info *dev; unsigned int keylen; u8 key[AES_MAX_KEY_SIZE]; @@ -247,6 +227,7 @@ struct rk_cipher_ctx { }; =20 struct rk_cipher_rctx { + u8 backup_iv[AES_BLOCK_SIZE]; u32 mode; struct skcipher_request fallback_req; // keep at the end }; diff --git a/drivers/crypto/rockchip/rk3288_crypto_ahash.c b/drivers/crypto= /rockchip/rk3288_crypto_ahash.c index c762e462eb57..edd40e16a3f0 100644 --- a/drivers/crypto/rockchip/rk3288_crypto_ahash.c +++ b/drivers/crypto/rockchip/rk3288_crypto_ahash.c @@ -9,6 +9,7 @@ * Some ideas are from marvell/cesa.c and s5p-sss.c driver. */ #include +#include #include "rk3288_crypto.h" =20 /* @@ -72,16 +73,12 @@ static int zero_message_process(struct ahash_request *r= eq) return 0; } =20 -static void rk_ahash_crypto_complete(struct crypto_async_request *base, in= t err) +static void rk_ahash_reg_init(struct ahash_request *req) { - if (base->complete) - base->complete(base, err); -} - -static void rk_ahash_reg_init(struct rk_crypto_info *dev) -{ - struct ahash_request *req =3D ahash_request_cast(dev->async_req); struct rk_ahash_rctx *rctx =3D ahash_request_ctx(req); + struct crypto_ahash *tfm =3D crypto_ahash_reqtfm(req); + struct rk_ahash_ctx *tctx =3D crypto_ahash_ctx(tfm); + struct rk_crypto_info *dev =3D tctx->dev; int reg_status; =20 reg_status =3D CRYPTO_READ(dev, RK_CRYPTO_CTRL) | @@ -108,7 +105,7 @@ static void rk_ahash_reg_init(struct rk_crypto_info *de= v) RK_CRYPTO_BYTESWAP_BRFIFO | RK_CRYPTO_BYTESWAP_BTFIFO); =20 - CRYPTO_WRITE(dev, RK_CRYPTO_HASH_MSG_LEN, dev->total); + CRYPTO_WRITE(dev, RK_CRYPTO_HASH_MSG_LEN, req->nbytes); } =20 static int rk_ahash_init(struct ahash_request *req) @@ -206,44 +203,59 @@ static int rk_ahash_digest(struct ahash_request *req) =20 if (!req->nbytes) return zero_message_process(req); - else - return dev->enqueue(dev, &req->base); + + return crypto_transfer_hash_request_to_engine(dev->engine, req); } =20 -static void crypto_ahash_dma_start(struct rk_crypto_info *dev) +static void crypto_ahash_dma_start(struct rk_crypto_info *dev, struct scat= terlist *sg) { - CRYPTO_WRITE(dev, RK_CRYPTO_HRDMAS, dev->addr_in); - CRYPTO_WRITE(dev, RK_CRYPTO_HRDMAL, (dev->count + 3) / 4); + CRYPTO_WRITE(dev, RK_CRYPTO_HRDMAS, sg_dma_address(sg)); + CRYPTO_WRITE(dev, RK_CRYPTO_HRDMAL, sg_dma_len(sg) / 4); CRYPTO_WRITE(dev, RK_CRYPTO_CTRL, RK_CRYPTO_HASH_START | (RK_CRYPTO_HASH_START << 16)); } =20 -static int rk_ahash_set_data_start(struct rk_crypto_info *dev) +static int rk_hash_prepare(struct crypto_engine *engine, void *breq) +{ + struct ahash_request *areq =3D container_of(breq, struct ahash_request, b= ase); + struct crypto_ahash *tfm =3D crypto_ahash_reqtfm(areq); + struct rk_ahash_rctx *rctx =3D ahash_request_ctx(areq); + struct rk_ahash_ctx *tctx =3D crypto_ahash_ctx(tfm); + int ret; + + ret =3D dma_map_sg(tctx->dev->dev, areq->src, sg_nents(areq->src), DMA_TO= _DEVICE); + if (ret <=3D 0) + return -EINVAL; + + rctx->nrsg =3D ret; + + return 0; +} + +static int rk_hash_unprepare(struct crypto_engine *engine, void *breq) { - int err; + struct ahash_request *areq =3D container_of(breq, struct ahash_request, b= ase); + struct crypto_ahash *tfm =3D crypto_ahash_reqtfm(areq); + struct rk_ahash_rctx *rctx =3D ahash_request_ctx(areq); + struct rk_ahash_ctx *tctx =3D crypto_ahash_ctx(tfm); =20 - err =3D dev->load_data(dev, dev->sg_src, NULL); - if (!err) - crypto_ahash_dma_start(dev); - return err; + dma_unmap_sg(tctx->dev->dev, areq->src, rctx->nrsg, DMA_TO_DEVICE); + return 0; } =20 -static int rk_ahash_start(struct rk_crypto_info *dev) +static int rk_hash_run(struct crypto_engine *engine, void *breq) { - struct ahash_request *req =3D ahash_request_cast(dev->async_req); - struct crypto_ahash *tfm; - struct rk_ahash_rctx *rctx; - - dev->total =3D req->nbytes; - dev->left_bytes =3D req->nbytes; - dev->sg_dst =3D NULL; - dev->sg_src =3D req->src; - dev->first =3D req->src; - dev->src_nents =3D sg_nents(req->src); - rctx =3D ahash_request_ctx(req); + struct ahash_request *areq =3D container_of(breq, struct ahash_request, b= ase); + struct crypto_ahash *tfm =3D crypto_ahash_reqtfm(areq); + struct rk_ahash_rctx *rctx =3D ahash_request_ctx(areq); + struct rk_ahash_ctx *tctx =3D crypto_ahash_ctx(tfm); + struct scatterlist *sg =3D areq->src; + int err =3D 0; + int i; + u32 v; + rctx->mode =3D 0; =20 - tfm =3D crypto_ahash_reqtfm(req); switch (crypto_ahash_digestsize(tfm)) { case SHA1_DIGEST_SIZE: rctx->mode =3D RK_CRYPTO_HASH_SHA1; @@ -255,30 +267,26 @@ static int rk_ahash_start(struct rk_crypto_info *dev) rctx->mode =3D RK_CRYPTO_HASH_MD5; break; default: - return -EINVAL; + err =3D -EINVAL; + goto theend; } =20 - rk_ahash_reg_init(dev); - return rk_ahash_set_data_start(dev); -} + rk_ahash_reg_init(areq); =20 -static int rk_ahash_crypto_rx(struct rk_crypto_info *dev) -{ - int err =3D 0; - struct ahash_request *req =3D ahash_request_cast(dev->async_req); - struct crypto_ahash *tfm; - - dev->unload_data(dev); - if (dev->left_bytes) { - if (sg_is_last(dev->sg_src)) { - dev_warn(dev->dev, "[%s:%d], Lack of data\n", - __func__, __LINE__); - err =3D -ENOMEM; - goto out_rx; + while (sg) { + reinit_completion(&tctx->dev->complete); + tctx->dev->status =3D 0; + crypto_ahash_dma_start(tctx->dev, sg); + wait_for_completion_interruptible_timeout(&tctx->dev->complete, + msecs_to_jiffies(2000)); + if (!tctx->dev->status) { + dev_err(tctx->dev->dev, "DMA timeout\n"); + err =3D -EFAULT; + goto theend; } - dev->sg_src =3D sg_next(dev->sg_src); - err =3D rk_ahash_set_data_start(dev); - } else { + sg =3D sg_next(sg); + } + /* * it will take some time to process date after last dma * transmission. @@ -289,18 +297,20 @@ static int rk_ahash_crypto_rx(struct rk_crypto_info *= dev) * efficiency, and make it response quickly when dma * complete. */ - while (!CRYPTO_READ(dev, RK_CRYPTO_HASH_STS)) - udelay(10); - - tfm =3D crypto_ahash_reqtfm(req); - memcpy_fromio(req->result, dev->reg + RK_CRYPTO_HASH_DOUT_0, - crypto_ahash_digestsize(tfm)); - dev->complete(dev->async_req, 0); - tasklet_schedule(&dev->queue_task); + while (!CRYPTO_READ(tctx->dev, RK_CRYPTO_HASH_STS)) + udelay(10); + + for (i =3D 0; i < crypto_ahash_digestsize(tfm) / 4; i++) { + v =3D readl(tctx->dev->reg + RK_CRYPTO_HASH_DOUT_0 + i * 4); + put_unaligned_le32(v, areq->result + i * 4); } =20 -out_rx: - return err; +theend: + local_bh_disable(); + crypto_finalize_hash_request(engine, breq, err); + local_bh_enable(); + + return 0; } =20 static int rk_cra_hash_init(struct crypto_tfm *tfm) @@ -314,9 +324,6 @@ static int rk_cra_hash_init(struct crypto_tfm *tfm) algt =3D container_of(alg, struct rk_crypto_tmp, alg.hash); =20 tctx->dev =3D algt->dev; - tctx->dev->start =3D rk_ahash_start; - tctx->dev->update =3D rk_ahash_crypto_rx; - tctx->dev->complete =3D rk_ahash_crypto_complete; =20 /* for fallback */ tctx->fallback_tfm =3D crypto_alloc_ahash(alg_name, 0, @@ -325,10 +332,15 @@ static int rk_cra_hash_init(struct crypto_tfm *tfm) dev_err(tctx->dev->dev, "Could not load fallback driver.\n"); return PTR_ERR(tctx->fallback_tfm); } + crypto_ahash_set_reqsize(__crypto_ahash_cast(tfm), sizeof(struct rk_ahash_rctx) + crypto_ahash_reqsize(tctx->fallback_tfm)); =20 + tctx->enginectx.op.do_one_request =3D rk_hash_run; + tctx->enginectx.op.prepare_request =3D rk_hash_prepare; + tctx->enginectx.op.unprepare_request =3D rk_hash_unprepare; + return 0; } =20 diff --git a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c b/drivers/cry= pto/rockchip/rk3288_crypto_skcipher.c index d067b7f09165..67a7e05d5ae3 100644 --- a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c +++ b/drivers/crypto/rockchip/rk3288_crypto_skcipher.c @@ -9,6 +9,7 @@ * Some ideas are from marvell-cesa.c and s5p-sss.c driver. */ #include +#include #include "rk3288_crypto.h" =20 #define RK_CRYPTO_DEC BIT(0) @@ -70,19 +71,15 @@ static int rk_cipher_fallback(struct skcipher_request *= areq) return err; } =20 -static void rk_crypto_complete(struct crypto_async_request *base, int err) -{ - if (base->complete) - base->complete(base, err); -} - static int rk_handle_req(struct rk_crypto_info *dev, struct skcipher_request *req) { + struct crypto_engine *engine =3D dev->engine; + if (rk_cipher_need_fallback(req)) return rk_cipher_fallback(req); =20 - return dev->enqueue(dev, &req->base); + return crypto_transfer_skcipher_request_to_engine(engine, req); } =20 static int rk_aes_setkey(struct crypto_skcipher *cipher, @@ -265,25 +262,21 @@ static int rk_des3_ede_cbc_decrypt(struct skcipher_re= quest *req) return rk_handle_req(dev, req); } =20 -static void rk_ablk_hw_init(struct rk_crypto_info *dev) +static void rk_ablk_hw_init(struct rk_crypto_info *dev, struct skcipher_re= quest *req) { - struct skcipher_request *req =3D - skcipher_request_cast(dev->async_req); struct crypto_skcipher *cipher =3D crypto_skcipher_reqtfm(req); struct crypto_tfm *tfm =3D crypto_skcipher_tfm(cipher); struct rk_cipher_rctx *rctx =3D skcipher_request_ctx(req); struct rk_cipher_ctx *ctx =3D crypto_skcipher_ctx(cipher); - u32 ivsize, block, conf_reg =3D 0; + u32 block, conf_reg =3D 0; =20 block =3D crypto_tfm_alg_blocksize(tfm); - ivsize =3D crypto_skcipher_ivsize(cipher); =20 if (block =3D=3D DES_BLOCK_SIZE) { rctx->mode |=3D RK_CRYPTO_TDES_FIFO_MODE | RK_CRYPTO_TDES_BYTESWAP_KEY | RK_CRYPTO_TDES_BYTESWAP_IV; CRYPTO_WRITE(dev, RK_CRYPTO_TDES_CTRL, rctx->mode); - memcpy_toio(dev->reg + RK_CRYPTO_TDES_IV_0, req->iv, ivsize); memcpy_toio(ctx->dev->reg + RK_CRYPTO_TDES_KEY1_0, ctx->key, ctx->keylen= ); conf_reg =3D RK_CRYPTO_DESSEL; } else { @@ -296,7 +289,6 @@ static void rk_ablk_hw_init(struct rk_crypto_info *dev) else if (ctx->keylen =3D=3D AES_KEYSIZE_256) rctx->mode |=3D RK_CRYPTO_AES_256BIT_key; CRYPTO_WRITE(dev, RK_CRYPTO_AES_CTRL, rctx->mode); - memcpy_toio(dev->reg + RK_CRYPTO_AES_IV_0, req->iv, ivsize); memcpy_toio(ctx->dev->reg + RK_CRYPTO_AES_KEY_0, ctx->key, ctx->keylen); } conf_reg |=3D RK_CRYPTO_BYTESWAP_BTFIFO | @@ -306,133 +298,138 @@ static void rk_ablk_hw_init(struct rk_crypto_info *= dev) RK_CRYPTO_BCDMA_ERR_ENA | RK_CRYPTO_BCDMA_DONE_ENA); } =20 -static void crypto_dma_start(struct rk_crypto_info *dev) +static void crypto_dma_start(struct rk_crypto_info *dev, + struct scatterlist *sgs, + struct scatterlist *sgd, unsigned int todo) { - CRYPTO_WRITE(dev, RK_CRYPTO_BRDMAS, dev->addr_in); - CRYPTO_WRITE(dev, RK_CRYPTO_BRDMAL, dev->count / 4); - CRYPTO_WRITE(dev, RK_CRYPTO_BTDMAS, dev->addr_out); + CRYPTO_WRITE(dev, RK_CRYPTO_BRDMAS, sg_dma_address(sgs)); + CRYPTO_WRITE(dev, RK_CRYPTO_BRDMAL, todo); + CRYPTO_WRITE(dev, RK_CRYPTO_BTDMAS, sg_dma_address(sgd)); CRYPTO_WRITE(dev, RK_CRYPTO_CTRL, RK_CRYPTO_BLOCK_START | _SBF(RK_CRYPTO_BLOCK_START, 16)); } =20 -static int rk_set_data_start(struct rk_crypto_info *dev) +static int rk_cipher_run(struct crypto_engine *engine, void *async_req) { - int err; - struct skcipher_request *req =3D - skcipher_request_cast(dev->async_req); - struct crypto_skcipher *tfm =3D crypto_skcipher_reqtfm(req); - struct rk_cipher_rctx *rctx =3D skcipher_request_ctx(req); + struct skcipher_request *areq =3D container_of(async_req, struct skcipher= _request, base); + struct crypto_skcipher *tfm =3D crypto_skcipher_reqtfm(areq); struct rk_cipher_ctx *ctx =3D crypto_skcipher_ctx(tfm); - u32 ivsize =3D crypto_skcipher_ivsize(tfm); - u8 *src_last_blk =3D page_address(sg_page(dev->sg_src)) + - dev->sg_src->offset + dev->sg_src->length - ivsize; - - /* Store the iv that need to be updated in chain mode. - * And update the IV buffer to contain the next IV for decryption mode. - */ - if (rctx->mode & RK_CRYPTO_DEC) { - memcpy(ctx->iv, src_last_blk, ivsize); - sg_pcopy_to_buffer(dev->first, dev->src_nents, req->iv, - ivsize, dev->total - ivsize); - } - - err =3D dev->load_data(dev, dev->sg_src, dev->sg_dst); - if (!err) - crypto_dma_start(dev); - return err; -} - -static int rk_ablk_start(struct rk_crypto_info *dev) -{ - struct skcipher_request *req =3D - skcipher_request_cast(dev->async_req); - unsigned long flags; + struct rk_cipher_rctx *rctx =3D skcipher_request_ctx(areq); + struct scatterlist *sgs, *sgd; int err =3D 0; + int ivsize =3D crypto_skcipher_ivsize(tfm); + int offset; + u8 iv[AES_BLOCK_SIZE]; + u8 biv[AES_BLOCK_SIZE]; + u8 *ivtouse =3D areq->iv; + unsigned int len =3D areq->cryptlen; + unsigned int todo; + + ivsize =3D crypto_skcipher_ivsize(tfm); + if (areq->iv && crypto_skcipher_ivsize(tfm) > 0) { + if (rctx->mode & RK_CRYPTO_DEC) { + offset =3D areq->cryptlen - ivsize; + scatterwalk_map_and_copy(rctx->backup_iv, areq->src, + offset, ivsize, 0); + } + } =20 - dev->left_bytes =3D req->cryptlen; - dev->total =3D req->cryptlen; - dev->sg_src =3D req->src; - dev->first =3D req->src; - dev->src_nents =3D sg_nents(req->src); - dev->sg_dst =3D req->dst; - dev->dst_nents =3D sg_nents(req->dst); - - spin_lock_irqsave(&dev->lock, flags); - rk_ablk_hw_init(dev); - err =3D rk_set_data_start(dev); - spin_unlock_irqrestore(&dev->lock, flags); - return err; -} - -static void rk_iv_copyback(struct rk_crypto_info *dev) -{ - struct skcipher_request *req =3D - skcipher_request_cast(dev->async_req); - struct crypto_skcipher *tfm =3D crypto_skcipher_reqtfm(req); - struct rk_cipher_rctx *rctx =3D skcipher_request_ctx(req); - struct rk_cipher_ctx *ctx =3D crypto_skcipher_ctx(tfm); - u32 ivsize =3D crypto_skcipher_ivsize(tfm); + sgs =3D areq->src; + sgd =3D areq->dst; =20 - /* Update the IV buffer to contain the next IV for encryption mode. */ - if (!(rctx->mode & RK_CRYPTO_DEC)) { - memcpy(req->iv, - sg_virt(dev->sg_dst) + dev->sg_dst->length - ivsize, - ivsize); + while (sgs && sgd && len) { + if (!sgs->length) { + sgs =3D sg_next(sgs); + sgd =3D sg_next(sgd); + continue; + } + if (rctx->mode & RK_CRYPTO_DEC) { + /* we backup last block of source to be used as IV at next step */ + offset =3D sgs->length - ivsize; + scatterwalk_map_and_copy(biv, sgs, offset, ivsize, 0); + } + if (sgs =3D=3D sgd) { + err =3D dma_map_sg(ctx->dev->dev, sgs, 1, DMA_BIDIRECTIONAL); + if (err <=3D 0) { + err =3D -EINVAL; + goto theend_iv; + } + } else { + err =3D dma_map_sg(ctx->dev->dev, sgs, 1, DMA_TO_DEVICE); + if (err <=3D 0) { + err =3D -EINVAL; + goto theend_iv; + } + err =3D dma_map_sg(ctx->dev->dev, sgd, 1, DMA_FROM_DEVICE); + if (err <=3D 0) { + err =3D -EINVAL; + goto theend_sgs; + } + } + err =3D 0; + rk_ablk_hw_init(ctx->dev, areq); + if (ivsize) { + if (ivsize =3D=3D DES_BLOCK_SIZE) + memcpy_toio(ctx->dev->reg + RK_CRYPTO_TDES_IV_0, ivtouse, ivsize); + else + memcpy_toio(ctx->dev->reg + RK_CRYPTO_AES_IV_0, ivtouse, ivsize); + } + reinit_completion(&ctx->dev->complete); + ctx->dev->status =3D 0; + + todo =3D min(sg_dma_len(sgs), len); + len -=3D todo; + crypto_dma_start(ctx->dev, sgs, sgd, todo / 4); + wait_for_completion_interruptible_timeout(&ctx->dev->complete, + msecs_to_jiffies(2000)); + if (!ctx->dev->status) { + dev_err(ctx->dev->dev, "DMA timeout\n"); + err =3D -EFAULT; + goto theend; + } + if (sgs =3D=3D sgd) { + dma_unmap_sg(ctx->dev->dev, sgs, 1, DMA_BIDIRECTIONAL); + } else { + dma_unmap_sg(ctx->dev->dev, sgs, 1, DMA_TO_DEVICE); + dma_unmap_sg(ctx->dev->dev, sgd, 1, DMA_FROM_DEVICE); + } + if (rctx->mode & RK_CRYPTO_DEC) { + memcpy(iv, biv, ivsize); + ivtouse =3D iv; + } else { + offset =3D sgd->length - ivsize; + scatterwalk_map_and_copy(iv, sgd, offset, ivsize, 0); + ivtouse =3D iv; + } + sgs =3D sg_next(sgs); + sgd =3D sg_next(sgd); } -} - -static void rk_update_iv(struct rk_crypto_info *dev) -{ - struct skcipher_request *req =3D - skcipher_request_cast(dev->async_req); - struct crypto_skcipher *tfm =3D crypto_skcipher_reqtfm(req); - struct rk_cipher_rctx *rctx =3D skcipher_request_ctx(req); - struct rk_cipher_ctx *ctx =3D crypto_skcipher_ctx(tfm); - u32 ivsize =3D crypto_skcipher_ivsize(tfm); - u8 *new_iv =3D NULL; =20 - if (rctx->mode & RK_CRYPTO_DEC) { - new_iv =3D ctx->iv; - } else { - new_iv =3D page_address(sg_page(dev->sg_dst)) + - dev->sg_dst->offset + dev->sg_dst->length - ivsize; + if (areq->iv && ivsize > 0) { + offset =3D areq->cryptlen - ivsize; + if (rctx->mode & RK_CRYPTO_DEC) { + memcpy(areq->iv, rctx->backup_iv, ivsize); + memzero_explicit(rctx->backup_iv, ivsize); + } else { + scatterwalk_map_and_copy(areq->iv, areq->dst, offset, + ivsize, 0); + } } =20 - if (ivsize =3D=3D DES_BLOCK_SIZE) - memcpy_toio(dev->reg + RK_CRYPTO_TDES_IV_0, new_iv, ivsize); - else if (ivsize =3D=3D AES_BLOCK_SIZE) - memcpy_toio(dev->reg + RK_CRYPTO_AES_IV_0, new_iv, ivsize); -} +theend: + local_bh_disable(); + crypto_finalize_skcipher_request(engine, areq, err); + local_bh_enable(); + return 0; =20 -/* return: - * true some err was occurred - * fault no err, continue - */ -static int rk_ablk_rx(struct rk_crypto_info *dev) -{ - int err =3D 0; - struct skcipher_request *req =3D - skcipher_request_cast(dev->async_req); - - dev->unload_data(dev); - if (dev->left_bytes) { - rk_update_iv(dev); - if (sg_is_last(dev->sg_src)) { - dev_err(dev->dev, "[%s:%d] Lack of data\n", - __func__, __LINE__); - err =3D -ENOMEM; - goto out_rx; - } - dev->sg_src =3D sg_next(dev->sg_src); - dev->sg_dst =3D sg_next(dev->sg_dst); - err =3D rk_set_data_start(dev); +theend_sgs: + if (sgs =3D=3D sgd) { + dma_unmap_sg(ctx->dev->dev, sgs, 1, DMA_BIDIRECTIONAL); } else { - rk_iv_copyback(dev); - /* here show the calculation is over without any err */ - dev->complete(dev->async_req, 0); - tasklet_schedule(&dev->queue_task); + dma_unmap_sg(ctx->dev->dev, sgs, 1, DMA_TO_DEVICE); + dma_unmap_sg(ctx->dev->dev, sgd, 1, DMA_FROM_DEVICE); } -out_rx: +theend_iv: return err; } =20 @@ -446,9 +443,6 @@ static int rk_ablk_init_tfm(struct crypto_skcipher *tfm) algt =3D container_of(alg, struct rk_crypto_tmp, alg.skcipher); =20 ctx->dev =3D algt->dev; - ctx->dev->start =3D rk_ablk_start; - ctx->dev->update =3D rk_ablk_rx; - ctx->dev->complete =3D rk_crypto_complete; =20 ctx->fallback_tfm =3D crypto_alloc_skcipher(name, 0, CRYPTO_ALG_NEED_FALL= BACK); if (IS_ERR(ctx->fallback_tfm)) { @@ -460,6 +454,8 @@ static int rk_ablk_init_tfm(struct crypto_skcipher *tfm) tfm->reqsize =3D sizeof(struct rk_cipher_rctx) + crypto_skcipher_reqsize(ctx->fallback_tfm); =20 + ctx->enginectx.op.do_one_request =3D rk_cipher_run; + return 0; } =20 --=20 2.35.1 From nobody Sun May 10 19:51:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 07D49C433EF for ; Mon, 25 Apr 2022 20:22:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230343AbiDYUZY (ORCPT ); Mon, 25 Apr 2022 16:25:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39794 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245244AbiDYUYr (ORCPT ); Mon, 25 Apr 2022 16:24:47 -0400 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E607B128CE4 for ; Mon, 25 Apr 2022 13:21:39 -0700 (PDT) Received: by mail-wm1-x335.google.com with SMTP id v64-20020a1cac43000000b0038cfd1b3a6dso228227wme.5 for ; Mon, 25 Apr 2022 13:21:39 -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=yeUZDJTIsCts00Fep9NY/D3Rc1u7GLFRGKGWO5X+Gz0=; b=nAQmC7u+UldzYzzZ50Fy7PQerMveM73py3LRvoMHJSNup+HQDx1iLMjizbcVLRvlvW k89ex9vNe45ctnpIQb6m89ZgTxnhKaOxKNu5M+k3wvftmzVQW+IUQst0Aq/EQF/GHE0N aVa89Uwmyn7qEvCScHjiomWP0rByq70rvsdiqwBJkMN9ojC39pyhpTDlorVphzLCn0K+ NZGePwGSeHy2j2UuPy5cRAlN6BPwR/tepZcfn9R+yUqML8c6SOqpjKnd2Ls7EeQiWi6b jVD6ZSbIzBX+PNHMTkYBxdtfCatVecVHnY20C2vlYUUTpg2aoTVzBMq+P2spQ+1Mwufs z+og== 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=yeUZDJTIsCts00Fep9NY/D3Rc1u7GLFRGKGWO5X+Gz0=; b=AhFT7PJ6WazdpBO2KnZvupNZsA5CdCRfcAzFoYDbqd5PIb/IzGWhP1E9yV4X4uFyUo 0K3GYzZI3qZw+JJMadJWY/XCrbofI0KcuySmd56Ug3NexNiUC4z1I5Fn/v1UdqOgUC+c e8uw1uEipo4bTalIvcM7nQ/I963jJUJ1PDEGtNWySNRO7tJ1MOMHFFgOmoWiVgVNZatw NjxH7LQ45tGeenN1ukig+dLYDYc84K6881X3U9Hu+jxaPZQwasY7WpwVvHxWcWcffA9t rus/uEIrVNEEBSuPWFiit7YH+IzVeacKKn0oB+GaUTFPBMURnj+4FKDirpZaKzXmCg5n UgpA== X-Gm-Message-State: AOAM5337krxiuW3B7rbkeed83gQUkWW80BFV1qTAGP4WgZOZqiWjv/2Q iFa5HkD3766qVhzqUuwP9QMBZg== X-Google-Smtp-Source: ABdhPJwH/jZysb7BFoCAlU8r3BdwsnEND3acQxX6+NhslEl8M6PBhRR2lr3Be3bAFnm/H5DwSvpapg== X-Received: by 2002:a7b:c5cd:0:b0:38c:8b1b:d220 with SMTP id n13-20020a7bc5cd000000b0038c8b1bd220mr17897297wmk.118.1650918098168; Mon, 25 Apr 2022 13:21:38 -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 p3-20020a5d59a3000000b0020a9132d1fbsm11101003wrr.37.2022.04.25.13.21.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 13:21:37 -0700 (PDT) From: Corentin Labbe To: heiko@sntech.de, herbert@gondor.apana.org.au, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org Cc: linux-crypto@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Corentin Labbe Subject: [PATCH v6 11/33] crypto: rockchip: rewrite type Date: Mon, 25 Apr 2022 20:20:57 +0000 Message-Id: <20220425202119.3566743-12-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220425202119.3566743-1-clabbe@baylibre.com> References: <20220425202119.3566743-1-clabbe@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Instead of using a custom type for classify algorithms, let's just use already defined ones. And let's made a bit more verbose about what is registered. Signed-off-by: Corentin Labbe --- drivers/crypto/rockchip/rk3288_crypto.c | 26 +++++++++++++------ drivers/crypto/rockchip/rk3288_crypto.h | 7 +---- drivers/crypto/rockchip/rk3288_crypto_ahash.c | 6 ++--- .../crypto/rockchip/rk3288_crypto_skcipher.c | 12 ++++----- 4 files changed, 28 insertions(+), 23 deletions(-) diff --git a/drivers/crypto/rockchip/rk3288_crypto.c b/drivers/crypto/rockc= hip/rk3288_crypto.c index 1afb65eee6c9..8f9664acc78d 100644 --- a/drivers/crypto/rockchip/rk3288_crypto.c +++ b/drivers/crypto/rockchip/rk3288_crypto.c @@ -102,12 +102,22 @@ static int rk_crypto_register(struct rk_crypto_info *= crypto_info) =20 for (i =3D 0; i < ARRAY_SIZE(rk_cipher_algs); i++) { rk_cipher_algs[i]->dev =3D crypto_info; - if (rk_cipher_algs[i]->type =3D=3D ALG_TYPE_CIPHER) - err =3D crypto_register_skcipher( - &rk_cipher_algs[i]->alg.skcipher); - else - err =3D crypto_register_ahash( - &rk_cipher_algs[i]->alg.hash); + switch (rk_cipher_algs[i]->type) { + case CRYPTO_ALG_TYPE_SKCIPHER: + dev_info(crypto_info->dev, "Register %s as %s\n", + rk_cipher_algs[i]->alg.skcipher.base.cra_name, + rk_cipher_algs[i]->alg.skcipher.base.cra_driver_name); + err =3D crypto_register_skcipher(&rk_cipher_algs[i]->alg.skcipher); + break; + case CRYPTO_ALG_TYPE_AHASH: + dev_info(crypto_info->dev, "Register %s as %s\n", + rk_cipher_algs[i]->alg.hash.halg.base.cra_name, + rk_cipher_algs[i]->alg.hash.halg.base.cra_driver_name); + err =3D crypto_register_ahash(&rk_cipher_algs[i]->alg.hash); + break; + default: + dev_err(crypto_info->dev, "unknown algorithm\n"); + } if (err) goto err_cipher_algs; } @@ -115,7 +125,7 @@ static int rk_crypto_register(struct rk_crypto_info *cr= ypto_info) =20 err_cipher_algs: for (k =3D 0; k < i; k++) { - if (rk_cipher_algs[i]->type =3D=3D ALG_TYPE_CIPHER) + if (rk_cipher_algs[i]->type =3D=3D CRYPTO_ALG_TYPE_SKCIPHER) crypto_unregister_skcipher(&rk_cipher_algs[k]->alg.skcipher); else crypto_unregister_ahash(&rk_cipher_algs[i]->alg.hash); @@ -128,7 +138,7 @@ static void rk_crypto_unregister(void) unsigned int i; =20 for (i =3D 0; i < ARRAY_SIZE(rk_cipher_algs); i++) { - if (rk_cipher_algs[i]->type =3D=3D ALG_TYPE_CIPHER) + if (rk_cipher_algs[i]->type =3D=3D CRYPTO_ALG_TYPE_SKCIPHER) crypto_unregister_skcipher(&rk_cipher_algs[i]->alg.skcipher); else crypto_unregister_ahash(&rk_cipher_algs[i]->alg.hash); diff --git a/drivers/crypto/rockchip/rk3288_crypto.h b/drivers/crypto/rockc= hip/rk3288_crypto.h index 65ed645e0168..d924ea17402a 100644 --- a/drivers/crypto/rockchip/rk3288_crypto.h +++ b/drivers/crypto/rockchip/rk3288_crypto.h @@ -232,18 +232,13 @@ struct rk_cipher_rctx { struct skcipher_request fallback_req; // keep at the end }; =20 -enum alg_type { - ALG_TYPE_HASH, - ALG_TYPE_CIPHER, -}; - struct rk_crypto_tmp { + u32 type; struct rk_crypto_info *dev; union { struct skcipher_alg skcipher; struct ahash_alg hash; } alg; - enum alg_type type; }; =20 extern struct rk_crypto_tmp rk_ecb_aes_alg; diff --git a/drivers/crypto/rockchip/rk3288_crypto_ahash.c b/drivers/crypto= /rockchip/rk3288_crypto_ahash.c index edd40e16a3f0..d08e2438d356 100644 --- a/drivers/crypto/rockchip/rk3288_crypto_ahash.c +++ b/drivers/crypto/rockchip/rk3288_crypto_ahash.c @@ -352,7 +352,7 @@ static void rk_cra_hash_exit(struct crypto_tfm *tfm) } =20 struct rk_crypto_tmp rk_ahash_sha1 =3D { - .type =3D ALG_TYPE_HASH, + .type =3D CRYPTO_ALG_TYPE_AHASH, .alg.hash =3D { .init =3D rk_ahash_init, .update =3D rk_ahash_update, @@ -382,7 +382,7 @@ struct rk_crypto_tmp rk_ahash_sha1 =3D { }; =20 struct rk_crypto_tmp rk_ahash_sha256 =3D { - .type =3D ALG_TYPE_HASH, + .type =3D CRYPTO_ALG_TYPE_AHASH, .alg.hash =3D { .init =3D rk_ahash_init, .update =3D rk_ahash_update, @@ -412,7 +412,7 @@ struct rk_crypto_tmp rk_ahash_sha256 =3D { }; =20 struct rk_crypto_tmp rk_ahash_md5 =3D { - .type =3D ALG_TYPE_HASH, + .type =3D CRYPTO_ALG_TYPE_AHASH, .alg.hash =3D { .init =3D rk_ahash_init, .update =3D rk_ahash_update, diff --git a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c b/drivers/cry= pto/rockchip/rk3288_crypto_skcipher.c index 67a7e05d5ae3..1ed297f5d809 100644 --- a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c +++ b/drivers/crypto/rockchip/rk3288_crypto_skcipher.c @@ -468,7 +468,7 @@ static void rk_ablk_exit_tfm(struct crypto_skcipher *tf= m) } =20 struct rk_crypto_tmp rk_ecb_aes_alg =3D { - .type =3D ALG_TYPE_CIPHER, + .type =3D CRYPTO_ALG_TYPE_SKCIPHER, .alg.skcipher =3D { .base.cra_name =3D "ecb(aes)", .base.cra_driver_name =3D "ecb-aes-rk", @@ -490,7 +490,7 @@ struct rk_crypto_tmp rk_ecb_aes_alg =3D { }; =20 struct rk_crypto_tmp rk_cbc_aes_alg =3D { - .type =3D ALG_TYPE_CIPHER, + .type =3D CRYPTO_ALG_TYPE_SKCIPHER, .alg.skcipher =3D { .base.cra_name =3D "cbc(aes)", .base.cra_driver_name =3D "cbc-aes-rk", @@ -513,7 +513,7 @@ struct rk_crypto_tmp rk_cbc_aes_alg =3D { }; =20 struct rk_crypto_tmp rk_ecb_des_alg =3D { - .type =3D ALG_TYPE_CIPHER, + .type =3D CRYPTO_ALG_TYPE_SKCIPHER, .alg.skcipher =3D { .base.cra_name =3D "ecb(des)", .base.cra_driver_name =3D "ecb-des-rk", @@ -535,7 +535,7 @@ struct rk_crypto_tmp rk_ecb_des_alg =3D { }; =20 struct rk_crypto_tmp rk_cbc_des_alg =3D { - .type =3D ALG_TYPE_CIPHER, + .type =3D CRYPTO_ALG_TYPE_SKCIPHER, .alg.skcipher =3D { .base.cra_name =3D "cbc(des)", .base.cra_driver_name =3D "cbc-des-rk", @@ -558,7 +558,7 @@ struct rk_crypto_tmp rk_cbc_des_alg =3D { }; =20 struct rk_crypto_tmp rk_ecb_des3_ede_alg =3D { - .type =3D ALG_TYPE_CIPHER, + .type =3D CRYPTO_ALG_TYPE_SKCIPHER, .alg.skcipher =3D { .base.cra_name =3D "ecb(des3_ede)", .base.cra_driver_name =3D "ecb-des3-ede-rk", @@ -580,7 +580,7 @@ struct rk_crypto_tmp rk_ecb_des3_ede_alg =3D { }; =20 struct rk_crypto_tmp rk_cbc_des3_ede_alg =3D { - .type =3D ALG_TYPE_CIPHER, + .type =3D CRYPTO_ALG_TYPE_SKCIPHER, .alg.skcipher =3D { .base.cra_name =3D "cbc(des3_ede)", .base.cra_driver_name =3D "cbc-des3-ede-rk", --=20 2.35.1 From nobody Sun May 10 19:51:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id ABB16C433EF for ; Mon, 25 Apr 2022 20:22:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245339AbiDYUZ1 (ORCPT ); Mon, 25 Apr 2022 16:25:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40946 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245273AbiDYUZA (ORCPT ); Mon, 25 Apr 2022 16:25:00 -0400 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F2B2B1299F1 for ; Mon, 25 Apr 2022 13:21:40 -0700 (PDT) Received: by mail-wr1-x434.google.com with SMTP id e24so2604445wrc.9 for ; Mon, 25 Apr 2022 13:21:40 -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=S9VyfrMMeO74fGBihz9CdP7fNaeijlioCZxpeCtBsgM=; b=tvRsB/7mpfRSI+P7cVBMyy8/iCt/m6C9c1zOX2DGv8I1c4bQUFtZ3+PxDeDS48kkrE xsuRhMlH951i5L/3stuCrPsEKIqRNlE43rL7+R3aPhP8hrlHrdzmxIGTBE6DeClYHq/4 2lApNCmnIatbxn428j21TY8OiCLXlzVhCzqIZMI0HfnJXINdRfaKwzwH9J1UI2nCSh9K qfzTIWLrVnFyxaqBpgPQZ9d96XKD8TP7g0eCFtaLZxaXLd49n01wTv9Oz2AJ2sK7y4vF TpsbWSMHd9nn6lJCot4blrcnyIGq7W/KarMFSWI3eR1Afb/guP36DRpJAw4FSYxD4/hB DcZA== 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=S9VyfrMMeO74fGBihz9CdP7fNaeijlioCZxpeCtBsgM=; b=4VDgr3YdsvLI0iSBg3e390l8gljNLc25gnNr0iYb+Jujwi9BQvucV/rldXnBdkr56r 68/AjtezVYh1D68iFffrk5NIW/tJhnWwa2g3hA9MUWAtrGs8ISEY4SEicukElQv+0+GV PMLm87UzeK3fENm7cBW0Ok0buJKW2OjrEHQgECw9t7KLazAWH6XmFYbD0bQgG/G7Jd25 6V/bbXOSDQm/bHj4UeuCmn5CzYckZGEbZ+3N9e14CzbtfSGd23XCBHILe0cS7d+rsGJs xq9H4D40NouZHGCz4XnksHzIMZCfdaOuBnwcbROQ/EysBfX3Q7ehqmR9/1TYjW7mvsVn XqRA== X-Gm-Message-State: AOAM531IXfkL6+lpLj7SIObbpWNXvhlcE+KO+2ZFB0gq+RVs7H40UhMV zeR18B4xgob1Pyx1sy8xybcM9Q== X-Google-Smtp-Source: ABdhPJyXjs68FoMCz6JHiED9Yi3rBxoT3cjwHTBVP6h3EIgcJfmijU62b8eLoRthdOnXXqxk+8w4Pg== X-Received: by 2002:a05:6000:178d:b0:20a:ccd9:6a46 with SMTP id e13-20020a056000178d00b0020accd96a46mr13895838wrg.592.1650918099144; Mon, 25 Apr 2022 13:21:39 -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 p3-20020a5d59a3000000b0020a9132d1fbsm11101003wrr.37.2022.04.25.13.21.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 13:21:38 -0700 (PDT) From: Corentin Labbe To: heiko@sntech.de, herbert@gondor.apana.org.au, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org Cc: linux-crypto@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Corentin Labbe Subject: [PATCH v6 12/33] crypto: rockchip: add debugfs Date: Mon, 25 Apr 2022 20:20:58 +0000 Message-Id: <20220425202119.3566743-13-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220425202119.3566743-1-clabbe@baylibre.com> References: <20220425202119.3566743-1-clabbe@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This patch enable to access usage stats for each algorithm. Signed-off-by: Corentin Labbe --- drivers/crypto/Kconfig | 10 ++++ drivers/crypto/rockchip/rk3288_crypto.c | 47 +++++++++++++++++++ drivers/crypto/rockchip/rk3288_crypto.h | 11 +++++ drivers/crypto/rockchip/rk3288_crypto_ahash.c | 8 ++++ .../crypto/rockchip/rk3288_crypto_skcipher.c | 15 ++++++ 5 files changed, 91 insertions(+) diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index d68cc2dc2bd5..b609215ecd62 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig @@ -801,6 +801,16 @@ config CRYPTO_DEV_ROCKCHIP This driver interfaces with the hardware crypto accelerator. Supporting cbc/ecb chainmode, and aes/des/des3_ede cipher mode. =20 +config CRYPTO_DEV_ROCKCHIP_DEBUG + bool "Enable Rockchip crypto stats" + depends on CRYPTO_DEV_ROCKCHIP + depends on DEBUG_FS + help + Say y to enable Rockchip crypto debug stats. + This will create /sys/kernel/debug/rk3288_crypto/stats for displaying + the number of requests per algorithm and other internal stats. + + config CRYPTO_DEV_ZYNQMP_AES tristate "Support for Xilinx ZynqMP AES hw accelerator" depends on ZYNQMP_FIRMWARE || COMPILE_TEST diff --git a/drivers/crypto/rockchip/rk3288_crypto.c b/drivers/crypto/rockc= hip/rk3288_crypto.c index 8f9664acc78d..3e1b4f3b2422 100644 --- a/drivers/crypto/rockchip/rk3288_crypto.c +++ b/drivers/crypto/rockchip/rk3288_crypto.c @@ -95,6 +95,41 @@ static struct rk_crypto_tmp *rk_cipher_algs[] =3D { &rk_ahash_md5, }; =20 +#ifdef CONFIG_CRYPTO_DEV_ROCKCHIP_DEBUG +static int rk_crypto_debugfs_show(struct seq_file *seq, void *v) +{ + unsigned int i; + + for (i =3D 0; i < ARRAY_SIZE(rk_cipher_algs); i++) { + if (!rk_cipher_algs[i]->dev) + continue; + switch (rk_cipher_algs[i]->type) { + case CRYPTO_ALG_TYPE_SKCIPHER: + seq_printf(seq, "%s %s reqs=3D%lu fallback=3D%lu\n", + rk_cipher_algs[i]->alg.skcipher.base.cra_driver_name, + rk_cipher_algs[i]->alg.skcipher.base.cra_name, + rk_cipher_algs[i]->stat_req, rk_cipher_algs[i]->stat_fb); + seq_printf(seq, "\tfallback due to length: %lu\n", + rk_cipher_algs[i]->stat_fb_len); + seq_printf(seq, "\tfallback due to alignment: %lu\n", + rk_cipher_algs[i]->stat_fb_align); + seq_printf(seq, "\tfallback due to SGs: %lu\n", + rk_cipher_algs[i]->stat_fb_sgdiff); + break; + case CRYPTO_ALG_TYPE_AHASH: + seq_printf(seq, "%s %s reqs=3D%lu fallback=3D%lu\n", + rk_cipher_algs[i]->alg.hash.halg.base.cra_driver_name, + rk_cipher_algs[i]->alg.hash.halg.base.cra_name, + rk_cipher_algs[i]->stat_req, rk_cipher_algs[i]->stat_fb); + break; + } + } + return 0; +} + +DEFINE_SHOW_ATTRIBUTE(rk_crypto_debugfs); +#endif + static int rk_crypto_register(struct rk_crypto_info *crypto_info) { unsigned int i, k; @@ -246,6 +281,15 @@ static int rk_crypto_probe(struct platform_device *pde= v) goto err_register_alg; } =20 +#ifdef CONFIG_CRYPTO_DEV_ROCKCHIP_DEBUG + /* Ignore error of debugfs */ + crypto_info->dbgfs_dir =3D debugfs_create_dir("rk3288_crypto", NULL); + crypto_info->dbgfs_stats =3D debugfs_create_file("stats", 0444, + crypto_info->dbgfs_dir, + crypto_info, + &rk_crypto_debugfs_fops); +#endif + dev_info(dev, "Crypto Accelerator successfully registered\n"); return 0; =20 @@ -260,6 +304,9 @@ static int rk_crypto_remove(struct platform_device *pde= v) { struct rk_crypto_info *crypto_tmp =3D platform_get_drvdata(pdev); =20 +#ifdef CONFIG_CRYPTO_DEV_ROCKCHIP_DEBUG + debugfs_remove_recursive(crypto_tmp->dbgfs_dir); +#endif rk_crypto_unregister(); rk_crypto_disable_clk(crypto_tmp); crypto_engine_exit(crypto_tmp->engine); diff --git a/drivers/crypto/rockchip/rk3288_crypto.h b/drivers/crypto/rockc= hip/rk3288_crypto.h index d924ea17402a..945a8184bbad 100644 --- a/drivers/crypto/rockchip/rk3288_crypto.h +++ b/drivers/crypto/rockchip/rk3288_crypto.h @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -199,6 +200,10 @@ struct rk_crypto_info { struct crypto_engine *engine; struct completion complete; int status; +#ifdef CONFIG_CRYPTO_DEV_ROCKCHIP_DEBUG + struct dentry *dbgfs_dir; + struct dentry *dbgfs_stats; +#endif }; =20 /* the private variable of hash */ @@ -239,6 +244,12 @@ struct rk_crypto_tmp { struct skcipher_alg skcipher; struct ahash_alg hash; } alg; + unsigned long stat_req; + unsigned long stat_fb; + unsigned long stat_fb_len; + unsigned long stat_fb_sglen; + unsigned long stat_fb_align; + unsigned long stat_fb_sgdiff; }; =20 extern struct rk_crypto_tmp rk_ecb_aes_alg; diff --git a/drivers/crypto/rockchip/rk3288_crypto_ahash.c b/drivers/crypto= /rockchip/rk3288_crypto_ahash.c index d08e2438d356..8856c6226be6 100644 --- a/drivers/crypto/rockchip/rk3288_crypto_ahash.c +++ b/drivers/crypto/rockchip/rk3288_crypto_ahash.c @@ -39,6 +39,10 @@ static int rk_ahash_digest_fb(struct ahash_request *areq) struct rk_ahash_rctx *rctx =3D ahash_request_ctx(areq); struct crypto_ahash *tfm =3D crypto_ahash_reqtfm(areq); struct rk_ahash_ctx *tfmctx =3D crypto_ahash_ctx(tfm); + struct ahash_alg *alg =3D __crypto_ahash_alg(tfm->base.__crt_alg); + struct rk_crypto_tmp *algt =3D container_of(alg, struct rk_crypto_tmp, al= g.hash); + + algt->stat_fb++; =20 ahash_request_set_tfm(&rctx->fallback_req, tfmctx->fallback_tfm); rctx->fallback_req.base.flags =3D areq->base.flags & @@ -249,6 +253,8 @@ static int rk_hash_run(struct crypto_engine *engine, vo= id *breq) struct crypto_ahash *tfm =3D crypto_ahash_reqtfm(areq); struct rk_ahash_rctx *rctx =3D ahash_request_ctx(areq); struct rk_ahash_ctx *tctx =3D crypto_ahash_ctx(tfm); + struct ahash_alg *alg =3D __crypto_ahash_alg(tfm->base.__crt_alg); + struct rk_crypto_tmp *algt =3D container_of(alg, struct rk_crypto_tmp, al= g.hash); struct scatterlist *sg =3D areq->src; int err =3D 0; int i; @@ -256,6 +262,8 @@ static int rk_hash_run(struct crypto_engine *engine, vo= id *breq) =20 rctx->mode =3D 0; =20 + algt->stat_req++; + switch (crypto_ahash_digestsize(tfm)) { case SHA1_DIGEST_SIZE: rctx->mode =3D RK_CRYPTO_HASH_SHA1; diff --git a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c b/drivers/cry= pto/rockchip/rk3288_crypto_skcipher.c index 1ed297f5d809..91b8a4c574da 100644 --- a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c +++ b/drivers/crypto/rockchip/rk3288_crypto_skcipher.c @@ -18,6 +18,8 @@ static int rk_cipher_need_fallback(struct skcipher_reques= t *req) { struct crypto_skcipher *tfm =3D crypto_skcipher_reqtfm(req); unsigned int bs =3D crypto_skcipher_blocksize(tfm); + struct skcipher_alg *alg =3D crypto_skcipher_alg(tfm); + struct rk_crypto_tmp *algt =3D container_of(alg, struct rk_crypto_tmp, al= g.skcipher); struct scatterlist *sgs, *sgd; unsigned int stodo, dtodo, len; =20 @@ -29,20 +31,25 @@ static int rk_cipher_need_fallback(struct skcipher_requ= est *req) sgd =3D req->dst; while (sgs && sgd) { if (!IS_ALIGNED(sgs->offset, sizeof(u32))) { + algt->stat_fb_align++; return true; } if (!IS_ALIGNED(sgd->offset, sizeof(u32))) { + algt->stat_fb_align++; return true; } stodo =3D min(len, sgs->length); if (stodo % bs) { + algt->stat_fb_len++; return true; } dtodo =3D min(len, sgd->length); if (dtodo % bs) { + algt->stat_fb_len++; return true; } if (stodo !=3D dtodo) { + algt->stat_fb_sgdiff++; return true; } len -=3D stodo; @@ -57,8 +64,12 @@ static int rk_cipher_fallback(struct skcipher_request *a= req) struct crypto_skcipher *tfm =3D crypto_skcipher_reqtfm(areq); struct rk_cipher_ctx *op =3D crypto_skcipher_ctx(tfm); struct rk_cipher_rctx *rctx =3D skcipher_request_ctx(areq); + struct skcipher_alg *alg =3D crypto_skcipher_alg(tfm); + struct rk_crypto_tmp *algt =3D container_of(alg, struct rk_crypto_tmp, al= g.skcipher); int err; =20 + algt->stat_fb++; + skcipher_request_set_tfm(&rctx->fallback_req, op->fallback_tfm); skcipher_request_set_callback(&rctx->fallback_req, areq->base.flags, areq->base.complete, areq->base.data); @@ -324,6 +335,10 @@ static int rk_cipher_run(struct crypto_engine *engine,= void *async_req) u8 *ivtouse =3D areq->iv; unsigned int len =3D areq->cryptlen; unsigned int todo; + struct skcipher_alg *alg =3D crypto_skcipher_alg(tfm); + struct rk_crypto_tmp *algt =3D container_of(alg, struct rk_crypto_tmp, al= g.skcipher); + + algt->stat_req++; =20 ivsize =3D crypto_skcipher_ivsize(tfm); if (areq->iv && crypto_skcipher_ivsize(tfm) > 0) { --=20 2.35.1 From nobody Sun May 10 19:51:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 335D4C433FE for ; Mon, 25 Apr 2022 20:22:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245221AbiDYUZi (ORCPT ); Mon, 25 Apr 2022 16:25:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41132 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245288AbiDYUZC (ORCPT ); Mon, 25 Apr 2022 16:25:02 -0400 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 64D7F12ACD8 for ; Mon, 25 Apr 2022 13:21:41 -0700 (PDT) Received: by mail-wr1-x431.google.com with SMTP id d5so7272364wrb.6 for ; Mon, 25 Apr 2022 13:21:41 -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=14i+SOudfJbJ9v02t/NcQA5xEDzCR2m7kQoedfmFeDE=; b=S6KtGlJNPJ9O3i/knH3QTBBpgEewzmlS8gtCQmYpRtvnJkP5Ubx874QvWcTEBhSYic szdC2la5eWz4T/ue7Q1HbbQMP7Ng06V6bRoKgXHrALPaxHv8VzBdFMh1inVlilAYb68p J3DszwgGyhB5GruhQhy5PBxC4MCLQHSM63WpjSkTfZp+nX9e+kAvM7RDWQZZmKtgkn7w tP3c/hQkCi8NejqqgSTEOh7BHaUPUGfp59nZCOMHMlocuY1nm8PExCik86yj3EYHP2KF sXJhVowDD5bzpDV9BR1qaVTuU4VtbT9WR/KGRVb6yXy+RI780c4Uvq1oX3EL+94rUiDC 8upw== 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=14i+SOudfJbJ9v02t/NcQA5xEDzCR2m7kQoedfmFeDE=; b=ODqt1I5L1qDgp0tv10idJyl/U6SiNSbo5yCzvuxEAg2Zq3gi1ZGEkSmI6LFuxaKqJo UJg5X2y0ReZ5JvWvZFpWCBLG+GK2ey/Ei8UwA39KtI5RCto0NxeBagVef7qi0m2HwDsX rxsomjgsXPk/N0ZsYmthsQmZ64WbZGE0NaTcnAfsyWnxeiO4fl4PBvy3WaUCDh1GDE0r /4LA6Qy6lw4+tU40/rCL0HJ7QPMk8MXuUTLbsA8peRN+fUC1ji0ipDz6U7cXelqt0ufS yKhyYQgsg9QIB9GKqJ6+7lN7xQuJZ/ylTtym3tXvQr/R18kWqVM+6dbLcXfx52LJ0qBb dGVA== X-Gm-Message-State: AOAM531hGH8Ak7iyci6dHu6fI7pa1nailNRtKNp/gOmTSjOiDrSJhp/T G8YVS2kENZyCKg6d8EGJpUwPVw== X-Google-Smtp-Source: ABdhPJyU+ehnHU8sJVCse/sU7HhLnWHTIK55mHnJJfxqbTiq1X82RajogYSGKShFuXmwE9KBAt6oqA== X-Received: by 2002:a5d:524f:0:b0:20a:cff1:1cef with SMTP id k15-20020a5d524f000000b0020acff11cefmr11131837wrc.157.1650918100221; Mon, 25 Apr 2022 13:21:40 -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 p3-20020a5d59a3000000b0020a9132d1fbsm11101003wrr.37.2022.04.25.13.21.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 13:21:39 -0700 (PDT) From: Corentin Labbe To: heiko@sntech.de, herbert@gondor.apana.org.au, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org Cc: linux-crypto@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Corentin Labbe Subject: [PATCH v6 13/33] crypto: rockchip: introduce PM Date: Mon, 25 Apr 2022 20:20:59 +0000 Message-Id: <20220425202119.3566743-14-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220425202119.3566743-1-clabbe@baylibre.com> References: <20220425202119.3566743-1-clabbe@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add runtime PM support for rockchip crypto. Signed-off-by: Corentin Labbe --- drivers/crypto/rockchip/rk3288_crypto.c | 51 ++++++++++++++++++- drivers/crypto/rockchip/rk3288_crypto.h | 1 + drivers/crypto/rockchip/rk3288_crypto_ahash.c | 10 ++++ .../crypto/rockchip/rk3288_crypto_skcipher.c | 9 ++++ 4 files changed, 69 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/rockchip/rk3288_crypto.c b/drivers/crypto/rockc= hip/rk3288_crypto.c index 3e1b4f3b2422..d9258b9e71b3 100644 --- a/drivers/crypto/rockchip/rk3288_crypto.c +++ b/drivers/crypto/rockchip/rk3288_crypto.c @@ -65,6 +65,48 @@ static void rk_crypto_disable_clk(struct rk_crypto_info = *dev) clk_disable_unprepare(dev->sclk); } =20 +/* + * Power management strategy: The device is suspended unless a TFM exists = for + * one of the algorithms proposed by this driver. + */ +static int rk_crypto_pm_suspend(struct device *dev) +{ + struct rk_crypto_info *rkdev =3D dev_get_drvdata(dev); + + rk_crypto_disable_clk(rkdev); + return 0; +} + +static int rk_crypto_pm_resume(struct device *dev) +{ + struct rk_crypto_info *rkdev =3D dev_get_drvdata(dev); + + return rk_crypto_enable_clk(rkdev); +} + +static const struct dev_pm_ops rk_crypto_pm_ops =3D { + SET_RUNTIME_PM_OPS(rk_crypto_pm_suspend, rk_crypto_pm_resume, NULL) +}; + +static int rk_crypto_pm_init(struct rk_crypto_info *rkdev) +{ + int err; + + pm_runtime_use_autosuspend(rkdev->dev); + pm_runtime_set_autosuspend_delay(rkdev->dev, 2000); + + err =3D pm_runtime_set_suspended(rkdev->dev); + if (err) + return err; + pm_runtime_enable(rkdev->dev); + return err; +} + +static void rk_crypto_pm_exit(struct rk_crypto_info *rkdev) +{ + pm_runtime_disable(rkdev->dev); +} + static irqreturn_t rk_crypto_irq_handle(int irq, void *dev_id) { struct rk_crypto_info *dev =3D platform_get_drvdata(dev_id); @@ -273,7 +315,9 @@ static int rk_crypto_probe(struct platform_device *pdev) crypto_engine_start(crypto_info->engine); init_completion(&crypto_info->complete); =20 - rk_crypto_enable_clk(crypto_info); + err =3D rk_crypto_pm_init(crypto_info); + if (err) + goto err_pm; =20 err =3D rk_crypto_register(crypto_info); if (err) { @@ -294,6 +338,8 @@ static int rk_crypto_probe(struct platform_device *pdev) return 0; =20 err_register_alg: + rk_crypto_pm_exit(crypto_info); +err_pm: crypto_engine_exit(crypto_info->engine); err_crypto: dev_err(dev, "Crypto Accelerator not successfully registered\n"); @@ -308,7 +354,7 @@ static int rk_crypto_remove(struct platform_device *pde= v) debugfs_remove_recursive(crypto_tmp->dbgfs_dir); #endif rk_crypto_unregister(); - rk_crypto_disable_clk(crypto_tmp); + rk_crypto_pm_exit(crypto_tmp); crypto_engine_exit(crypto_tmp->engine); return 0; } @@ -318,6 +364,7 @@ static struct platform_driver crypto_driver =3D { .remove =3D rk_crypto_remove, .driver =3D { .name =3D "rk3288-crypto", + .pm =3D &rk_crypto_pm_ops, .of_match_table =3D crypto_of_id_table, }, }; diff --git a/drivers/crypto/rockchip/rk3288_crypto.h b/drivers/crypto/rockc= hip/rk3288_crypto.h index 945a8184bbad..ddbb9246ce16 100644 --- a/drivers/crypto/rockchip/rk3288_crypto.h +++ b/drivers/crypto/rockchip/rk3288_crypto.h @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/crypto/rockchip/rk3288_crypto_ahash.c b/drivers/crypto= /rockchip/rk3288_crypto_ahash.c index 8856c6226be6..137013bd4410 100644 --- a/drivers/crypto/rockchip/rk3288_crypto_ahash.c +++ b/drivers/crypto/rockchip/rk3288_crypto_ahash.c @@ -328,6 +328,7 @@ static int rk_cra_hash_init(struct crypto_tfm *tfm) struct ahash_alg *alg =3D __crypto_ahash_alg(tfm->__crt_alg); =20 const char *alg_name =3D crypto_tfm_alg_name(tfm); + int err; =20 algt =3D container_of(alg, struct rk_crypto_tmp, alg.hash); =20 @@ -349,7 +350,15 @@ static int rk_cra_hash_init(struct crypto_tfm *tfm) tctx->enginectx.op.prepare_request =3D rk_hash_prepare; tctx->enginectx.op.unprepare_request =3D rk_hash_unprepare; =20 + err =3D pm_runtime_resume_and_get(tctx->dev->dev); + if (err < 0) + goto error_pm; + return 0; +error_pm: + crypto_free_ahash(tctx->fallback_tfm); + + return err; } =20 static void rk_cra_hash_exit(struct crypto_tfm *tfm) @@ -357,6 +366,7 @@ static void rk_cra_hash_exit(struct crypto_tfm *tfm) struct rk_ahash_ctx *tctx =3D crypto_tfm_ctx(tfm); =20 crypto_free_ahash(tctx->fallback_tfm); + pm_runtime_put_autosuspend(tctx->dev->dev); } =20 struct rk_crypto_tmp rk_ahash_sha1 =3D { diff --git a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c b/drivers/cry= pto/rockchip/rk3288_crypto_skcipher.c index 91b8a4c574da..3bdb304aa794 100644 --- a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c +++ b/drivers/crypto/rockchip/rk3288_crypto_skcipher.c @@ -454,6 +454,7 @@ static int rk_ablk_init_tfm(struct crypto_skcipher *tfm) struct skcipher_alg *alg =3D crypto_skcipher_alg(tfm); const char *name =3D crypto_tfm_alg_name(&tfm->base); struct rk_crypto_tmp *algt; + int err; =20 algt =3D container_of(alg, struct rk_crypto_tmp, alg.skcipher); =20 @@ -471,7 +472,14 @@ static int rk_ablk_init_tfm(struct crypto_skcipher *tf= m) =20 ctx->enginectx.op.do_one_request =3D rk_cipher_run; =20 + err =3D pm_runtime_resume_and_get(ctx->dev->dev); + if (err < 0) + goto error_pm; + return 0; +error_pm: + crypto_free_skcipher(ctx->fallback_tfm); + return err; } =20 static void rk_ablk_exit_tfm(struct crypto_skcipher *tfm) @@ -480,6 +488,7 @@ static void rk_ablk_exit_tfm(struct crypto_skcipher *tf= m) =20 memzero_explicit(ctx->key, ctx->keylen); crypto_free_skcipher(ctx->fallback_tfm); + pm_runtime_put_autosuspend(ctx->dev->dev); } =20 struct rk_crypto_tmp rk_ecb_aes_alg =3D { --=20 2.35.1 From nobody Sun May 10 19:51:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5A8F1C433FE for ; Mon, 25 Apr 2022 20:22:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245325AbiDYUZd (ORCPT ); Mon, 25 Apr 2022 16:25:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41100 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245284AbiDYUZC (ORCPT ); Mon, 25 Apr 2022 16:25:02 -0400 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F32D312B451 for ; Mon, 25 Apr 2022 13:21:42 -0700 (PDT) Received: by mail-wr1-x42e.google.com with SMTP id t6so19043622wra.4 for ; Mon, 25 Apr 2022 13:21:42 -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=p55H6E0886aSJalxirRbnL3xLKJ1MG4FEZeIU1Ksblw=; b=PF1zI95b49yWI+mnHScTa0xQUyNrVzG+3/JzFircumtVU8P9BWpymUIILCqS09uDbH p18rzBQCQEAxWcYqIqgRLH6cd4hahqCRPjLPFPKWVgruSgGBRoNTNk3H3iNmti2pxEpB 3daWEmaPwXma4qhCAH02b+wrl9fi86NpXq8qfAprA8uXvfQ5qWijMjjk0FjsDE8aLVr4 237kKFYg666EcgwzcZVGjvk3bae9IeJrRbFneqRIko8ra5FtS9t4wxEf0JNauFxmvrI4 0WrtMbhfZwSBv/Yp/OfTcGsxYAu7q/wEMaOfz2H3h8hwGFkvXcKI2aqMR67kHFGN6BCz B0FQ== 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=p55H6E0886aSJalxirRbnL3xLKJ1MG4FEZeIU1Ksblw=; b=CxSjnmeeU2tbnBh5C2leP8lWZ1EuqBXEE+l+fvIcfhNsdzZuuIDj8qi8seB/7ru4iT AcVvQlm5mwsqL9mn1fylwid6Kek3xKtiw42CwRfK6zkrt8Nys83aniq+GthgiZzfZJro xH57k8Gx0bczx71fT+BuSOx8U8LLq147qJRU/g9U1AnNJ8E7NW+Wc0EEdAYpPuphRnfU DBIArQ7K5i02eLHthJAiiLqT2b/qs2dJHMPRpJscMVosBj6BfccxLP7l4rFfXXUowhNB KzBiN8zwawawp2msJYitlEZMlulxhXABYI+fSFiMvjbgSrcSuonCnFNmxTyxVGEkAAYJ f2UA== X-Gm-Message-State: AOAM532nKlpfSrSA31yK5PMHmNjhgk0p86QDPJpnFoEpI8qnunq97G/j nrRlsHsuiv/LpO32YcJR3BjNaw== X-Google-Smtp-Source: ABdhPJyALsJcalzGMaIk+TyI2QpcwxPUZ1lkje01D9V37WU9soehA4t9yZ/vHK0Gho1nucCKItKPRQ== X-Received: by 2002:a5d:4311:0:b0:205:f439:cbf0 with SMTP id h17-20020a5d4311000000b00205f439cbf0mr15952343wrq.164.1650918101249; Mon, 25 Apr 2022 13:21:41 -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 p3-20020a5d59a3000000b0020a9132d1fbsm11101003wrr.37.2022.04.25.13.21.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 13:21:40 -0700 (PDT) From: Corentin Labbe To: heiko@sntech.de, herbert@gondor.apana.org.au, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org Cc: linux-crypto@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Corentin Labbe Subject: [PATCH v6 14/33] crypto: rockchip: handle reset also in PM Date: Mon, 25 Apr 2022 20:21:00 +0000 Message-Id: <20220425202119.3566743-15-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220425202119.3566743-1-clabbe@baylibre.com> References: <20220425202119.3566743-1-clabbe@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" reset could be handled by PM functions. Signed-off-by: Corentin Labbe --- drivers/crypto/rockchip/rk3288_crypto.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/drivers/crypto/rockchip/rk3288_crypto.c b/drivers/crypto/rockc= hip/rk3288_crypto.c index d9258b9e71b3..a11a92e1f3fd 100644 --- a/drivers/crypto/rockchip/rk3288_crypto.c +++ b/drivers/crypto/rockchip/rk3288_crypto.c @@ -73,6 +73,8 @@ static int rk_crypto_pm_suspend(struct device *dev) { struct rk_crypto_info *rkdev =3D dev_get_drvdata(dev); =20 + reset_control_assert(rkdev->rst); + rk_crypto_disable_clk(rkdev); return 0; } @@ -81,6 +83,8 @@ static int rk_crypto_pm_resume(struct device *dev) { struct rk_crypto_info *rkdev =3D dev_get_drvdata(dev); =20 + reset_control_deassert(rkdev->rst); + return rk_crypto_enable_clk(rkdev); } =20 @@ -222,13 +226,6 @@ static void rk_crypto_unregister(void) } } =20 -static void rk_crypto_action(void *data) -{ - struct rk_crypto_info *crypto_info =3D data; - - reset_control_assert(crypto_info->rst); -} - static const struct of_device_id crypto_of_id_table[] =3D { { .compatible =3D "rockchip,rk3288-crypto" }, {} @@ -254,14 +251,6 @@ static int rk_crypto_probe(struct platform_device *pde= v) goto err_crypto; } =20 - reset_control_assert(crypto_info->rst); - usleep_range(10, 20); - reset_control_deassert(crypto_info->rst); - - err =3D devm_add_action_or_reset(dev, rk_crypto_action, crypto_info); - if (err) - goto err_crypto; - crypto_info->reg =3D devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(crypto_info->reg)) { err =3D PTR_ERR(crypto_info->reg); --=20 2.35.1 From nobody Sun May 10 19:51:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B9FBFC4332F for ; Mon, 25 Apr 2022 20:22:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245262AbiDYUZo (ORCPT ); Mon, 25 Apr 2022 16:25:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41000 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245329AbiDYUZV (ORCPT ); Mon, 25 Apr 2022 16:25:21 -0400 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF82C12C406 for ; Mon, 25 Apr 2022 13:21:43 -0700 (PDT) Received: by mail-wm1-x332.google.com with SMTP id u9-20020a05600c00c900b00393e729e655so283095wmm.0 for ; Mon, 25 Apr 2022 13:21:43 -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=pUlPI4V8y0jA00wHnfC+uOcvlIsr/c356N4se7BTI1o=; b=xPampHwEOvNqW/dpMuuecPF9ncCuBnCbh8gYn5//yPbRTIvJvnC7CWLmxShA1oF39j icNr6VbxM9qeDL5Ly/4rj52n4u5o8zEzjI+mASxpR2VomEBdlYsdP7DJiL7nJ70jBudh Zl1gQHxU/pQYdSjCuaLOvWbavOpM5eXsQY9Z8YCGSSpUgAsiD73RO/6GD/vISZaMlMe5 DEV0BgYHZ2FT9Xi7XGP7YT7gUtBC3vOQikQ4THV7PcZ5wf0nJ79PSoE6AI+szXqSkisj b+kP7xrf7Fni5z1ovmweAZiiie77ZMwGw1VzLUOdJ9KnU/E5NstMqBVViHcubgS8fj0/ DSaA== 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=pUlPI4V8y0jA00wHnfC+uOcvlIsr/c356N4se7BTI1o=; b=n8Ak71p1H1GjW6ez1hUw1gcvk+aFL2ZluMCANg+/wOMPs1eM3Hddy7JXIrs1mvmgFT N4OpwJSzTYgmYD6cbfUwHeAEjjVTQEqFtwQexIkhJBqSUoYLKT+Fzaz+A6X1Imkeb7iF p2oOpEQsmXgKptPbW4qVAOx/SachtvtplEPQ9Q645IEKhKxY8zuE0V7wCnN31woFUcXQ HsoAIQBJYdp+h8WpHRKcHkS/XXMgDN4czurJBYcpBOISCl+JVzb+z+gvPP227nySossb ndxoQZ1W52hpEuXOwE6g+G2yVi8VKRm3K/J5G9l5tNFC2HyRldq8uXDwMDNgdhe9IMdE nz+w== X-Gm-Message-State: AOAM531OcuZ0kcBOKTafV+j9YL6M7DySv3JrYQm0TQn6evg9Ig5loKhK Ag1eoRax/H0vkmHj5RLxZ/zvww== X-Google-Smtp-Source: ABdhPJxiP+6kNXvL4c5W/UZKulvaF/zan8h9UyeMqOd6Vqk6EtMp9lnegC4nYlzjai1p6Oh6zwHXeA== X-Received: by 2002:a7b:c4d1:0:b0:38e:c1a7:c796 with SMTP id g17-20020a7bc4d1000000b0038ec1a7c796mr27247794wmk.150.1650918102103; Mon, 25 Apr 2022 13:21:42 -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 p3-20020a5d59a3000000b0020a9132d1fbsm11101003wrr.37.2022.04.25.13.21.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 13:21:41 -0700 (PDT) From: Corentin Labbe To: heiko@sntech.de, herbert@gondor.apana.org.au, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org Cc: linux-crypto@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Corentin Labbe Subject: [PATCH v6 15/33] crypto: rockchip: use clk_bulk to simplify clock management Date: Mon, 25 Apr 2022 20:21:01 +0000 Message-Id: <20220425202119.3566743-16-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220425202119.3566743-1-clabbe@baylibre.com> References: <20220425202119.3566743-1-clabbe@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" rk3328 does not have the same clock names than rk3288, instead of using a c= omplex clock management, let's use clk_bulk to simplify their handling. Signed-off-by: Corentin Labbe --- drivers/crypto/rockchip/rk3288_crypto.c | 66 ++++--------------------- drivers/crypto/rockchip/rk3288_crypto.h | 6 +-- 2 files changed, 11 insertions(+), 61 deletions(-) diff --git a/drivers/crypto/rockchip/rk3288_crypto.c b/drivers/crypto/rockc= hip/rk3288_crypto.c index a11a92e1f3fd..97ef59a36be6 100644 --- a/drivers/crypto/rockchip/rk3288_crypto.c +++ b/drivers/crypto/rockchip/rk3288_crypto.c @@ -22,47 +22,16 @@ static int rk_crypto_enable_clk(struct rk_crypto_info *= dev) { int err; =20 - err =3D clk_prepare_enable(dev->sclk); - if (err) { - dev_err(dev->dev, "[%s:%d], Couldn't enable clock sclk\n", - __func__, __LINE__); - goto err_return; - } - err =3D clk_prepare_enable(dev->aclk); - if (err) { - dev_err(dev->dev, "[%s:%d], Couldn't enable clock aclk\n", - __func__, __LINE__); - goto err_aclk; - } - err =3D clk_prepare_enable(dev->hclk); - if (err) { - dev_err(dev->dev, "[%s:%d], Couldn't enable clock hclk\n", - __func__, __LINE__); - goto err_hclk; - } - err =3D clk_prepare_enable(dev->dmaclk); - if (err) { - dev_err(dev->dev, "[%s:%d], Couldn't enable clock dmaclk\n", - __func__, __LINE__); - goto err_dmaclk; - } - return err; -err_dmaclk: - clk_disable_unprepare(dev->hclk); -err_hclk: - clk_disable_unprepare(dev->aclk); -err_aclk: - clk_disable_unprepare(dev->sclk); -err_return: + err =3D clk_bulk_prepare_enable(dev->num_clks, dev->clks); + if (err) + dev_err(dev->dev, "Could not enable clock clks\n"); + return err; } =20 static void rk_crypto_disable_clk(struct rk_crypto_info *dev) { - clk_disable_unprepare(dev->dmaclk); - clk_disable_unprepare(dev->hclk); - clk_disable_unprepare(dev->aclk); - clk_disable_unprepare(dev->sclk); + clk_bulk_disable_unprepare(dev->num_clks, dev->clks); } =20 /* @@ -257,27 +226,10 @@ static int rk_crypto_probe(struct platform_device *pd= ev) goto err_crypto; } =20 - crypto_info->aclk =3D devm_clk_get(&pdev->dev, "aclk"); - if (IS_ERR(crypto_info->aclk)) { - err =3D PTR_ERR(crypto_info->aclk); - goto err_crypto; - } - - crypto_info->hclk =3D devm_clk_get(&pdev->dev, "hclk"); - if (IS_ERR(crypto_info->hclk)) { - err =3D PTR_ERR(crypto_info->hclk); - goto err_crypto; - } - - crypto_info->sclk =3D devm_clk_get(&pdev->dev, "sclk"); - if (IS_ERR(crypto_info->sclk)) { - err =3D PTR_ERR(crypto_info->sclk); - goto err_crypto; - } - - crypto_info->dmaclk =3D devm_clk_get(&pdev->dev, "apb_pclk"); - if (IS_ERR(crypto_info->dmaclk)) { - err =3D PTR_ERR(crypto_info->dmaclk); + crypto_info->num_clks =3D devm_clk_bulk_get_all(&pdev->dev, + &crypto_info->clks); + if (crypto_info->num_clks < 3) { + err =3D -EINVAL; goto err_crypto; } =20 diff --git a/drivers/crypto/rockchip/rk3288_crypto.h b/drivers/crypto/rockc= hip/rk3288_crypto.h index ddbb9246ce16..28bf09fe1c1d 100644 --- a/drivers/crypto/rockchip/rk3288_crypto.h +++ b/drivers/crypto/rockchip/rk3288_crypto.h @@ -190,10 +190,8 @@ =20 struct rk_crypto_info { struct device *dev; - struct clk *aclk; - struct clk *hclk; - struct clk *sclk; - struct clk *dmaclk; + struct clk_bulk_data *clks; + int num_clks; struct reset_control *rst; void __iomem *reg; int irq; --=20 2.35.1 From nobody Sun May 10 19:51:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 520C9C433EF for ; Mon, 25 Apr 2022 20:22:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245360AbiDYUZx (ORCPT ); Mon, 25 Apr 2022 16:25:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245319AbiDYUZU (ORCPT ); Mon, 25 Apr 2022 16:25:20 -0400 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BA89B12C8C6 for ; Mon, 25 Apr 2022 13:21:44 -0700 (PDT) Received: by mail-wr1-x42f.google.com with SMTP id s21so7784248wrb.8 for ; Mon, 25 Apr 2022 13:21:44 -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=QNKqn6GgSk4bpiHhHcjzWzAApOdvZObjZd/qjun9sbE=; b=W0+hzDsyXNRUErPDaVkKaOZ8ON7Row/GsuoUT13wsSaj2QnuxFUn/r5WvW7TNK9xF9 YSQSKQH80ebP+iHZohlvr4f4lhpiFxEFnBB2um3EWBUifD2390UyrawEW3j0azci7XCR VZLV+62XxeC39WNCrZ0VuvBVXNfjAUJr4y7e8uplt++3ldMtWQTUSFAM+JcX/3qluFDG 0sNkaQ3fPwZeNORGpS4HwZGfQcBgpXKRqd0Vajq024YRA2E53xRlOez6zJ6KGQ31r931 27fK/PXwWOh1ngC/E4idPt2qNj/p3bb/pcHBQ1EwKoFUfU5+AagnLhO3zjb4UEKMluYM LpfQ== 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=QNKqn6GgSk4bpiHhHcjzWzAApOdvZObjZd/qjun9sbE=; b=Poif8LrwocMz7mqEGBpslG5RyjkxM9GFqSAKKEg+0x/vh05QWepeXfT0nfw9UFz2Qk L5KCjbniSKV8EM1KFSFKUjko3a7fRSan3sDK7baog1cQY/Ld2jntEyah7pwv2UKrB07b 0qTCYWoJMNzqGcN0guFvqE/zcj25uMtV3mTfGojhxtmKMDsNdGKaODXgFk31CJ9AF6GF bDD5sNIgaPPva2okRMzsXVc6IADL9fJR0CD9XfXlBOiguX/+C7eFby1e3abjU5863Kk0 tAnO2GHQXvP+BMtFtJE9aAlvFJAXfyv/m//e1YjvSP8uG1mSV88zCq7DXclHRy38Tfda SRwQ== X-Gm-Message-State: AOAM5328UeYDKyC4JOBBTY6uvG2P4b0c1pno4pGV5J38ICGOB4af2zHw kS6rBDfzNbaWtmxq60+7s/680o7G9Kb7hg== X-Google-Smtp-Source: ABdhPJxo1Ew0MzI0MJNR79IL+3D+t6orpWGHjYg0Sc5MxK8XNn3M5uHQCyKIgUGey+QsAY05sGQ88w== X-Received: by 2002:adf:ce89:0:b0:20a:d917:5234 with SMTP id r9-20020adfce89000000b0020ad9175234mr6749610wrn.265.1650918102961; Mon, 25 Apr 2022 13:21:42 -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 p3-20020a5d59a3000000b0020a9132d1fbsm11101003wrr.37.2022.04.25.13.21.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 13:21:42 -0700 (PDT) From: Corentin Labbe To: heiko@sntech.de, herbert@gondor.apana.org.au, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org Cc: linux-crypto@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Corentin Labbe Subject: [PATCH v6 16/33] crypto: rockchip: add myself as maintainer Date: Mon, 25 Apr 2022 20:21:02 +0000 Message-Id: <20220425202119.3566743-17-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220425202119.3566743-1-clabbe@baylibre.com> References: <20220425202119.3566743-1-clabbe@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Nobody is set as maintainer of rockchip crypto, I propose to do it as I have already reworked lot of this code. Signed-off-by: Corentin Labbe --- MAINTAINERS | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 6157e706ed02..1f3bd9b5827e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -17005,6 +17005,13 @@ F: Documentation/ABI/*/sysfs-driver-hid-roccat* F: drivers/hid/hid-roccat* F: include/linux/hid-roccat* =20 +ROCKCHIP CRYPTO DRIVERS +M: Corentin Labbe +L: linux-crypto@vger.kernel.org +S: Maintained +F: Documentation/devicetree/bindings/crypto/rockchip,rk3288-crypto.yaml +F: drivers/crypto/rockchip/ + ROCKCHIP I2S TDM DRIVER M: Nicolas Frattaroli L: linux-rockchip@lists.infradead.org --=20 2.35.1 From nobody Sun May 10 19:51:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CC7D9C433EF for ; Mon, 25 Apr 2022 20:22:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245329AbiDYUZr (ORCPT ); Mon, 25 Apr 2022 16:25:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43178 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245276AbiDYUZ1 (ORCPT ); Mon, 25 Apr 2022 16:25:27 -0400 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9CB5B12D205 for ; Mon, 25 Apr 2022 13:21:45 -0700 (PDT) Received: by mail-wm1-x331.google.com with SMTP id ay11-20020a05600c1e0b00b0038eb92fa965so235010wmb.4 for ; Mon, 25 Apr 2022 13:21:45 -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=R5vq5Bgg0GZnREfAKsIq2BCzfZlNqniOuDOVX7ptgS8=; b=K5apVdfdWrDo9ukPlzrj9+9KY0m9iTK/hWQiRgYqK4IyaLYt/oe+4gOgJEV1Ut+JLy 3bGm/+BOtad6o7dyE4SKlF+fJJGsTMS/oci4c8fLSGu5VUOhJQnmQsBasBbtYncRjs+j LF64bbzC0iIrv0RN1Um6AYNLpbmblKVdJ6d6Fj/UNxdJDg7nrrPiqzuq+S67FRdDF7D3 tY9wn2O0FcbC5IaVjD5RoHZIrNowsysvogyf6bzlLrc+IXBkzr0UpUQRhqRbpsB8MTRq P7b4e1mRhMecvuvTBsQojNto+5d0H229E2d0lqiA8J7qZniSkmkc/t8/S67ocGA9GLNu 2pFg== 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=R5vq5Bgg0GZnREfAKsIq2BCzfZlNqniOuDOVX7ptgS8=; b=wk1NfJpF3BxBYiiehWEU6fftpWgWpBIyrtEyKDkN8iWhND836LAgywMwsNv8qTttIG bdGD5Q6Wq3IjCmMzSvYRoJMDei+8nPTBXhmJd3DJmRBPBKypiPUUevUqDgRuXVHidueu AIX+Q0Vhu6IBlK5xijlQ6EFu+TOKmeSvBfHgj6yuf6sv9IDyM727OZFhLpXuBb7L4Z8L gcP2A1u6rUF+Ut/tdHIPektjN6UR4Fgv/PfeVA06Q+wk798UbTDVWZdyfu+HsEDm4bJ0 Hh3gesPVMpgY8GCVNtRRhfFZb043h8UvI6e0zLzmggOa29AtI0CFpR0Mg9LyWrjbU+zO tduw== X-Gm-Message-State: AOAM530+iy9hMEKWJsvfhEWEbkZYEYHVkk48ZrDLAapEzB/hwjCamGqr ecFiSzppsaNVZQM0sIhrjrFx2g== X-Google-Smtp-Source: ABdhPJxiTR3Xs8owoOBUUZ1RHATewVGrE2jNvNEZzcFLtdHPjVHWqKyvmVdU63TsDULIwyoN/yCu1g== X-Received: by 2002:a05:600c:348f:b0:393:dcff:f95b with SMTP id a15-20020a05600c348f00b00393dcfff95bmr15403757wmq.76.1650918103942; Mon, 25 Apr 2022 13:21:43 -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 p3-20020a5d59a3000000b0020a9132d1fbsm11101003wrr.37.2022.04.25.13.21.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 13:21:43 -0700 (PDT) From: Corentin Labbe To: heiko@sntech.de, herbert@gondor.apana.org.au, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org Cc: linux-crypto@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Corentin Labbe Subject: [PATCH v6 17/33] crypto: rockchip: use read_poll_timeout Date: Mon, 25 Apr 2022 20:21:03 +0000 Message-Id: <20220425202119.3566743-18-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220425202119.3566743-1-clabbe@baylibre.com> References: <20220425202119.3566743-1-clabbe@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use read_poll_timeout instead of open coding it. In the same time, fix indentation of related comment. Signed-off-by: Corentin Labbe --- drivers/crypto/rockchip/rk3288_crypto_ahash.c | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/crypto/rockchip/rk3288_crypto_ahash.c b/drivers/crypto= /rockchip/rk3288_crypto_ahash.c index 137013bd4410..1fbab86c9238 100644 --- a/drivers/crypto/rockchip/rk3288_crypto_ahash.c +++ b/drivers/crypto/rockchip/rk3288_crypto_ahash.c @@ -10,6 +10,7 @@ */ #include #include +#include #include "rk3288_crypto.h" =20 /* @@ -295,18 +296,17 @@ static int rk_hash_run(struct crypto_engine *engine, = void *breq) sg =3D sg_next(sg); } =20 - /* - * it will take some time to process date after last dma - * transmission. - * - * waiting time is relative with the last date len, - * so cannot set a fixed time here. - * 10us makes system not call here frequently wasting - * efficiency, and make it response quickly when dma - * complete. - */ - while (!CRYPTO_READ(tctx->dev, RK_CRYPTO_HASH_STS)) - udelay(10); + /* + * it will take some time to process date after last dma + * transmission. + * + * waiting time is relative with the last date len, + * so cannot set a fixed time here. + * 10us makes system not call here frequently wasting + * efficiency, and make it response quickly when dma + * complete. + */ + readl_poll_timeout(tctx->dev->reg + RK_CRYPTO_HASH_STS, v, v =3D=3D 0, 10= , 1000); =20 for (i =3D 0; i < crypto_ahash_digestsize(tfm) / 4; i++) { v =3D readl(tctx->dev->reg + RK_CRYPTO_HASH_DOUT_0 + i * 4); --=20 2.35.1 From nobody Sun May 10 19:51:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B33F6C433F5 for ; Mon, 25 Apr 2022 20:23:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245426AbiDYUZ5 (ORCPT ); Mon, 25 Apr 2022 16:25:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43198 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245337AbiDYUZ1 (ORCPT ); Mon, 25 Apr 2022 16:25:27 -0400 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BEA9812D228 for ; Mon, 25 Apr 2022 13:21:46 -0700 (PDT) Received: by mail-wr1-x436.google.com with SMTP id i5so3425353wrc.13 for ; Mon, 25 Apr 2022 13:21:46 -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=X5cmGbysdlCxPOGBZlu+t3JbOARc2ikAJ1rgjSkwJRA=; b=gkkLdFaSFOADuQpex7MgMLo3q4WHaUhNXEw9O3ZM6oZIBtP0PG69DqNLxD8Jq6s08D Hu48yf7Gi3pH5BWFcQyuoQZ902YYQ6mZWKaKZmjIxbCZyZ1m7tga+Jn8FIv9sMtWi/bh 4FJIBHiGvi6IQXbEees57YriwC5I/0x44U2WGcgRdKXz0BEKxFg9wTsFzgKpYEPbSioT Pc9PPxebTrrDxqz3S5W4S6AWq8r/vZRhthOlJu0v+YnP+Im6OVBXvPSrJ2Qg5SnsDDgY 7N2R3M+GhcEP0DqRgyvXpmMnkVXLPP3vLFje+GBGExtzvHQhdrv9DhRUJ/2/QntaeV3h M2WQ== 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=X5cmGbysdlCxPOGBZlu+t3JbOARc2ikAJ1rgjSkwJRA=; b=y9q4Ld3U934HkRhxbmEeOsPLw+oYyI7+/ubwsa21MMCg/hhptrZU1liTb2z/ATCdJF AENu+K1pHerwNd734e4aYJejnPJ4nRG0y1sd8hD9jCsYx0Nfv8YSgBGsOb3Wgqhf3Zap KYkNiHX3DPF9XDYy0vlB6fQpLOOciPTvLDPu2JGvYksF7uTRgeaqQbS8OUi3/7WtkMGO B5UtbIoPFCJL29RR7oj4onCL+Qj3PudD0QXx5tRnVU5BjrOEr28lyTp3vtgS+igCljSK D+MC4qC95bJDYjMz93zC+IEvJkFwr+FjnCAYSZg0QJ05JO9uNcu0tDfpyg3WIkv1o9Hj 1OtQ== X-Gm-Message-State: AOAM531omdahlYfnM8wTaaAwtfO5uxJ/ls8FuYzlb6vHjxtpw1bDrzaH /3SIZoP4g+8gtXkmMoJ1xfFpFw== X-Google-Smtp-Source: ABdhPJx0ehWDWEpwXPfa0LsCViUZIZpEn0Nh5dIMf8V9qNJCHLboNq+t7FnAM3CEdE2QivxRKgTvGw== X-Received: by 2002:a5d:42c8:0:b0:20a:d91f:87b5 with SMTP id t8-20020a5d42c8000000b0020ad91f87b5mr6850064wrr.301.1650918104899; Mon, 25 Apr 2022 13:21:44 -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 p3-20020a5d59a3000000b0020a9132d1fbsm11101003wrr.37.2022.04.25.13.21.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 13:21:44 -0700 (PDT) From: Corentin Labbe To: heiko@sntech.de, herbert@gondor.apana.org.au, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org Cc: linux-crypto@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Corentin Labbe Subject: [PATCH v6 18/33] crypto: rockchip: fix style issue Date: Mon, 25 Apr 2022 20:21:04 +0000 Message-Id: <20220425202119.3566743-19-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220425202119.3566743-1-clabbe@baylibre.com> References: <20220425202119.3566743-1-clabbe@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This patch fixes some warning reported by checkpatch Signed-off-by: Corentin Labbe --- drivers/crypto/rockchip/rk3288_crypto_ahash.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/crypto/rockchip/rk3288_crypto_ahash.c b/drivers/crypto= /rockchip/rk3288_crypto_ahash.c index 1fbab86c9238..fae779d73c84 100644 --- a/drivers/crypto/rockchip/rk3288_crypto_ahash.c +++ b/drivers/crypto/rockchip/rk3288_crypto_ahash.c @@ -336,7 +336,7 @@ static int rk_cra_hash_init(struct crypto_tfm *tfm) =20 /* for fallback */ tctx->fallback_tfm =3D crypto_alloc_ahash(alg_name, 0, - CRYPTO_ALG_NEED_FALLBACK); + CRYPTO_ALG_NEED_FALLBACK); if (IS_ERR(tctx->fallback_tfm)) { dev_err(tctx->dev->dev, "Could not load fallback driver.\n"); return PTR_ERR(tctx->fallback_tfm); @@ -394,8 +394,8 @@ struct rk_crypto_tmp rk_ahash_sha1 =3D { .cra_init =3D rk_cra_hash_init, .cra_exit =3D rk_cra_hash_exit, .cra_module =3D THIS_MODULE, - } - } + } + } } }; =20 @@ -424,8 +424,8 @@ struct rk_crypto_tmp rk_ahash_sha256 =3D { .cra_init =3D rk_cra_hash_init, .cra_exit =3D rk_cra_hash_exit, .cra_module =3D THIS_MODULE, - } - } + } + } } }; =20 @@ -454,7 +454,7 @@ struct rk_crypto_tmp rk_ahash_md5 =3D { .cra_init =3D rk_cra_hash_init, .cra_exit =3D rk_cra_hash_exit, .cra_module =3D THIS_MODULE, - } } + } } }; --=20 2.35.1 From nobody Sun May 10 19:51:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AA803C433FE for ; Mon, 25 Apr 2022 20:23:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244842AbiDYU0L (ORCPT ); Mon, 25 Apr 2022 16:26:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42502 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245349AbiDYUZ2 (ORCPT ); Mon, 25 Apr 2022 16:25:28 -0400 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A328212EB40 for ; Mon, 25 Apr 2022 13:21:47 -0700 (PDT) Received: by mail-wr1-x432.google.com with SMTP id j15so9233708wrb.2 for ; Mon, 25 Apr 2022 13:21:47 -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=Ww46m6LdM7MaV4jgNKlRbRSwspMAPKBncRJe9WsCVsI=; b=oNa9cg5QsPwwP4uLrV+YbTdL9gqvb/dfY9l6gDFTVL86Z2ljrwrlOp+UqdK9YUYY5+ 8hyKkQM0y/sN2QGVNqYZVWZYA5tWkkkQFJ8vS0ebBlNGUfEkmMISnd+RUnLz+khNW1Fa ob1wL+3kdho0gYV+dOagIVU//4y+gbBWc45DbDRsciupfmFioao8ygk+3vUwnmnm2h70 LS9l7pOZJVjbio9ScR2wpWVHN2KykUoEL6VCteLaIDYVWQCFmMxT1x/ox4H/kiIfSH5e rKzi+mrz/BycqwmKuYcURG2P7lGC8TqTaRspWC3UzAlp9B55VXupvcqdS1xfsTwQuxXB p7oA== 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=Ww46m6LdM7MaV4jgNKlRbRSwspMAPKBncRJe9WsCVsI=; b=JxLA9N0L/NlN04zqpWn6YQZiJzJCQBShhmAch/sTukJYW1GmX4DsgOACIOkOZHZNpz 5g+vUqWYdxepj5QsAA8ZV+a4nNl+R/xG2WDM6t06F12tHwJ12SKvuzWrWIofdl+X1qkr WUbWfP4WpgFAeS00B52+wpB1BI20GOLIPYEXIDtoWQjbBNvvquTC8TRivItD12QNznu9 x77vwQWFQNVSJZjWe5RiRn8O5l16QJ9RKowTvRZvVLW2NlL9+NY6c8n0fNcWhCbsiXB2 djibSyPnhpKL1/a8qT7b6MZW0NiEDeDreSougFwplilCnEyctzVhEp3hCkoQn6i7JTvz Nt6A== X-Gm-Message-State: AOAM532zUmbPc75MZazeSGZROV4Hd3hOUpRdJhSGKjFqSU8ZVI101G+L INit785/S0ppm6XbHyQ/AaIGJg== X-Google-Smtp-Source: ABdhPJzWVdJF9EEfqt9FZpmuVTK4chwSLrTU0dDvxl6PARMF3rJ1c+XK/DWisIC9K5f/fe3rM+8S7w== X-Received: by 2002:adf:e289:0:b0:1e3:14ad:75fe with SMTP id v9-20020adfe289000000b001e314ad75femr15468017wri.685.1650918105802; Mon, 25 Apr 2022 13:21:45 -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 p3-20020a5d59a3000000b0020a9132d1fbsm11101003wrr.37.2022.04.25.13.21.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 13:21:45 -0700 (PDT) From: Corentin Labbe To: heiko@sntech.de, herbert@gondor.apana.org.au, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org Cc: linux-crypto@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Corentin Labbe Subject: [PATCH v6 19/33] crypto: rockchip: add support for rk3328 Date: Mon, 25 Apr 2022 20:21:05 +0000 Message-Id: <20220425202119.3566743-20-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220425202119.3566743-1-clabbe@baylibre.com> References: <20220425202119.3566743-1-clabbe@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The rk3328 could be used as-is by the rockchip driver. Signed-off-by: Corentin Labbe --- drivers/crypto/rockchip/rk3288_crypto.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/crypto/rockchip/rk3288_crypto.c b/drivers/crypto/rockc= hip/rk3288_crypto.c index 97ef59a36be6..6147ce44f757 100644 --- a/drivers/crypto/rockchip/rk3288_crypto.c +++ b/drivers/crypto/rockchip/rk3288_crypto.c @@ -197,6 +197,7 @@ static void rk_crypto_unregister(void) =20 static const struct of_device_id crypto_of_id_table[] =3D { { .compatible =3D "rockchip,rk3288-crypto" }, + { .compatible =3D "rockchip,rk3328-crypto" }, {} }; MODULE_DEVICE_TABLE(of, crypto_of_id_table); --=20 2.35.1 From nobody Sun May 10 19:51:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C9FC5C433FE for ; Mon, 25 Apr 2022 20:23:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245437AbiDYU0B (ORCPT ); Mon, 25 Apr 2022 16:26:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43306 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245352AbiDYUZ2 (ORCPT ); Mon, 25 Apr 2022 16:25:28 -0400 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DF11C12EB7B for ; Mon, 25 Apr 2022 13:21:48 -0700 (PDT) Received: by mail-wm1-x329.google.com with SMTP id q20so9963330wmq.1 for ; Mon, 25 Apr 2022 13:21:48 -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=6pTbLIs8HmRuUEZw2l8zof3evoZumgxq0qJ8FLEkt80=; b=4GK/d3gPCgypiIDHmldzPxN9FfPnHQRa8tYlmnH+bVJCjke/7A3hDMLb3GUhn5Ekg9 GptBKtbbazDwrf6OiQPONllxOzWbRlmQUGbGX9jziBBlYK0rlV3GR+SCbfg7b3OmOJG9 rSGCcnqT4vM9NRORzNDDJxhscK7EOJ9gYvUVpfj87srQYh9UOVFz+Ceo0Atclk/aRAtV 4iT6BZNwNeqSrI5Fikot46yHa4V5z8fQ7uuTOPCIfIrY9oKaEnokODI4QzWjRguirADu /EsU9nJEMhciQ7lLGv/2mGL93sjd/UaxP9ACylFXXlyxvxjmJI4/HTkJRYkQZv96e+VL Kp0Q== 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=6pTbLIs8HmRuUEZw2l8zof3evoZumgxq0qJ8FLEkt80=; b=LYjPCae2bxxl2PI1/ilBqPwasa9+pygP+ryfZ7eCSbc66xr2slHxnlrEwXDtr0ztPC WHYAocS3DMzhmDDbkwbEZU/Se2fobdlHfkk/Hf6Xz7W94lp7DF31NXsv8womjdTsbgts dwgy5yFG5o8XTJBg7NSw94Ss+GI/Ys70ztUoaaS+oNkkn6oyLYtXSVBIGui8SiPmTSG3 fLDucR7+MgZf5c+/ssBhlKNhZtHG3EyI02Cai/FZleesOmQO3/89bK8+cLcIPXoD2T4v nR4mi+kq00VeBE9RXAaSUnFosEo1JnlFTwul8IfAQDam+lQ3EmEwv+3KgRNqvkLSKnad pcow== X-Gm-Message-State: AOAM532wael+EYsWkQU9DSGxG1+PTgnrpNowvDb8bioXQucEpQ+xQ2Oi jPN10VI0lsw/U+Dru8vY2ran0A== X-Google-Smtp-Source: ABdhPJyVWMDEP+ZyWuSe/3lpeOlr3fJqDF3K+08yShPMnLMyN1PX6AFBk0AxsCzv/SSNlKlsyQX67w== X-Received: by 2002:a05:600c:4fd2:b0:393:ef3f:1753 with SMTP id o18-20020a05600c4fd200b00393ef3f1753mr3412350wmq.179.1650918106818; Mon, 25 Apr 2022 13:21:46 -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 p3-20020a5d59a3000000b0020a9132d1fbsm11101003wrr.37.2022.04.25.13.21.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 13:21:46 -0700 (PDT) From: Corentin Labbe To: heiko@sntech.de, herbert@gondor.apana.org.au, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org Cc: linux-crypto@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Corentin Labbe Subject: [PATCH v6 20/33] crypto: rockchip: rename ablk functions to cipher Date: Mon, 25 Apr 2022 20:21:06 +0000 Message-Id: <20220425202119.3566743-21-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220425202119.3566743-1-clabbe@baylibre.com> References: <20220425202119.3566743-1-clabbe@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Some functions have still ablk in their name even if there are not handling ablk_cipher anymore. So let's rename them. Signed-off-by: Corentin Labbe --- .../crypto/rockchip/rk3288_crypto_skcipher.c | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c b/drivers/cry= pto/rockchip/rk3288_crypto_skcipher.c index 3bdb304aa794..d60c206e717d 100644 --- a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c +++ b/drivers/crypto/rockchip/rk3288_crypto_skcipher.c @@ -273,7 +273,7 @@ static int rk_des3_ede_cbc_decrypt(struct skcipher_requ= est *req) return rk_handle_req(dev, req); } =20 -static void rk_ablk_hw_init(struct rk_crypto_info *dev, struct skcipher_re= quest *req) +static void rk_cipher_hw_init(struct rk_crypto_info *dev, struct skcipher_= request *req) { struct crypto_skcipher *cipher =3D crypto_skcipher_reqtfm(req); struct crypto_tfm *tfm =3D crypto_skcipher_tfm(cipher); @@ -382,7 +382,7 @@ static int rk_cipher_run(struct crypto_engine *engine, = void *async_req) } } err =3D 0; - rk_ablk_hw_init(ctx->dev, areq); + rk_cipher_hw_init(ctx->dev, areq); if (ivsize) { if (ivsize =3D=3D DES_BLOCK_SIZE) memcpy_toio(ctx->dev->reg + RK_CRYPTO_TDES_IV_0, ivtouse, ivsize); @@ -448,7 +448,7 @@ static int rk_cipher_run(struct crypto_engine *engine, = void *async_req) return err; } =20 -static int rk_ablk_init_tfm(struct crypto_skcipher *tfm) +static int rk_cipher_tfm_init(struct crypto_skcipher *tfm) { struct rk_cipher_ctx *ctx =3D crypto_skcipher_ctx(tfm); struct skcipher_alg *alg =3D crypto_skcipher_alg(tfm); @@ -482,7 +482,7 @@ static int rk_ablk_init_tfm(struct crypto_skcipher *tfm) return err; } =20 -static void rk_ablk_exit_tfm(struct crypto_skcipher *tfm) +static void rk_cipher_tfm_exit(struct crypto_skcipher *tfm) { struct rk_cipher_ctx *ctx =3D crypto_skcipher_ctx(tfm); =20 @@ -503,8 +503,8 @@ struct rk_crypto_tmp rk_ecb_aes_alg =3D { .base.cra_alignmask =3D 0x0f, .base.cra_module =3D THIS_MODULE, =20 - .init =3D rk_ablk_init_tfm, - .exit =3D rk_ablk_exit_tfm, + .init =3D rk_cipher_tfm_init, + .exit =3D rk_cipher_tfm_exit, .min_keysize =3D AES_MIN_KEY_SIZE, .max_keysize =3D AES_MAX_KEY_SIZE, .setkey =3D rk_aes_setkey, @@ -525,8 +525,8 @@ struct rk_crypto_tmp rk_cbc_aes_alg =3D { .base.cra_alignmask =3D 0x0f, .base.cra_module =3D THIS_MODULE, =20 - .init =3D rk_ablk_init_tfm, - .exit =3D rk_ablk_exit_tfm, + .init =3D rk_cipher_tfm_init, + .exit =3D rk_cipher_tfm_exit, .min_keysize =3D AES_MIN_KEY_SIZE, .max_keysize =3D AES_MAX_KEY_SIZE, .ivsize =3D AES_BLOCK_SIZE, @@ -548,8 +548,8 @@ struct rk_crypto_tmp rk_ecb_des_alg =3D { .base.cra_alignmask =3D 0x07, .base.cra_module =3D THIS_MODULE, =20 - .init =3D rk_ablk_init_tfm, - .exit =3D rk_ablk_exit_tfm, + .init =3D rk_cipher_tfm_init, + .exit =3D rk_cipher_tfm_exit, .min_keysize =3D DES_KEY_SIZE, .max_keysize =3D DES_KEY_SIZE, .setkey =3D rk_des_setkey, @@ -570,8 +570,8 @@ struct rk_crypto_tmp rk_cbc_des_alg =3D { .base.cra_alignmask =3D 0x07, .base.cra_module =3D THIS_MODULE, =20 - .init =3D rk_ablk_init_tfm, - .exit =3D rk_ablk_exit_tfm, + .init =3D rk_cipher_tfm_init, + .exit =3D rk_cipher_tfm_exit, .min_keysize =3D DES_KEY_SIZE, .max_keysize =3D DES_KEY_SIZE, .ivsize =3D DES_BLOCK_SIZE, @@ -593,8 +593,8 @@ struct rk_crypto_tmp rk_ecb_des3_ede_alg =3D { .base.cra_alignmask =3D 0x07, .base.cra_module =3D THIS_MODULE, =20 - .init =3D rk_ablk_init_tfm, - .exit =3D rk_ablk_exit_tfm, + .init =3D rk_cipher_tfm_init, + .exit =3D rk_cipher_tfm_exit, .min_keysize =3D DES3_EDE_KEY_SIZE, .max_keysize =3D DES3_EDE_KEY_SIZE, .setkey =3D rk_tdes_setkey, @@ -615,8 +615,8 @@ struct rk_crypto_tmp rk_cbc_des3_ede_alg =3D { .base.cra_alignmask =3D 0x07, .base.cra_module =3D THIS_MODULE, =20 - .init =3D rk_ablk_init_tfm, - .exit =3D rk_ablk_exit_tfm, + .init =3D rk_cipher_tfm_init, + .exit =3D rk_cipher_tfm_exit, .min_keysize =3D DES3_EDE_KEY_SIZE, .max_keysize =3D DES3_EDE_KEY_SIZE, .ivsize =3D DES_BLOCK_SIZE, --=20 2.35.1 From nobody Sun May 10 19:51:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B9DF9C433EF for ; Mon, 25 Apr 2022 20:23:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245319AbiDYU0E (ORCPT ); Mon, 25 Apr 2022 16:26:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245372AbiDYUZ3 (ORCPT ); Mon, 25 Apr 2022 16:25:29 -0400 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9478D12EF36 for ; Mon, 25 Apr 2022 13:21:50 -0700 (PDT) Received: by mail-wr1-x429.google.com with SMTP id b19so22452086wrh.11 for ; Mon, 25 Apr 2022 13:21:50 -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=Nsyj2GbVJ+5Tcjp4O8de9yMeRnwH0mr/qG7FdaAqb/o=; b=fiVPTqpqDOVnyQvjQPpC3tEH0fqTp/okGFmdByZBBDjsQBOvaBJaQZcUoUqF6F2LHH JaoUvgYZvD8PvDOqiJCFtKxUN/ujCFHv2DINrTTdjVrYyvcuA7rGIfz0WMgL4oANaSuI Uttf0WTcAyVslqe/1LzCs30/04J/pI9Axvhal568/HLJRm35P67BSWTorikvy+510kDg cM9cq5m9lWOX46lufHjgjsMVV9Bp01Np8bJordFfbHEo2raXM+MQzKv9jPSbrQhyuNzQ 1cVvAN8Kpq3/8L+bIq2G4Fa2O0b2q9qYXX5ziUUvDtXNCkwH3lNMTHlsqhdTXv6D0CAf nTOw== 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=Nsyj2GbVJ+5Tcjp4O8de9yMeRnwH0mr/qG7FdaAqb/o=; b=oe+gYVLK/UesIsGa5vXWH1yfzyelO819uclOvkctpfi0I3MXM5ZaCcE1FvvunxQy35 DTELvX/IyHJQvZQ584W6XxPT7fQS+wwXwHiAOIY3LFg9JuYVaiXFRtvCvwPLHsdPUImH OpQzthFpwsjiv2vTbfGaIDvCKnCQgM54k3GYfhFjDK78TymH9lyqkZw7i0acYWfSrzzT VBQHEq18SajQkD/GOPrtNnWl8Zv7IGhklGjL8MybgSm/4at1uD5AfEVEdhhGtwASh9Pt 9rqlH8EDjsHTVz9Po/fI5gbY3AQEvzorJlZk9nxXveovwec9AZIQVfxCT8Emc/oEjHwT ghiw== X-Gm-Message-State: AOAM532IHAaFcv7SYP+O67AEJ9Ipc1z7VsblFr+F2auP7BkWAP3r/voo ALjQxWp/y80yp7s0usHcUXocQw== X-Google-Smtp-Source: ABdhPJz8kEueXAGOzDGihbn4uiAg8HqlT/JHGjreG+j8poU/wTb883BRrf+2dAxyhkljbSzHhN5lCQ== X-Received: by 2002:adf:c64c:0:b0:20a:79c7:4bf2 with SMTP id u12-20020adfc64c000000b0020a79c74bf2mr15549938wrg.587.1650918107735; Mon, 25 Apr 2022 13:21:47 -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 p3-20020a5d59a3000000b0020a9132d1fbsm11101003wrr.37.2022.04.25.13.21.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 13:21:47 -0700 (PDT) From: Corentin Labbe To: heiko@sntech.de, herbert@gondor.apana.org.au, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org Cc: linux-crypto@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Corentin Labbe Subject: [PATCH v6 21/33] crypto: rockchip: rework rk_handle_req function Date: Mon, 25 Apr 2022 20:21:07 +0000 Message-Id: <20220425202119.3566743-22-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220425202119.3566743-1-clabbe@baylibre.com> References: <20220425202119.3566743-1-clabbe@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This patch rework the rk_handle_req(), simply removing the rk_crypto_info parameter. Signed-off-by: Corentin Labbe --- .../crypto/rockchip/rk3288_crypto_skcipher.c | 68 +++++-------------- 1 file changed, 17 insertions(+), 51 deletions(-) diff --git a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c b/drivers/cry= pto/rockchip/rk3288_crypto_skcipher.c index d60c206e717d..3187869c4c68 100644 --- a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c +++ b/drivers/crypto/rockchip/rk3288_crypto_skcipher.c @@ -82,10 +82,12 @@ static int rk_cipher_fallback(struct skcipher_request *= areq) return err; } =20 -static int rk_handle_req(struct rk_crypto_info *dev, - struct skcipher_request *req) +static int rk_cipher_handle_req(struct skcipher_request *req) { - struct crypto_engine *engine =3D dev->engine; + struct crypto_skcipher *tfm =3D crypto_skcipher_reqtfm(req); + struct rk_cipher_ctx *tctx =3D crypto_skcipher_ctx(tfm); + struct rk_crypto_info *rkc =3D tctx->dev; + struct crypto_engine *engine =3D rkc->engine; =20 if (rk_cipher_need_fallback(req)) return rk_cipher_fallback(req); @@ -142,135 +144,99 @@ static int rk_tdes_setkey(struct crypto_skcipher *ci= pher, =20 static int rk_aes_ecb_encrypt(struct skcipher_request *req) { - struct crypto_skcipher *tfm =3D crypto_skcipher_reqtfm(req); - struct rk_cipher_ctx *ctx =3D crypto_skcipher_ctx(tfm); struct rk_cipher_rctx *rctx =3D skcipher_request_ctx(req); - struct rk_crypto_info *dev =3D ctx->dev; =20 rctx->mode =3D RK_CRYPTO_AES_ECB_MODE; - return rk_handle_req(dev, req); + return rk_cipher_handle_req(req); } =20 static int rk_aes_ecb_decrypt(struct skcipher_request *req) { - struct crypto_skcipher *tfm =3D crypto_skcipher_reqtfm(req); - struct rk_cipher_ctx *ctx =3D crypto_skcipher_ctx(tfm); struct rk_cipher_rctx *rctx =3D skcipher_request_ctx(req); - struct rk_crypto_info *dev =3D ctx->dev; =20 rctx->mode =3D RK_CRYPTO_AES_ECB_MODE | RK_CRYPTO_DEC; - return rk_handle_req(dev, req); + return rk_cipher_handle_req(req); } =20 static int rk_aes_cbc_encrypt(struct skcipher_request *req) { - struct crypto_skcipher *tfm =3D crypto_skcipher_reqtfm(req); - struct rk_cipher_ctx *ctx =3D crypto_skcipher_ctx(tfm); struct rk_cipher_rctx *rctx =3D skcipher_request_ctx(req); - struct rk_crypto_info *dev =3D ctx->dev; =20 rctx->mode =3D RK_CRYPTO_AES_CBC_MODE; - return rk_handle_req(dev, req); + return rk_cipher_handle_req(req); } =20 static int rk_aes_cbc_decrypt(struct skcipher_request *req) { - struct crypto_skcipher *tfm =3D crypto_skcipher_reqtfm(req); - struct rk_cipher_ctx *ctx =3D crypto_skcipher_ctx(tfm); struct rk_cipher_rctx *rctx =3D skcipher_request_ctx(req); - struct rk_crypto_info *dev =3D ctx->dev; =20 rctx->mode =3D RK_CRYPTO_AES_CBC_MODE | RK_CRYPTO_DEC; - return rk_handle_req(dev, req); + return rk_cipher_handle_req(req); } =20 static int rk_des_ecb_encrypt(struct skcipher_request *req) { - struct crypto_skcipher *tfm =3D crypto_skcipher_reqtfm(req); - struct rk_cipher_ctx *ctx =3D crypto_skcipher_ctx(tfm); struct rk_cipher_rctx *rctx =3D skcipher_request_ctx(req); - struct rk_crypto_info *dev =3D ctx->dev; =20 rctx->mode =3D 0; - return rk_handle_req(dev, req); + return rk_cipher_handle_req(req); } =20 static int rk_des_ecb_decrypt(struct skcipher_request *req) { - struct crypto_skcipher *tfm =3D crypto_skcipher_reqtfm(req); - struct rk_cipher_ctx *ctx =3D crypto_skcipher_ctx(tfm); struct rk_cipher_rctx *rctx =3D skcipher_request_ctx(req); - struct rk_crypto_info *dev =3D ctx->dev; =20 rctx->mode =3D RK_CRYPTO_DEC; - return rk_handle_req(dev, req); + return rk_cipher_handle_req(req); } =20 static int rk_des_cbc_encrypt(struct skcipher_request *req) { - struct crypto_skcipher *tfm =3D crypto_skcipher_reqtfm(req); - struct rk_cipher_ctx *ctx =3D crypto_skcipher_ctx(tfm); struct rk_cipher_rctx *rctx =3D skcipher_request_ctx(req); - struct rk_crypto_info *dev =3D ctx->dev; =20 rctx->mode =3D RK_CRYPTO_TDES_CHAINMODE_CBC; - return rk_handle_req(dev, req); + return rk_cipher_handle_req(req); } =20 static int rk_des_cbc_decrypt(struct skcipher_request *req) { - struct crypto_skcipher *tfm =3D crypto_skcipher_reqtfm(req); - struct rk_cipher_ctx *ctx =3D crypto_skcipher_ctx(tfm); struct rk_cipher_rctx *rctx =3D skcipher_request_ctx(req); - struct rk_crypto_info *dev =3D ctx->dev; =20 rctx->mode =3D RK_CRYPTO_TDES_CHAINMODE_CBC | RK_CRYPTO_DEC; - return rk_handle_req(dev, req); + return rk_cipher_handle_req(req); } =20 static int rk_des3_ede_ecb_encrypt(struct skcipher_request *req) { - struct crypto_skcipher *tfm =3D crypto_skcipher_reqtfm(req); - struct rk_cipher_ctx *ctx =3D crypto_skcipher_ctx(tfm); struct rk_cipher_rctx *rctx =3D skcipher_request_ctx(req); - struct rk_crypto_info *dev =3D ctx->dev; =20 rctx->mode =3D RK_CRYPTO_TDES_SELECT; - return rk_handle_req(dev, req); + return rk_cipher_handle_req(req); } =20 static int rk_des3_ede_ecb_decrypt(struct skcipher_request *req) { - struct crypto_skcipher *tfm =3D crypto_skcipher_reqtfm(req); - struct rk_cipher_ctx *ctx =3D crypto_skcipher_ctx(tfm); struct rk_cipher_rctx *rctx =3D skcipher_request_ctx(req); - struct rk_crypto_info *dev =3D ctx->dev; =20 rctx->mode =3D RK_CRYPTO_TDES_SELECT | RK_CRYPTO_DEC; - return rk_handle_req(dev, req); + return rk_cipher_handle_req(req); } =20 static int rk_des3_ede_cbc_encrypt(struct skcipher_request *req) { - struct crypto_skcipher *tfm =3D crypto_skcipher_reqtfm(req); - struct rk_cipher_ctx *ctx =3D crypto_skcipher_ctx(tfm); struct rk_cipher_rctx *rctx =3D skcipher_request_ctx(req); - struct rk_crypto_info *dev =3D ctx->dev; =20 rctx->mode =3D RK_CRYPTO_TDES_SELECT | RK_CRYPTO_TDES_CHAINMODE_CBC; - return rk_handle_req(dev, req); + return rk_cipher_handle_req(req); } =20 static int rk_des3_ede_cbc_decrypt(struct skcipher_request *req) { - struct crypto_skcipher *tfm =3D crypto_skcipher_reqtfm(req); - struct rk_cipher_ctx *ctx =3D crypto_skcipher_ctx(tfm); struct rk_cipher_rctx *rctx =3D skcipher_request_ctx(req); - struct rk_crypto_info *dev =3D ctx->dev; =20 rctx->mode =3D RK_CRYPTO_TDES_SELECT | RK_CRYPTO_TDES_CHAINMODE_CBC | RK_CRYPTO_DEC; - return rk_handle_req(dev, req); + return rk_cipher_handle_req(req); } =20 static void rk_cipher_hw_init(struct rk_crypto_info *dev, struct skcipher_= request *req) --=20 2.35.1 From nobody Sun May 10 19:51:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D9F5C433F5 for ; Mon, 25 Apr 2022 20:23:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240935AbiDYU0Y (ORCPT ); Mon, 25 Apr 2022 16:26:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43800 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245271AbiDYUZd (ORCPT ); Mon, 25 Apr 2022 16:25:33 -0400 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2945A12FECF for ; Mon, 25 Apr 2022 13:21:52 -0700 (PDT) Received: by mail-wr1-x431.google.com with SMTP id s21so7784550wrb.8 for ; Mon, 25 Apr 2022 13:21:51 -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=TsVyA7Q+L4jHZkBvcDuSCtuQQnBfkeU7fPbG/J4t/C0=; b=xZ9KULKSa9BlgSl8UevYqZ0ivzjLTximCIjphRIfEcyPV3Sr5j+ktf1JvVJv4JXpUN 3mo9NXU0DdnHArcsdO9jA3vhZm0Bcd/qYh85qrL+FMoKYOSEV45k0Bl4H0bNDoaODsOQ WX8XjV3/XlitzqbEm5+dEKSNkwXRvcooAYbXmCvwlgS1ZVOaU2YRRZzONjIZDJitM2EJ AfgDzZ5m2cWwis0oX9iZKxwREKp5gLEf1/SyqL5XBXJ/vtfkqjWrgzB5adFK96JkvYS1 9KK3aCB1RRppID0uxBet827CH46ZvVajSURj76/Ho0dliA1RnUoxz1VBHYaEo9MbktAJ 77HA== 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=TsVyA7Q+L4jHZkBvcDuSCtuQQnBfkeU7fPbG/J4t/C0=; b=meY4L0xObPBC8Z6qZCLFNkGa/zwBcvaWURwSBrQPzBzayQBF8fxf9q/yq+McvPHO35 cjdV+Umvh8mMcYDuNk2GIeT9tqPqBv8hHVtrDz+GJP62toq5Le7NhvWuCO4bhehzOTIT yJkkpy2KTu9qogP2iOSRZ648Kwv9tz2n5II9QqfH4O+96wLIG0bnEec5nPYkwlcqxW7s v7YBkktJJiweZ7seTrlbgG6bxWTlvl3eYSE/aK2jLun+ypVH/lCdmJbVej1sqJ/MJb2u JzKDzpxSyGuDzqedZj8frcZ6LtwGMYixXjtMp8ek5vesWcuulf7MV0D8FNkv3ySj44v4 L7Xw== X-Gm-Message-State: AOAM531VxCsvPe57CEXglie+dA4Isd/5hA8XhmsplsvkndV6qQmhEsd3 YS4XwuvQzjD5pNwNcYwmizepWw== X-Google-Smtp-Source: ABdhPJzdTh1270skPl8vbINpxI1OmGmwmP8UeLTpwnW9gyfVwWrjlbzmSGhmQ1vCNV5L+0utwsx+QA== X-Received: by 2002:a5d:6551:0:b0:20a:e23c:a7fa with SMTP id z17-20020a5d6551000000b0020ae23ca7famr1320653wrv.535.1650918108633; Mon, 25 Apr 2022 13:21:48 -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 p3-20020a5d59a3000000b0020a9132d1fbsm11101003wrr.37.2022.04.25.13.21.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 13:21:48 -0700 (PDT) From: Corentin Labbe To: heiko@sntech.de, herbert@gondor.apana.org.au, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org Cc: linux-crypto@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Corentin Labbe Subject: [PATCH v6 22/33] crypto: rockchip: use a rk_crypto_info variable instead of lot of indirection Date: Mon, 25 Apr 2022 20:21:08 +0000 Message-Id: <20220425202119.3566743-23-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220425202119.3566743-1-clabbe@baylibre.com> References: <20220425202119.3566743-1-clabbe@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Instead of using lot of ctx->dev->xx indirections, use an intermediate variable for rk_crypto_info. This will help later, when 2 different rk_crypto_info would be used. Signed-off-by: Corentin Labbe --- drivers/crypto/rockchip/rk3288_crypto_ahash.c | 23 +++++++----- .../crypto/rockchip/rk3288_crypto_skcipher.c | 37 ++++++++++--------- 2 files changed, 32 insertions(+), 28 deletions(-) diff --git a/drivers/crypto/rockchip/rk3288_crypto_ahash.c b/drivers/crypto= /rockchip/rk3288_crypto_ahash.c index fae779d73c84..636dbcde0ca3 100644 --- a/drivers/crypto/rockchip/rk3288_crypto_ahash.c +++ b/drivers/crypto/rockchip/rk3288_crypto_ahash.c @@ -226,9 +226,10 @@ static int rk_hash_prepare(struct crypto_engine *engin= e, void *breq) struct crypto_ahash *tfm =3D crypto_ahash_reqtfm(areq); struct rk_ahash_rctx *rctx =3D ahash_request_ctx(areq); struct rk_ahash_ctx *tctx =3D crypto_ahash_ctx(tfm); + struct rk_crypto_info *rkc =3D tctx->dev; int ret; =20 - ret =3D dma_map_sg(tctx->dev->dev, areq->src, sg_nents(areq->src), DMA_TO= _DEVICE); + ret =3D dma_map_sg(rkc->dev, areq->src, sg_nents(areq->src), DMA_TO_DEVIC= E); if (ret <=3D 0) return -EINVAL; =20 @@ -243,8 +244,9 @@ static int rk_hash_unprepare(struct crypto_engine *engi= ne, void *breq) struct crypto_ahash *tfm =3D crypto_ahash_reqtfm(areq); struct rk_ahash_rctx *rctx =3D ahash_request_ctx(areq); struct rk_ahash_ctx *tctx =3D crypto_ahash_ctx(tfm); + struct rk_crypto_info *rkc =3D tctx->dev; =20 - dma_unmap_sg(tctx->dev->dev, areq->src, rctx->nrsg, DMA_TO_DEVICE); + dma_unmap_sg(rkc->dev, areq->src, rctx->nrsg, DMA_TO_DEVICE); return 0; } =20 @@ -257,6 +259,7 @@ static int rk_hash_run(struct crypto_engine *engine, vo= id *breq) struct ahash_alg *alg =3D __crypto_ahash_alg(tfm->base.__crt_alg); struct rk_crypto_tmp *algt =3D container_of(alg, struct rk_crypto_tmp, al= g.hash); struct scatterlist *sg =3D areq->src; + struct rk_crypto_info *rkc =3D tctx->dev; int err =3D 0; int i; u32 v; @@ -283,13 +286,13 @@ static int rk_hash_run(struct crypto_engine *engine, = void *breq) rk_ahash_reg_init(areq); =20 while (sg) { - reinit_completion(&tctx->dev->complete); - tctx->dev->status =3D 0; - crypto_ahash_dma_start(tctx->dev, sg); - wait_for_completion_interruptible_timeout(&tctx->dev->complete, + reinit_completion(&rkc->complete); + rkc->status =3D 0; + crypto_ahash_dma_start(rkc, sg); + wait_for_completion_interruptible_timeout(&rkc->complete, msecs_to_jiffies(2000)); - if (!tctx->dev->status) { - dev_err(tctx->dev->dev, "DMA timeout\n"); + if (!rkc->status) { + dev_err(rkc->dev, "DMA timeout\n"); err =3D -EFAULT; goto theend; } @@ -306,10 +309,10 @@ static int rk_hash_run(struct crypto_engine *engine, = void *breq) * efficiency, and make it response quickly when dma * complete. */ - readl_poll_timeout(tctx->dev->reg + RK_CRYPTO_HASH_STS, v, v =3D=3D 0, 10= , 1000); + readl_poll_timeout(rkc->reg + RK_CRYPTO_HASH_STS, v, v =3D=3D 0, 10, 1000= ); =20 for (i =3D 0; i < crypto_ahash_digestsize(tfm) / 4; i++) { - v =3D readl(tctx->dev->reg + RK_CRYPTO_HASH_DOUT_0 + i * 4); + v =3D readl(rkc->reg + RK_CRYPTO_HASH_DOUT_0 + i * 4); put_unaligned_le32(v, areq->result + i * 4); } =20 diff --git a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c b/drivers/cry= pto/rockchip/rk3288_crypto_skcipher.c index 3187869c4c68..6a1bea98fded 100644 --- a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c +++ b/drivers/crypto/rockchip/rk3288_crypto_skcipher.c @@ -303,6 +303,7 @@ static int rk_cipher_run(struct crypto_engine *engine, = void *async_req) unsigned int todo; struct skcipher_alg *alg =3D crypto_skcipher_alg(tfm); struct rk_crypto_tmp *algt =3D container_of(alg, struct rk_crypto_tmp, al= g.skcipher); + struct rk_crypto_info *rkc =3D ctx->dev; =20 algt->stat_req++; =20 @@ -330,49 +331,49 @@ static int rk_cipher_run(struct crypto_engine *engine= , void *async_req) scatterwalk_map_and_copy(biv, sgs, offset, ivsize, 0); } if (sgs =3D=3D sgd) { - err =3D dma_map_sg(ctx->dev->dev, sgs, 1, DMA_BIDIRECTIONAL); + err =3D dma_map_sg(rkc->dev, sgs, 1, DMA_BIDIRECTIONAL); if (err <=3D 0) { err =3D -EINVAL; goto theend_iv; } } else { - err =3D dma_map_sg(ctx->dev->dev, sgs, 1, DMA_TO_DEVICE); + err =3D dma_map_sg(rkc->dev, sgs, 1, DMA_TO_DEVICE); if (err <=3D 0) { err =3D -EINVAL; goto theend_iv; } - err =3D dma_map_sg(ctx->dev->dev, sgd, 1, DMA_FROM_DEVICE); + err =3D dma_map_sg(rkc->dev, sgd, 1, DMA_FROM_DEVICE); if (err <=3D 0) { err =3D -EINVAL; goto theend_sgs; } } err =3D 0; - rk_cipher_hw_init(ctx->dev, areq); + rk_cipher_hw_init(rkc, areq); if (ivsize) { if (ivsize =3D=3D DES_BLOCK_SIZE) - memcpy_toio(ctx->dev->reg + RK_CRYPTO_TDES_IV_0, ivtouse, ivsize); + memcpy_toio(rkc->reg + RK_CRYPTO_TDES_IV_0, ivtouse, ivsize); else - memcpy_toio(ctx->dev->reg + RK_CRYPTO_AES_IV_0, ivtouse, ivsize); + memcpy_toio(rkc->reg + RK_CRYPTO_AES_IV_0, ivtouse, ivsize); } - reinit_completion(&ctx->dev->complete); - ctx->dev->status =3D 0; + reinit_completion(&rkc->complete); + rkc->status =3D 0; =20 todo =3D min(sg_dma_len(sgs), len); len -=3D todo; - crypto_dma_start(ctx->dev, sgs, sgd, todo / 4); - wait_for_completion_interruptible_timeout(&ctx->dev->complete, + crypto_dma_start(rkc, sgs, sgd, todo / 4); + wait_for_completion_interruptible_timeout(&rkc->complete, msecs_to_jiffies(2000)); - if (!ctx->dev->status) { - dev_err(ctx->dev->dev, "DMA timeout\n"); + if (!rkc->status) { + dev_err(rkc->dev, "DMA timeout\n"); err =3D -EFAULT; goto theend; } if (sgs =3D=3D sgd) { - dma_unmap_sg(ctx->dev->dev, sgs, 1, DMA_BIDIRECTIONAL); + dma_unmap_sg(rkc->dev, sgs, 1, DMA_BIDIRECTIONAL); } else { - dma_unmap_sg(ctx->dev->dev, sgs, 1, DMA_TO_DEVICE); - dma_unmap_sg(ctx->dev->dev, sgd, 1, DMA_FROM_DEVICE); + dma_unmap_sg(rkc->dev, sgs, 1, DMA_TO_DEVICE); + dma_unmap_sg(rkc->dev, sgd, 1, DMA_FROM_DEVICE); } if (rctx->mode & RK_CRYPTO_DEC) { memcpy(iv, biv, ivsize); @@ -405,10 +406,10 @@ static int rk_cipher_run(struct crypto_engine *engine= , void *async_req) =20 theend_sgs: if (sgs =3D=3D sgd) { - dma_unmap_sg(ctx->dev->dev, sgs, 1, DMA_BIDIRECTIONAL); + dma_unmap_sg(rkc->dev, sgs, 1, DMA_BIDIRECTIONAL); } else { - dma_unmap_sg(ctx->dev->dev, sgs, 1, DMA_TO_DEVICE); - dma_unmap_sg(ctx->dev->dev, sgd, 1, DMA_FROM_DEVICE); + dma_unmap_sg(rkc->dev, sgs, 1, DMA_TO_DEVICE); + dma_unmap_sg(rkc->dev, sgd, 1, DMA_FROM_DEVICE); } theend_iv: return err; --=20 2.35.1 From nobody Sun May 10 19:51:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6A458C433FE for ; Mon, 25 Apr 2022 20:23:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245473AbiDYU0s (ORCPT ); Mon, 25 Apr 2022 16:26:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245279AbiDYUZf (ORCPT ); Mon, 25 Apr 2022 16:25:35 -0400 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5DA641299E9 for ; Mon, 25 Apr 2022 13:21:57 -0700 (PDT) Received: by mail-wr1-x435.google.com with SMTP id e24so2604976wrc.9 for ; Mon, 25 Apr 2022 13:21:57 -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=i2uYJa2gxIdaD8fQBCxMjwb6E0s7Z3esdAlzwfZv714=; b=stsFLy+KyOnT4KHOXtZxRdSYL2fSyBm3x6cA+JZYRHkNhRTyz8ucwn+s7Eh207juoR N0KkARPD0vTa456iXV+8QfbMrirJ+62MqkePK8zps+f55qwDmSDTS6TU0fKDPjTfB2S0 Prn0eQPV7VUJOPsYIXhZ18klUgNTJcsERWUitSCNEgaEZeF8zkQRNuKXqAqOfDX4q8GD 3VxuVcV+grX73stEfCGS0rJDmeL9PGPPlpBIlGzg4/Ne+nQUef/AtZzf8lXyDI8ybqWP iiMzWkvEA2zSpF2caeLLxlE8S7oZSvoZUY4tCMi0Fju4clnN6pL6p2pb2fhQ6UjqSyHd opDQ== 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=i2uYJa2gxIdaD8fQBCxMjwb6E0s7Z3esdAlzwfZv714=; b=l+4S3nMODJufAaWLgjBKvbT186UgoQAAfwIwtuWW1kBTfzfA2DBJyhmUIGRjGhS5QK E/43/IWMa2mEHKD0sb6VwsUfUlVkFNith9QqIilK3siytlf8wPkiIClNn4BSDGmPncTW mGP6SRzjMbOgg4SK4samakiaNyyJVH/PeFzm/LnwUjhv+2t2nCJ+eJCn6nXpvt0OwmBB 0kVxioELJ/F7jleFuUAkIODz1HTglWYHUT1hb+cz30bmg0cxFluTQVSW8v46o7ONidw2 p8VlYDb8/lJe9UVg5eZBCne1RVXi9lUw4VA0zZ8fltY1XY3Xu2wND61qA1PRtgM38wHY tpdw== X-Gm-Message-State: AOAM5338jAkS3ekVONAaTBbkV2fIddtSxvZFe2Gz9M1rzgxZN5IpvsJA rP6oRwrZctVESm5iHUl/rUitwQ== X-Google-Smtp-Source: ABdhPJyNQGAAcf86MjoKCDR2ng3p/kvOBGPAsnv1tbS/EgJYReKbwS+MiWO21XGDWnrPB5oganTm2Q== X-Received: by 2002:a5d:47cf:0:b0:20a:a5f0:eab9 with SMTP id o15-20020a5d47cf000000b0020aa5f0eab9mr14943772wrc.369.1650918109751; Mon, 25 Apr 2022 13:21:49 -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 p3-20020a5d59a3000000b0020a9132d1fbsm11101003wrr.37.2022.04.25.13.21.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 13:21:49 -0700 (PDT) From: Corentin Labbe To: heiko@sntech.de, herbert@gondor.apana.org.au, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org Cc: linux-crypto@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Corentin Labbe Subject: [PATCH v6 23/33] crypto: rockchip: use the rk_crypto_info given as parameter Date: Mon, 25 Apr 2022 20:21:09 +0000 Message-Id: <20220425202119.3566743-24-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220425202119.3566743-1-clabbe@baylibre.com> References: <20220425202119.3566743-1-clabbe@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Instead of using the crypto_info from TFM ctx, use the one given as paramet= er. Signed-off-by: Corentin Labbe --- drivers/crypto/rockchip/rk3288_crypto_skcipher.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c b/drivers/cry= pto/rockchip/rk3288_crypto_skcipher.c index 6a1bea98fded..cf0dfb6029d8 100644 --- a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c +++ b/drivers/crypto/rockchip/rk3288_crypto_skcipher.c @@ -254,7 +254,7 @@ static void rk_cipher_hw_init(struct rk_crypto_info *de= v, struct skcipher_reques RK_CRYPTO_TDES_BYTESWAP_KEY | RK_CRYPTO_TDES_BYTESWAP_IV; CRYPTO_WRITE(dev, RK_CRYPTO_TDES_CTRL, rctx->mode); - memcpy_toio(ctx->dev->reg + RK_CRYPTO_TDES_KEY1_0, ctx->key, ctx->keylen= ); + memcpy_toio(dev->reg + RK_CRYPTO_TDES_KEY1_0, ctx->key, ctx->keylen); conf_reg =3D RK_CRYPTO_DESSEL; } else { rctx->mode |=3D RK_CRYPTO_AES_FIFO_MODE | @@ -266,7 +266,7 @@ static void rk_cipher_hw_init(struct rk_crypto_info *de= v, struct skcipher_reques else if (ctx->keylen =3D=3D AES_KEYSIZE_256) rctx->mode |=3D RK_CRYPTO_AES_256BIT_key; CRYPTO_WRITE(dev, RK_CRYPTO_AES_CTRL, rctx->mode); - memcpy_toio(ctx->dev->reg + RK_CRYPTO_AES_KEY_0, ctx->key, ctx->keylen); + memcpy_toio(dev->reg + RK_CRYPTO_AES_KEY_0, ctx->key, ctx->keylen); } conf_reg |=3D RK_CRYPTO_BYTESWAP_BTFIFO | RK_CRYPTO_BYTESWAP_BRFIFO; --=20 2.35.1 From nobody Sun May 10 19:51:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A0E5C433F5 for ; Mon, 25 Apr 2022 20:23:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245370AbiDYU05 (ORCPT ); Mon, 25 Apr 2022 16:26:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39946 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245411AbiDYUZh (ORCPT ); Mon, 25 Apr 2022 16:25:37 -0400 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B833F13019E for ; Mon, 25 Apr 2022 13:21:59 -0700 (PDT) Received: by mail-wr1-x429.google.com with SMTP id t6so19044119wra.4 for ; Mon, 25 Apr 2022 13:21:59 -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=D9cjlrLVeM5eQ7C/euT61wRVQvdXmZsaTd4EP2AIO+8=; b=HDiaEKbctP/PoZzCcg6Y/UZ9i+TMTsG/paw7EACujRBL1ZlsU30GscUQZSS7lzpJxJ +Zx12C5u8mIxldNHKRflqtZHvsTTquBwOiugc/26CCyWHCgXTFneKA2mVeFMcumyJzGG xqlelCiomC9Qes137XQvBLU7ivMyP+eVy375wb1elS04yqdnSsAC9933MyH0hc5YCebR sJCbugPVcU3HaWdaEKkxecxqv2Sdd71qtHFVP2SoVQMWRYjcqBL6Q6pW6kRLt3Vg8nJg j+h5MiDrSJk6GJS2tLYVZNVEQP0QiTAjSjXTokosWBHjogBbaUPedUDAys2k6/F93AeE SjXA== 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=D9cjlrLVeM5eQ7C/euT61wRVQvdXmZsaTd4EP2AIO+8=; b=KTuVZ3Yd8hmhejaN8he3iTdArP+ho7jbYze7B2RV3RCfMcY2nL1smklsOkLfWh3onF aK94Qt9fcmxjSHH4PlUtY11poWgwEJtfLTwt6HCVuSQcqL5FuIkqwJLp+ci6YMrE5pYO aCjaxLB/N2ZysMTaRKx+83xhnSFNVDCF/4G4bJuqhVfMoR1lZ+NDbRz4eKje/RGH/Zw2 Ra7d1XACnHhk/uhMtEZxKujRlRXSzc3TLT7TW9aC/r8/ZMpB3AuD2d+pxgIVP48p0hA5 1c+xPHFLfrHtXvpJ6IA8RFzyNvsXblNBHkebem+j38Ylnls3C/0NDU7xqhuhLs4zKVBA lZOQ== X-Gm-Message-State: AOAM530LgOFk981biGRQE1rAaj5iytBdiR+7J+MKkwZqw1wX0K5S8ECx BzEYcB0Ng2vp2pVfqr8bpBSLww== X-Google-Smtp-Source: ABdhPJxMszpw1oraGi5oAhibxLOcQ55EGl2CReCfpRGXUikz3P2++wn1JFE51XVm1Twax0Lseq7Y3Q== X-Received: by 2002:a5d:474f:0:b0:20a:cb5c:bbd7 with SMTP id o15-20020a5d474f000000b0020acb5cbbd7mr13345457wrs.21.1650918110690; Mon, 25 Apr 2022 13:21:50 -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 p3-20020a5d59a3000000b0020a9132d1fbsm11101003wrr.37.2022.04.25.13.21.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 13:21:50 -0700 (PDT) From: Corentin Labbe To: heiko@sntech.de, herbert@gondor.apana.org.au, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org Cc: linux-crypto@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Corentin Labbe Subject: [PATCH v6 24/33] dt-bindings: crypto: convert rockchip-crypto to YAML Date: Mon, 25 Apr 2022 20:21:10 +0000 Message-Id: <20220425202119.3566743-25-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220425202119.3566743-1-clabbe@baylibre.com> References: <20220425202119.3566743-1-clabbe@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Convert rockchip-crypto to YAML. Signed-off-by: Corentin Labbe Reviewed-by: Krzysztof Kozlowski --- .../crypto/rockchip,rk3288-crypto.yaml | 64 +++++++++++++++++++ .../bindings/crypto/rockchip-crypto.txt | 28 -------- 2 files changed, 64 insertions(+), 28 deletions(-) create mode 100644 Documentation/devicetree/bindings/crypto/rockchip,rk328= 8-crypto.yaml delete mode 100644 Documentation/devicetree/bindings/crypto/rockchip-crypt= o.txt diff --git a/Documentation/devicetree/bindings/crypto/rockchip,rk3288-crypt= o.yaml b/Documentation/devicetree/bindings/crypto/rockchip,rk3288-crypto.ya= ml new file mode 100644 index 000000000000..8a219d439d02 --- /dev/null +++ b/Documentation/devicetree/bindings/crypto/rockchip,rk3288-crypto.yaml @@ -0,0 +1,64 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/crypto/rockchip,rk3288-crypto.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Rockchip Electronics Security Accelerator + +maintainers: + - Heiko Stuebner + +properties: + compatible: + enum: + - rockchip,rk3288-crypto + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: + maxItems: 4 + + clock-names: + items: + - const: aclk + - const: hclk + - const: sclk + - const: apb_pclk + + resets: + maxItems: 1 + + reset-names: + items: + - const: crypto-rst + +required: + - compatible + - reg + - interrupts + - clocks + - clock-names + - resets + - reset-names + +additionalProperties: false + +examples: + - | + #include + #include + crypto@ff8a0000 { + compatible =3D "rockchip,rk3288-crypto"; + reg =3D <0xff8a0000 0x4000>; + interrupts =3D ; + clocks =3D <&cru ACLK_CRYPTO>, <&cru HCLK_CRYPTO>, + <&cru SCLK_CRYPTO>, <&cru ACLK_DMAC1>; + clock-names =3D "aclk", "hclk", "sclk", "apb_pclk"; + resets =3D <&cru SRST_CRYPTO>; + reset-names =3D "crypto-rst"; + }; diff --git a/Documentation/devicetree/bindings/crypto/rockchip-crypto.txt b= /Documentation/devicetree/bindings/crypto/rockchip-crypto.txt deleted file mode 100644 index 5e2ba385b8c9..000000000000 --- a/Documentation/devicetree/bindings/crypto/rockchip-crypto.txt +++ /dev/null @@ -1,28 +0,0 @@ -Rockchip Electronics And Security Accelerator - -Required properties: -- compatible: Should be "rockchip,rk3288-crypto" -- reg: Base physical address of the engine and length of memory mapped - region -- interrupts: Interrupt number -- clocks: Reference to the clocks about crypto -- clock-names: "aclk" used to clock data - "hclk" used to clock data - "sclk" used to clock crypto accelerator - "apb_pclk" used to clock dma -- resets: Must contain an entry for each entry in reset-names. - See ../reset/reset.txt for details. -- reset-names: Must include the name "crypto-rst". - -Examples: - - crypto: cypto-controller@ff8a0000 { - compatible =3D "rockchip,rk3288-crypto"; - reg =3D <0xff8a0000 0x4000>; - interrupts =3D ; - clocks =3D <&cru ACLK_CRYPTO>, <&cru HCLK_CRYPTO>, - <&cru SCLK_CRYPTO>, <&cru ACLK_DMAC1>; - clock-names =3D "aclk", "hclk", "sclk", "apb_pclk"; - resets =3D <&cru SRST_CRYPTO>; - reset-names =3D "crypto-rst"; - }; --=20 2.35.1 From nobody Sun May 10 19:51:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E8BCBC4332F for ; Mon, 25 Apr 2022 20:25:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245517AbiDYU1c (ORCPT ); Mon, 25 Apr 2022 16:27:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41000 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245362AbiDYUZh (ORCPT ); Mon, 25 Apr 2022 16:25:37 -0400 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 367A21301BC for ; Mon, 25 Apr 2022 13:22:02 -0700 (PDT) Received: by mail-wr1-x42e.google.com with SMTP id w4so22432682wrg.12 for ; Mon, 25 Apr 2022 13:22:02 -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=RoEkU2wAHdZrSlV4sPqXXxqUUD/tymZLZdlnbgZM9Yc=; b=Lx624Hb1v8mbCoeAt514dLkicA4g8cGOsxM5mgr9CfcmzRoRE9QjF3OUuN8qV248cC c8cU3Rs6qgQYuJgFIYMb8KB5OmBLRZD5w5fYiZHnFaTrjokX+Rs3xgaVhvEzFK+6rZd7 ismfGU1HrufI2PtGUz5+q9Q2k0uoX1IntKAMQ1r2PCnPGOcP4pDr3/GgSegDV14jq+jZ FuCX5/Hvng38+UBuYrWpF3+i8AgXuWDG9K9lYSKxJKt4+4VFdxgvPxwPsH3X41xhSV/o O38ElT7ffu0RIDyR4vikb4ufpR/qlbuiMvDdkDSbYz8307PJdCv2boqKfDEpntsqLxBY cPAw== 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=RoEkU2wAHdZrSlV4sPqXXxqUUD/tymZLZdlnbgZM9Yc=; b=nGObdbmw9JS++HRpfDqT4y4EOlgq82/qKO4Avi/MFE4ct7r1xpNeoXTsk3dHUiA9V9 NCrJaG2fXiPoRFJMUOAhYosyRcMgLsstIxvRLk7OPr1IkqHG/vNvsknjbft6MNSk4a1+ g1ceDBnRl4TEHd1/9bnBLxkQ7vR3Tpfvy2/ksq3kyIMYjCOxnmVFxroyPyYGs8/r1YQ+ z2IWugjus29VNtyb6lWfX2LHlpMQDnqA/iIycl/PQZM69//83ZcWLcjH5MVD17ktKAvM HPjCcFEgUYaHvckkVEFUdFHJEZ7k/ysope9M98XrEWRIPSbUvrUi0w7EGL5BNChh50Gq PRrQ== X-Gm-Message-State: AOAM530yXJdB06e6ozKXOC9EP1lKdfQWrI2rxfqZoW9Tb59yxkomJZKr JIPXeXRfmZCYIBbStmW/6qbz9AsdiM9Oxw== X-Google-Smtp-Source: ABdhPJwP7xSsF5UJIq/gGiZBqI8EFC+nzUbUZIbMLeZPHpF3ww+DSMXe+2kgo+zQHk3hV1CpelO9gg== X-Received: by 2002:adf:b64c:0:b0:1e3:16d0:3504 with SMTP id i12-20020adfb64c000000b001e316d03504mr15276335wre.333.1650918111706; Mon, 25 Apr 2022 13:21:51 -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 p3-20020a5d59a3000000b0020a9132d1fbsm11101003wrr.37.2022.04.25.13.21.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 13:21:51 -0700 (PDT) From: Corentin Labbe To: heiko@sntech.de, herbert@gondor.apana.org.au, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org Cc: linux-crypto@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Corentin Labbe Subject: [PATCH v6 25/33] dt-bindings: crypto: rockchip: convert to new driver bindings Date: Mon, 25 Apr 2022 20:21:11 +0000 Message-Id: <20220425202119.3566743-26-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220425202119.3566743-1-clabbe@baylibre.com> References: <20220425202119.3566743-1-clabbe@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The latest addition to the rockchip crypto driver need to update the driver bindings. Signed-off-by: Corentin Labbe --- .../crypto/rockchip,rk3288-crypto.yaml | 85 +++++++++++++++++-- 1 file changed, 77 insertions(+), 8 deletions(-) diff --git a/Documentation/devicetree/bindings/crypto/rockchip,rk3288-crypt= o.yaml b/Documentation/devicetree/bindings/crypto/rockchip,rk3288-crypto.ya= ml index 8a219d439d02..ad604d7e4bc0 100644 --- a/Documentation/devicetree/bindings/crypto/rockchip,rk3288-crypto.yaml +++ b/Documentation/devicetree/bindings/crypto/rockchip,rk3288-crypto.yaml @@ -13,6 +13,8 @@ properties: compatible: enum: - rockchip,rk3288-crypto + - rockchip,rk3328-crypto + - rockchip,rk3399-crypto =20 reg: maxItems: 1 @@ -21,21 +23,88 @@ properties: maxItems: 1 =20 clocks: + minItems: 3 maxItems: 4 =20 clock-names: - items: - - const: aclk - - const: hclk - - const: sclk - - const: apb_pclk + minItems: 3 + maxItems: 4 =20 resets: - maxItems: 1 + minItems: 1 + maxItems: 3 =20 reset-names: - items: - - const: crypto-rst + minItems: 1 + maxItems: 3 + +allOf: + - if: + properties: + compatible: + contains: + const: rockchip,rk3288-crypto + then: + properties: + clocks: + minItems: 4 + clock-names: + items: + - const: "aclk" + - const: "hclk" + - const: "sclk" + - const: "apb_pclk" + minItems: 4 + resets: + maxItems: 1 + reset-names: + items: + - const: "crypto-rst" + maxItems: 1 + - if: + properties: + compatible: + contains: + const: rockchip,rk3328-crypto + then: + properties: + clocks: + maxItems: 3 + clock-names: + items: + - const: "hclk_master" + - const: "hclk_slave" + - const: "sclk" + maxItems: 3 + resets: + maxItems: 1 + reset-names: + items: + - const: "crypto-rst" + maxItems: 1 + - if: + properties: + compatible: + contains: + const: rockchip,rk3399-crypto + then: + properties: + clocks: + maxItems: 3 + clock-names: + items: + - const: "hclk_master" + - const: "hclk_slave" + - const: "sclk" + maxItems: 3 + resets: + minItems: 3 + reset-names: + items: + - const: "rst_master" + - const: "rst_slave" + - const: "crypto-rst" + minItems: 3 =20 required: - compatible --=20 2.35.1 From nobody Sun May 10 19:51:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 42789C433F5 for ; Mon, 25 Apr 2022 20:25:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245506AbiDYU13 (ORCPT ); Mon, 25 Apr 2022 16:27:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43458 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235362AbiDYU0H (ORCPT ); Mon, 25 Apr 2022 16:26:07 -0400 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 95CDD131354 for ; Mon, 25 Apr 2022 13:22:03 -0700 (PDT) Received: by mail-wr1-x42b.google.com with SMTP id s21so7784745wrb.8 for ; Mon, 25 Apr 2022 13:22:03 -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=ZivRzjlDS3OoPoRTHkJnPDZ3sM1VA8uv4BaZC71qcQ0=; b=JoZr9AP6SZcjiUJhmOxsn7XFck2Je49++JUfwOn0/WL4wwIYd9P9yS+ZO3YNEoCPOA 9ljPGCqM6kqisX/b9e3AC5LqX3X3YfFkkeV4tSuZJvJH6Tb8yT0z4Yp0IAcUOpDHUutI s+/BrKhMci0l9O2OO2WrljSEYplmGnsfoIVbZW/AruSar6/Lty++Me4DUX3+0tc1FGNe 9MLONW2KcW346DEB9538Ub1LO+uWH+M9ZkpWSUlLFFDQNZZso0D0QNRxDnph/lyDLpuQ 3HKqVFvsK3rGq7ngWoN8zUGZFpml29o4BuBdK+IxxLYgqnagTnbSIkRGi2CKm6LLbH7H V2mA== 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=ZivRzjlDS3OoPoRTHkJnPDZ3sM1VA8uv4BaZC71qcQ0=; b=0kgCuxh6nFcCBfYCYoW50a6oo5R9WQFTKrOBmD9KE5mj5sCvxiEH8dvBX7cRLinrqu O3/QMaNXiSup4i67bGMTbBJjlQmQ1w3D5DqUFpTotwqekZwFrP/pgD8ZmF1cW7LcjZZo SvlMSj+cfDwX7vO94MkD8iScIKwXJkAWpgx0nsqMZVA8dComkWu5KKyh842+51J7aO0T FQj0eT+ZFbHgvi8orxw9ZYr3DmKNMMqs7G0cHK1vz+iVgpJ4r0PT0IRE3PI9x21pIgct oZ8NbmxetQXtECvVDJwrxUXX4vwj7YO7/KrUvO0VP3DU25EzFBKvVwu/irZf8WOjAiyo Y/DQ== X-Gm-Message-State: AOAM533l5U/9MgL1yEcURBJ9iuAU5+81wVPAKTev3SujTYtzZT3eGFQ6 tGevdVMHAema2KgW5dFDHk7qKA== X-Google-Smtp-Source: ABdhPJygPkLqys/y+U39Fu7BGJLLDi0mCvGvvIU8zZqRlYMrXn+sA3kU/XgMURJjA1MVzRZj2Sm/IQ== X-Received: by 2002:a5d:6d48:0:b0:20a:d9e8:57cf with SMTP id k8-20020a5d6d48000000b0020ad9e857cfmr6236832wri.245.1650918112759; Mon, 25 Apr 2022 13:21:52 -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 p3-20020a5d59a3000000b0020a9132d1fbsm11101003wrr.37.2022.04.25.13.21.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 13:21:52 -0700 (PDT) From: Corentin Labbe To: heiko@sntech.de, herbert@gondor.apana.org.au, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org Cc: linux-crypto@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Corentin Labbe , Rob Herring Subject: [PATCH v6 26/33] clk: rk3399: use proper crypto0 name Date: Mon, 25 Apr 2022 20:21:12 +0000 Message-Id: <20220425202119.3566743-27-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220425202119.3566743-1-clabbe@baylibre.com> References: <20220425202119.3566743-1-clabbe@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" RK3399 has 2 crypto instance, named crypto0 and crypto1 in the TRM. Only reset for crypto1 is correctly named, but crypto0 is not. Since nobody use them , add a 0 to be consistent with the TRM and crypto1 e= ntries. Acked-by: Rob Herring Signed-off-by: Corentin Labbe --- include/dt-bindings/clock/rk3399-cru.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/dt-bindings/clock/rk3399-cru.h b/include/dt-bindings/c= lock/rk3399-cru.h index 44e0a319f077..39169d94a44e 100644 --- a/include/dt-bindings/clock/rk3399-cru.h +++ b/include/dt-bindings/clock/rk3399-cru.h @@ -547,8 +547,8 @@ #define SRST_H_PERILP0 171 #define SRST_H_PERILP0_NOC 172 #define SRST_ROM 173 -#define SRST_CRYPTO_S 174 -#define SRST_CRYPTO_M 175 +#define SRST_CRYPTO0_S 174 +#define SRST_CRYPTO0_M 175 =20 /* cru_softrst_con11 */ #define SRST_P_DCF 176 @@ -556,7 +556,7 @@ #define SRST_CM0S 178 #define SRST_CM0S_DBG 179 #define SRST_CM0S_PO 180 -#define SRST_CRYPTO 181 +#define SRST_CRYPTO0 181 #define SRST_P_PERILP1_SGRF 182 #define SRST_P_PERILP1_GRF 183 #define SRST_CRYPTO1_S 184 --=20 2.35.1 From nobody Sun May 10 19:51:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 14353C4332F for ; Mon, 25 Apr 2022 20:24:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245353AbiDYU1E (ORCPT ); Mon, 25 Apr 2022 16:27:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43466 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244287AbiDYU0P (ORCPT ); Mon, 25 Apr 2022 16:26:15 -0400 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3B30E12EF1D for ; Mon, 25 Apr 2022 13:22:03 -0700 (PDT) Received: by mail-wm1-x32e.google.com with SMTP id bg25so9251447wmb.4 for ; Mon, 25 Apr 2022 13:22:03 -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=7MLyGA4WUDMi+Qf8y5tCaEOv26U6HFRODkGLHS/fFC8=; b=1DGhKkAlmKMj8VjnV3ep4FYXi7E1a5hXQPg4RCAOuYNXy5SdyEQnKSSbw6+ApsWwBv C5cYpKhEabT21nYudVPxZEmxpBPHGcdq4QIFXhS4Oor7QWGDt6WuXmBRzTJWz3jSJfcr +xMIrsGPlzHVgEh5KL4hYmmmXn/RGBfaKr98GkiMLXI6MlGTQnsQtnmnBHbPyUOyy1bj zdg1f8KDja2Lowt4UoTqs1On1ic1XDcb6B2MarKSebXtATBssNXRMfQNgQ5rNjuACKs0 UGbF+bxuprQwjv7uPWkVNX5KMg9TQjw0/UZf1GUpPy8QB5ZSSZzDVTPK2Y7twFlr/5F/ ZYRw== 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=7MLyGA4WUDMi+Qf8y5tCaEOv26U6HFRODkGLHS/fFC8=; b=7psYrsERQiJ7dbqty3CqoB0QIZBG9vagTCDWmvrtfsUm3DwrFNyRGJaA8AcHCfR31p DgmUJvaVkz83BuFsVEkRfjcWamqUMCK2jRt0xv5XF9bIqE3iMLgxfoTQjTahzyjFabJu qmM24XciEt8sBsu1rUYPRGezf1BsZMkrJTQCoqxeSNa702vPsVYK5bqti4PKE/aoiv6A dYywNK1BM7tzexqbLtBoxh6vPDmezIBoN/44a95BlhvCbMqMItLrA8viUGLf0+AnzCH9 XceTETJkg0OpzG6v/SQhi7ccap0vkcrd5iDAfGg/eNQwRvcLmucwKhdNcsemZs2oF44J CiKA== X-Gm-Message-State: AOAM5337BxqYid1htS+DpZ727e19hymjZuBQvmiwkh3+q4Dyffp2k0kg acHqu7Ug5j4k+up/oLYwseFACmzc/8qIbg== X-Google-Smtp-Source: ABdhPJxtGcvDjSJow9NUiLdDEYv7ckDaPYq/azkLYCavmxyFb1xlL8kzUOm+RLN0ln3aPeHhQ7pADA== X-Received: by 2002:a05:600c:4e4a:b0:392:88e1:74a7 with SMTP id e10-20020a05600c4e4a00b0039288e174a7mr27460256wmq.174.1650918113681; Mon, 25 Apr 2022 13:21:53 -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 p3-20020a5d59a3000000b0020a9132d1fbsm11101003wrr.37.2022.04.25.13.21.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 13:21:53 -0700 (PDT) From: Corentin Labbe To: heiko@sntech.de, herbert@gondor.apana.org.au, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org Cc: linux-crypto@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Corentin Labbe Subject: [PATCH v6 27/33] arm64: dts: rockchip: add rk3328 crypto node Date: Mon, 25 Apr 2022 20:21:13 +0000 Message-Id: <20220425202119.3566743-28-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220425202119.3566743-1-clabbe@baylibre.com> References: <20220425202119.3566743-1-clabbe@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" rk3328 has a crypto IP handled by the rk3288 crypto driver so adds a node for it. Signed-off-by: Corentin Labbe --- arch/arm64/boot/dts/rockchip/rk3328.dtsi | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts= /rockchip/rk3328.dtsi index b822533dc7f1..c23fa985e66d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi @@ -1007,6 +1007,17 @@ gic: interrupt-controller@ff811000 { (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; }; =20 + crypto: crypto@ff060000 { + compatible =3D "rockchip,rk3328-crypto"; + reg =3D <0x0 0xff060000 0x0 0x4000>; + interrupts =3D ; + clocks =3D <&cru HCLK_CRYPTO_MST>, <&cru HCLK_CRYPTO_SLV>, + <&cru SCLK_CRYPTO>; + clock-names =3D "hclk_master", "hclk_slave", "sclk"; + resets =3D <&cru SRST_CRYPTO>; + reset-names =3D "crypto-rst"; + }; + pinctrl: pinctrl { compatible =3D "rockchip,rk3328-pinctrl"; rockchip,grf =3D <&grf>; --=20 2.35.1 From nobody Sun May 10 19:51:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 74EC4C433EF for ; Mon, 25 Apr 2022 20:24:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245411AbiDYU1I (ORCPT ); Mon, 25 Apr 2022 16:27:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41132 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245369AbiDYU0Q (ORCPT ); Mon, 25 Apr 2022 16:26:16 -0400 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E963131CC4 for ; Mon, 25 Apr 2022 13:22:05 -0700 (PDT) Received: by mail-wm1-x32c.google.com with SMTP id u17-20020a05600c211100b0038eaf4cdaaeso252599wml.1 for ; Mon, 25 Apr 2022 13:22:05 -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=X4PiWPA2z+YwiPjwmkViEPpFlveGzLMoVQh4AfeqXKE=; b=Qg1O2zSUnx2ygBmjovdhwaM7vW9gnnEAw3GRJ4lBZwTX75TRGOMiYJoySJqWBipp5Z MKRamTDF25d2ASVhsQfG6tCR145SE+548nJHkJEx00FuqVJ10ylltJiEC7iUcH6v2CH/ Zqsq954ZLyfe0fdH/cRuRjSewsNcETaEpjPllFdahMmuz8CxAI8GnXMgZxXbGnCllBxj f682bYJHmquE0I4aBl1kSwmhL1kroEK2+dvoaDJTD/m6VRrv0irtflo4QWekYEBQCkW5 GA/CfL04y+lo/FK5okHXfXu/V9ivmpTnTrUtYaWOzCD95+LxvB04QO/vG4gonFiYvcfX xHrw== 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=X4PiWPA2z+YwiPjwmkViEPpFlveGzLMoVQh4AfeqXKE=; b=NyV8xPJGGZ+aEstfg4D6u+e+eNfeJAwFA9WRlV5+RQx5iLYK8ARM4tFpnHVQvo70Ud 0IjSJHZi7T+naq6040e4h+4XdVSt69gXaKBCpIA/BUUlBcJ3kYuMEfxD/dLqGyYXNfxt SAlIgldPJYp18zjVt6fPpsOUfAtJ1R/BzTCCljlr3CtK03ffnKe2WGzyOLj4rfh+JYtJ L0LEM4IHikfvD/FSlu8WXeqPjZmBcdPzIMS+t9+X/ZFoSOn719ZqW6SW/CNF+SqfZvdt QAqZX1ZtUHqTC1yiTd5ecQhAPHcM4+TB1VNnf2SdJ3EEEMFNgJMzNyP5BMpzf6FvJc2u dGDg== X-Gm-Message-State: AOAM530xl/y/SLJWELlwPJBNAcjrvPj01NCuQT3R1u17qeUazksmEcQN 9lcYo91nn6okyY5h9ZZ9aDK7SA== X-Google-Smtp-Source: ABdhPJzrD0nES3DLaCfKsbFatbnjfGfnZ61YdcgcPshkhinZzFOeQEiHBkt/Y/5AVAXrlqcsVjOwXQ== X-Received: by 2002:a7b:c403:0:b0:38e:7c57:9af7 with SMTP id k3-20020a7bc403000000b0038e7c579af7mr17529379wmi.144.1650918114629; Mon, 25 Apr 2022 13:21: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 p3-20020a5d59a3000000b0020a9132d1fbsm11101003wrr.37.2022.04.25.13.21.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 13:21:54 -0700 (PDT) From: Corentin Labbe To: heiko@sntech.de, herbert@gondor.apana.org.au, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org Cc: linux-crypto@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Corentin Labbe Subject: [PATCH v6 28/33] arm64: dts: rockchip: rk3399: add crypto node Date: Mon, 25 Apr 2022 20:21:14 +0000 Message-Id: <20220425202119.3566743-29-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220425202119.3566743-1-clabbe@baylibre.com> References: <20220425202119.3566743-1-clabbe@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The rk3399 has a crypto IP handled by the rk3288 crypto driver so adds a node for it. Signed-off-by: Corentin Labbe --- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts= /rockchip/rk3399.dtsi index a90beec50f6a..b9b16008813e 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -582,6 +582,26 @@ saradc: saradc@ff100000 { status =3D "disabled"; }; =20 + crypto0: crypto@ff8b0000 { + compatible =3D "rockchip,rk3399-crypto"; + reg =3D <0x0 0xff8b0000 0x0 0x4000>; + interrupts =3D ; + clocks =3D <&cru HCLK_M_CRYPTO0>, <&cru HCLK_S_CRYPTO0>, <&cru SCLK_CRYP= TO0>; + clock-names =3D "hclk_master", "hclk_slave", "sclk"; + resets =3D <&cru SRST_CRYPTO0>, <&cru SRST_CRYPTO0_S>, <&cru SRST_CRYPTO= 0_M>; + reset-names =3D "rst_master", "rst_slave", "crypto-rst"; + }; + + crypto1: crypto@ff8b8000 { + compatible =3D "rockchip,rk3399-crypto"; + reg =3D <0x0 0xff8b8000 0x0 0x4000>; + interrupts =3D ; + clocks =3D <&cru HCLK_M_CRYPTO1>, <&cru HCLK_S_CRYPTO1>, <&cru SCLK_CRYP= TO1>; + clock-names =3D "hclk_master", "hclk_slave", "sclk"; + resets =3D <&cru SRST_CRYPTO1>, <&cru SRST_CRYPTO1_S>, <&cru SRST_CRYPTO= 1_M>; + reset-names =3D "rst_master", "rst_slave", "crypto-rst"; + }; + i2c1: i2c@ff110000 { compatible =3D "rockchip,rk3399-i2c"; reg =3D <0x0 0xff110000 0x0 0x1000>; --=20 2.35.1 From nobody Sun May 10 19:51:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E9BC0C433EF for ; Mon, 25 Apr 2022 20:24:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238314AbiDYU1S (ORCPT ); Mon, 25 Apr 2022 16:27:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245314AbiDYU0V (ORCPT ); Mon, 25 Apr 2022 16:26:21 -0400 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 04899132A40 for ; Mon, 25 Apr 2022 13:22:06 -0700 (PDT) Received: by mail-wr1-x42e.google.com with SMTP id b19so22452449wrh.11 for ; Mon, 25 Apr 2022 13:22:05 -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=YTCwVt48y9KJqKpi4AoXVBEGpD4ZzF22SRLhTWJSe6w=; b=7CIeo9WYEIvJlLqLneDCJfR+kiN8MyCHTA8Wxt1x5NNAgq3+wmbNWlWphkPU9c24MX f2ii4jvKkEUE1hnl9XHlOsMzEjUvYxMj806O+YsGflGRR2njAYbO31e3vWONFsanDKEI +p3bv/eImz5uBvyLEt7pg5D4gLfwhmPmw9zcpjOoC2lHwKhArz3FvgIOEt6417/Djc0V wFHLl5ofWgNBaPcWRP+C13t8AV9P2wFzbvcZmf0FGR6492Bl8tziAaYPcWUK7r/MoaBy j9hVFXXmXCMW14Eugrz6I5170wl95cjE2PMG7Tm6HvPihD18JazXvWXCerRcKmheKZ22 MF7g== 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=YTCwVt48y9KJqKpi4AoXVBEGpD4ZzF22SRLhTWJSe6w=; b=ugD6fVbh5Qxi9KzxIyB2GPLi6qJXzPtOjfpLtZIknCTqpGHMPWhqra2Z56QGnny0Wd eLDEmbVK7rW1puC5hv5mettDkRG4yMH+XGgfu9uez6U+Ok8PWfVNdcTLtNn8pXz/c9du vxxEY6pjSoCiiwp60KfcikUZkmgGafHewypXSj/WTA8ZK0C0YergNuIi1cKZRDy61dnJ wy5YQbB4opqVItJ7fBblSGebUob3IxJ/jhUhSCxxlHZOZ8TjtYZsQhOieWO8BZdkUpbC YU9Q+MusVRiVhjxf/lu9XIuN62g2Yxnqd9f/BqPHn77u6gMlJmoReLyafR+rNFeYyLYi 2sYg== X-Gm-Message-State: AOAM530zNKEfsMvvge7Pzo8qXDxujQMfinpAtIT5ZaxBQaHugAiYLGUL dAYgdnVKIM1hML4QREDvWO6N8Q== X-Google-Smtp-Source: ABdhPJw4DeR9ChPvHVK6YYKeDDe8J8X8toi2hJvW5fnqunVJvRIitCAoKXzXYHwTIWqdolI+Oy5WZw== X-Received: by 2002:adf:e188:0:b0:207:9b59:9d82 with SMTP id az8-20020adfe188000000b002079b599d82mr15468842wrb.114.1650918115586; Mon, 25 Apr 2022 13:21:55 -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 p3-20020a5d59a3000000b0020a9132d1fbsm11101003wrr.37.2022.04.25.13.21.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 13:21:55 -0700 (PDT) From: Corentin Labbe To: heiko@sntech.de, herbert@gondor.apana.org.au, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org Cc: linux-crypto@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Corentin Labbe Subject: [PATCH v6 29/33] crypto: rockchip: store crypto_info in request context Date: Mon, 25 Apr 2022 20:21:15 +0000 Message-Id: <20220425202119.3566743-30-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220425202119.3566743-1-clabbe@baylibre.com> References: <20220425202119.3566743-1-clabbe@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The crypto_info to use must be stored in the request context. This will help when 2 crypto_info will be available on rk3399. Signed-off-by: Corentin Labbe --- drivers/crypto/rockchip/rk3288_crypto.h | 2 ++ drivers/crypto/rockchip/rk3288_crypto_ahash.c | 14 ++++++-------- drivers/crypto/rockchip/rk3288_crypto_skcipher.c | 6 ++++-- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/drivers/crypto/rockchip/rk3288_crypto.h b/drivers/crypto/rockc= hip/rk3288_crypto.h index 28bf09fe1c1d..ff9fc25972eb 100644 --- a/drivers/crypto/rockchip/rk3288_crypto.h +++ b/drivers/crypto/rockchip/rk3288_crypto.h @@ -215,6 +215,7 @@ struct rk_ahash_ctx { =20 /* the private variable of hash for fallback */ struct rk_ahash_rctx { + struct rk_crypto_info *dev; struct ahash_request fallback_req; u32 mode; int nrsg; @@ -231,6 +232,7 @@ struct rk_cipher_ctx { }; =20 struct rk_cipher_rctx { + struct rk_crypto_info *dev; u8 backup_iv[AES_BLOCK_SIZE]; u32 mode; struct skcipher_request fallback_req; // keep at the end diff --git a/drivers/crypto/rockchip/rk3288_crypto_ahash.c b/drivers/crypto= /rockchip/rk3288_crypto_ahash.c index 636dbcde0ca3..d1bf68cb390d 100644 --- a/drivers/crypto/rockchip/rk3288_crypto_ahash.c +++ b/drivers/crypto/rockchip/rk3288_crypto_ahash.c @@ -200,6 +200,7 @@ static int rk_ahash_export(struct ahash_request *req, v= oid *out) =20 static int rk_ahash_digest(struct ahash_request *req) { + struct rk_ahash_rctx *rctx =3D ahash_request_ctx(req); struct rk_ahash_ctx *tctx =3D crypto_tfm_ctx(req->base.tfm); struct rk_crypto_info *dev =3D tctx->dev; =20 @@ -209,6 +210,8 @@ static int rk_ahash_digest(struct ahash_request *req) if (!req->nbytes) return zero_message_process(req); =20 + rctx->dev =3D dev; + return crypto_transfer_hash_request_to_engine(dev->engine, req); } =20 @@ -223,10 +226,8 @@ static void crypto_ahash_dma_start(struct rk_crypto_in= fo *dev, struct scatterlis static int rk_hash_prepare(struct crypto_engine *engine, void *breq) { struct ahash_request *areq =3D container_of(breq, struct ahash_request, b= ase); - struct crypto_ahash *tfm =3D crypto_ahash_reqtfm(areq); struct rk_ahash_rctx *rctx =3D ahash_request_ctx(areq); - struct rk_ahash_ctx *tctx =3D crypto_ahash_ctx(tfm); - struct rk_crypto_info *rkc =3D tctx->dev; + struct rk_crypto_info *rkc =3D rctx->dev; int ret; =20 ret =3D dma_map_sg(rkc->dev, areq->src, sg_nents(areq->src), DMA_TO_DEVIC= E); @@ -241,10 +242,8 @@ static int rk_hash_prepare(struct crypto_engine *engin= e, void *breq) static int rk_hash_unprepare(struct crypto_engine *engine, void *breq) { struct ahash_request *areq =3D container_of(breq, struct ahash_request, b= ase); - struct crypto_ahash *tfm =3D crypto_ahash_reqtfm(areq); struct rk_ahash_rctx *rctx =3D ahash_request_ctx(areq); - struct rk_ahash_ctx *tctx =3D crypto_ahash_ctx(tfm); - struct rk_crypto_info *rkc =3D tctx->dev; + struct rk_crypto_info *rkc =3D rctx->dev; =20 dma_unmap_sg(rkc->dev, areq->src, rctx->nrsg, DMA_TO_DEVICE); return 0; @@ -255,11 +254,10 @@ static int rk_hash_run(struct crypto_engine *engine, = void *breq) struct ahash_request *areq =3D container_of(breq, struct ahash_request, b= ase); struct crypto_ahash *tfm =3D crypto_ahash_reqtfm(areq); struct rk_ahash_rctx *rctx =3D ahash_request_ctx(areq); - struct rk_ahash_ctx *tctx =3D crypto_ahash_ctx(tfm); struct ahash_alg *alg =3D __crypto_ahash_alg(tfm->base.__crt_alg); struct rk_crypto_tmp *algt =3D container_of(alg, struct rk_crypto_tmp, al= g.hash); struct scatterlist *sg =3D areq->src; - struct rk_crypto_info *rkc =3D tctx->dev; + struct rk_crypto_info *rkc =3D rctx->dev; int err =3D 0; int i; u32 v; diff --git a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c b/drivers/cry= pto/rockchip/rk3288_crypto_skcipher.c index cf0dfb6029d8..0b1c90ababb7 100644 --- a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c +++ b/drivers/crypto/rockchip/rk3288_crypto_skcipher.c @@ -86,12 +86,15 @@ static int rk_cipher_handle_req(struct skcipher_request= *req) { struct crypto_skcipher *tfm =3D crypto_skcipher_reqtfm(req); struct rk_cipher_ctx *tctx =3D crypto_skcipher_ctx(tfm); + struct rk_cipher_rctx *rctx =3D skcipher_request_ctx(req); struct rk_crypto_info *rkc =3D tctx->dev; struct crypto_engine *engine =3D rkc->engine; =20 if (rk_cipher_need_fallback(req)) return rk_cipher_fallback(req); =20 + rctx->dev =3D rkc; + return crypto_transfer_skcipher_request_to_engine(engine, req); } =20 @@ -290,7 +293,6 @@ static int rk_cipher_run(struct crypto_engine *engine, = void *async_req) { struct skcipher_request *areq =3D container_of(async_req, struct skcipher= _request, base); struct crypto_skcipher *tfm =3D crypto_skcipher_reqtfm(areq); - struct rk_cipher_ctx *ctx =3D crypto_skcipher_ctx(tfm); struct rk_cipher_rctx *rctx =3D skcipher_request_ctx(areq); struct scatterlist *sgs, *sgd; int err =3D 0; @@ -303,7 +305,7 @@ static int rk_cipher_run(struct crypto_engine *engine, = void *async_req) unsigned int todo; struct skcipher_alg *alg =3D crypto_skcipher_alg(tfm); struct rk_crypto_tmp *algt =3D container_of(alg, struct rk_crypto_tmp, al= g.skcipher); - struct rk_crypto_info *rkc =3D ctx->dev; + struct rk_crypto_info *rkc =3D rctx->dev; =20 algt->stat_req++; =20 --=20 2.35.1 From nobody Sun May 10 19:51:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1985EC433FE for ; Mon, 25 Apr 2022 20:24:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245418AbiDYU1N (ORCPT ); Mon, 25 Apr 2022 16:27:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43938 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245444AbiDYU0X (ORCPT ); Mon, 25 Apr 2022 16:26:23 -0400 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 88D1E132A53 for ; Mon, 25 Apr 2022 13:22:06 -0700 (PDT) Received: by mail-wr1-x42a.google.com with SMTP id d5so7273164wrb.6 for ; Mon, 25 Apr 2022 13:22:06 -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=5M1EQ6WsDJDi9glkqW5UPCpOuBDX/AR7k6YyL2ZeXO8=; b=NWEtrMzZQb78/gHTZz2/xRrDhNHvIcWcioKa9osau53EDYQ5B8wG10RuuHkoo9ebgQ 1Ixy28TUsyEKeIFPrSzTZbnwJIe96uoG4g+TIY4bf4LRyuGUk8wbQhzWgyV39E7409b+ BYLserB1aYW9+sWZtBGYC9M4sZgJcvJw0ZertRkaf6zNCcT5/IhOqC8X4WGYczGaoRFK YzkbbogPGLEgfr+zRpw3M6BKRuOApSN3GPz801gzUqRNk9UC+5K3rGwF+uF8KOqjNUcS grNuZxSUjYa6lvykfYggeWgRCGRSaW8JXJ8NO9ddBGX4cOMxRwjj0qi4PDnBosQbOoQh VDAA== 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=5M1EQ6WsDJDi9glkqW5UPCpOuBDX/AR7k6YyL2ZeXO8=; b=PsgUh7nhIbKS10w+5ircCIRwB+r+zLL+hyitXmKFWtbCzyGXbPcaJwwnl1jnSotjky UhMKPNqkv6YS2z1XQbfQCLZFwhMFYGZwyelG9Ys9OHgfDD15HIP1hlkzRa6VJ68Xtm5/ Dhug6Ku7zDE/S5maA+wJwSqHlw8GTzxVyXC9MUL9OH2Bw251qzOlDGfM8iFdZ3EL99aQ h4btgxQnaOt1/mv5ksjbiNJhRAG3dPYyGFnDVKPXZL65yVRMcnGYnkZ3uc6TqxdnWIqw 5BnQitC8KnOeW7Lm3GbfitYFQXTdsf88w/EVON1JmT7tsUYBXgiSoezhKCn1Au9QKdFs jOzg== X-Gm-Message-State: AOAM530ov76a4IbLV0cSvJwdP40wsAPq3ISmC6jjoef42JlOzionGdMF QrqfDuYWLfG3z6yT2+a9FRvqJWIeRCOF4Q== X-Google-Smtp-Source: ABdhPJyA0N6S7uZoZLuQ/IsNwqaGX//V4SfZLnjf86U5qp3VVEgdxilTg0qv/uRwc9cHcaEmz37Wbw== X-Received: by 2002:adf:e289:0:b0:1e3:14ad:75fe with SMTP id v9-20020adfe289000000b001e314ad75femr15468443wri.685.1650918116483; Mon, 25 Apr 2022 13:21:56 -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 p3-20020a5d59a3000000b0020a9132d1fbsm11101003wrr.37.2022.04.25.13.21.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 13:21:56 -0700 (PDT) From: Corentin Labbe To: heiko@sntech.de, herbert@gondor.apana.org.au, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org Cc: linux-crypto@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Corentin Labbe Subject: [PATCH v6 30/33] crypto: rockchip: Check for clocks numbers and their frequencies Date: Mon, 25 Apr 2022 20:21:16 +0000 Message-Id: <20220425202119.3566743-31-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220425202119.3566743-1-clabbe@baylibre.com> References: <20220425202119.3566743-1-clabbe@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add the number of clocks needed for each compatible. Rockchip's datasheet give maximum frequencies for some clocks, so add checks for verifying they are within limits. Let's start with rk3288 for clock frequency check, other will came later. Signed-off-by: Corentin Labbe --- drivers/crypto/rockchip/rk3288_crypto.c | 75 +++++++++++++++++++++---- drivers/crypto/rockchip/rk3288_crypto.h | 16 +++++- 2 files changed, 79 insertions(+), 12 deletions(-) diff --git a/drivers/crypto/rockchip/rk3288_crypto.c b/drivers/crypto/rockc= hip/rk3288_crypto.c index 6147ce44f757..d6d78b8af57c 100644 --- a/drivers/crypto/rockchip/rk3288_crypto.c +++ b/drivers/crypto/rockchip/rk3288_crypto.c @@ -14,10 +14,58 @@ #include #include #include +#include #include #include #include =20 +static const struct rk_variant rk3288_variant =3D { + .num_clks =3D 4, + .rkclks =3D { + { "sclk", 150000000}, + } +}; + +static const struct rk_variant rk3328_variant =3D { + .num_clks =3D 3, +}; + +static int rk_crypto_get_clks(struct rk_crypto_info *dev) +{ + int i, j, err; + unsigned long cr; + + dev->num_clks =3D devm_clk_bulk_get_all(dev->dev, &dev->clks); + if (dev->num_clks < dev->variant->num_clks) { + dev_err(dev->dev, "Missing clocks, got %d instead of %d\n", + dev->num_clks, dev->variant->num_clks); + return -EINVAL; + } + + for (i =3D 0; i < dev->num_clks; i++) { + cr =3D clk_get_rate(dev->clks[i].clk); + for (j =3D 0; j < ARRAY_SIZE(dev->variant->rkclks); j++) { + if (dev->variant->rkclks[j].max =3D=3D 0) + continue; + if (strcmp(dev->variant->rkclks[j].name, dev->clks[i].id)) + continue; + if (cr > dev->variant->rkclks[j].max) { + err =3D clk_set_rate(dev->clks[i].clk, + dev->variant->rkclks[j].max); + if (err) + dev_err(dev->dev, "Fail downclocking %s from %lu to %lu\n", + dev->variant->rkclks[j].name, cr, + dev->variant->rkclks[j].max); + else + dev_info(dev->dev, "Downclocking %s from %lu to %lu\n", + dev->variant->rkclks[j].name, cr, + dev->variant->rkclks[j].max); + } + } + } + return 0; +} + static int rk_crypto_enable_clk(struct rk_crypto_info *dev) { int err; @@ -196,8 +244,12 @@ static void rk_crypto_unregister(void) } =20 static const struct of_device_id crypto_of_id_table[] =3D { - { .compatible =3D "rockchip,rk3288-crypto" }, - { .compatible =3D "rockchip,rk3328-crypto" }, + { .compatible =3D "rockchip,rk3288-crypto", + .data =3D &rk3288_variant, + }, + { .compatible =3D "rockchip,rk3328-crypto", + .data =3D &rk3328_variant, + }, {} }; MODULE_DEVICE_TABLE(of, crypto_of_id_table); @@ -215,6 +267,15 @@ static int rk_crypto_probe(struct platform_device *pde= v) goto err_crypto; } =20 + crypto_info->dev =3D &pdev->dev; + platform_set_drvdata(pdev, crypto_info); + + crypto_info->variant =3D of_device_get_match_data(&pdev->dev); + if (!crypto_info->variant) { + dev_err(&pdev->dev, "Missing variant\n"); + return -EINVAL; + } + crypto_info->rst =3D devm_reset_control_get(dev, "crypto-rst"); if (IS_ERR(crypto_info->rst)) { err =3D PTR_ERR(crypto_info->rst); @@ -227,12 +288,9 @@ static int rk_crypto_probe(struct platform_device *pde= v) goto err_crypto; } =20 - crypto_info->num_clks =3D devm_clk_bulk_get_all(&pdev->dev, - &crypto_info->clks); - if (crypto_info->num_clks < 3) { - err =3D -EINVAL; + err =3D rk_crypto_get_clks(crypto_info); + if (err) goto err_crypto; - } =20 crypto_info->irq =3D platform_get_irq(pdev, 0); if (crypto_info->irq < 0) { @@ -250,9 +308,6 @@ static int rk_crypto_probe(struct platform_device *pdev) goto err_crypto; } =20 - crypto_info->dev =3D &pdev->dev; - platform_set_drvdata(pdev, crypto_info); - crypto_info->engine =3D crypto_engine_alloc_init(&pdev->dev, true); crypto_engine_start(crypto_info->engine); init_completion(&crypto_info->complete); diff --git a/drivers/crypto/rockchip/rk3288_crypto.h b/drivers/crypto/rockc= hip/rk3288_crypto.h index ff9fc25972eb..ac979d67ced9 100644 --- a/drivers/crypto/rockchip/rk3288_crypto.h +++ b/drivers/crypto/rockchip/rk3288_crypto.h @@ -188,14 +188,26 @@ #define CRYPTO_WRITE(dev, offset, val) \ writel_relaxed((val), ((dev)->reg + (offset))) =20 +#define RK_MAX_CLKS 4 + +struct rk_clks { + const char *name; + unsigned long max; +}; + +struct rk_variant { + int num_clks; + struct rk_clks rkclks[RK_MAX_CLKS]; +}; + struct rk_crypto_info { struct device *dev; struct clk_bulk_data *clks; - int num_clks; + int num_clks; struct reset_control *rst; void __iomem *reg; int irq; - + const struct rk_variant *variant; struct crypto_engine *engine; struct completion complete; int status; --=20 2.35.1 From nobody Sun May 10 19:51:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D7AA8C433EF for ; Mon, 25 Apr 2022 20:25:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245384AbiDYU1W (ORCPT ); Mon, 25 Apr 2022 16:27:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43994 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245449AbiDYU0Y (ORCPT ); Mon, 25 Apr 2022 16:26:24 -0400 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 55981133191 for ; Mon, 25 Apr 2022 13:22:08 -0700 (PDT) Received: by mail-wm1-x333.google.com with SMTP id m15-20020a7bca4f000000b0038fdc1394b1so247006wml.2 for ; Mon, 25 Apr 2022 13:22:08 -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=/HcULCDUWUOb7zL9pkaT5teTJK7hgsOh6ToY9+UZMac=; b=xqUTU8xMQZJdiUUUhaiatxHt2pJ0KhhDESFWwIHZFGx0fwxOw1AAnJ3XSHyxDgaIlc NMdO0z37i6kh2m1Jx0hX0V+NHdfqEjupyl5rDg9uCzzOIBcdeo+aAU1V2H8oeMErHOsK JkIfpXJwmsb9/FPqYTpj2fsoSrbZC7Df405Tte52Pe10azA6zLzQFy6Nlcuq6uczsU3x HVm6sEXoG4asvDWClJmbwxnKYAX4uIa9vPkrFIracvHWeh9I5EVw7jeT+D1ATmSLH34k Owjjh+WVYq6JgCzrypD9mTU7tWEXkxETAVxJ7BuFtzewjAwbuu2UfjNdJ8o4806Wu+tR 5sjQ== 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=/HcULCDUWUOb7zL9pkaT5teTJK7hgsOh6ToY9+UZMac=; b=TX9z+yfDDEMx4gZ9k/mnH5/8kVuB3gYcuHTtqBXB9dPv/hHwIlCCOux+VD+T2eyz6+ gksk7dyiwIqY0O8e280+QY96CaZMoe5I7abQFKS455HVCcP8Wq2ORfyneWwuYX7KxikW HoHj9YeEgcPPVdMhslYQAT76Mj5BCa8WbsD4337InZxHmypLn2mzVao3gkqujG6Yacnt SFP1LDEhlDl8oAopOMU0ayup70AniyR2aPT2s75nPqtpBbbQxuFw9EjaTB3tveLY/Agc b6j5eJ5W3U9CZGVdIkWSmB6jNG7mUxj7orKJwTseGA32mBj1kb2ZC6nJFO6gwjeEqpt6 PGVQ== X-Gm-Message-State: AOAM532124gbnU3MSyYNGlp+z/NMX/Ud3RjUXSyxfj9jJAcW+yZJHxgV /pvD/sUsnHc8jyuMnEe6Pl9j4w== X-Google-Smtp-Source: ABdhPJyFG59O4Q5s2JRra7taaFzIKxx9HKl6TygfF76w2bWP4ST4HKjFihAcupMDMyl5BAuFscFu/A== X-Received: by 2002:a1c:2c6:0:b0:38f:f280:caa2 with SMTP id 189-20020a1c02c6000000b0038ff280caa2mr18100378wmc.87.1650918117419; Mon, 25 Apr 2022 13:21:57 -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 p3-20020a5d59a3000000b0020a9132d1fbsm11101003wrr.37.2022.04.25.13.21.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 13:21:56 -0700 (PDT) From: Corentin Labbe To: heiko@sntech.de, herbert@gondor.apana.org.au, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org Cc: linux-crypto@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Corentin Labbe Subject: [PATCH v6 31/33] crypto: rockchip: rk_ahash_reg_init use crypto_info from parameter Date: Mon, 25 Apr 2022 20:21:17 +0000 Message-Id: <20220425202119.3566743-32-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220425202119.3566743-1-clabbe@baylibre.com> References: <20220425202119.3566743-1-clabbe@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" rk_ahash_reg_init() use crypto_info from TFM context, since we will remove it, let's take if from parameters. Signed-off-by: Corentin Labbe --- drivers/crypto/rockchip/rk3288_crypto_ahash.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/crypto/rockchip/rk3288_crypto_ahash.c b/drivers/crypto= /rockchip/rk3288_crypto_ahash.c index d1bf68cb390d..30f78256c955 100644 --- a/drivers/crypto/rockchip/rk3288_crypto_ahash.c +++ b/drivers/crypto/rockchip/rk3288_crypto_ahash.c @@ -78,12 +78,10 @@ static int zero_message_process(struct ahash_request *r= eq) return 0; } =20 -static void rk_ahash_reg_init(struct ahash_request *req) +static void rk_ahash_reg_init(struct ahash_request *req, + struct rk_crypto_info *dev) { struct rk_ahash_rctx *rctx =3D ahash_request_ctx(req); - struct crypto_ahash *tfm =3D crypto_ahash_reqtfm(req); - struct rk_ahash_ctx *tctx =3D crypto_ahash_ctx(tfm); - struct rk_crypto_info *dev =3D tctx->dev; int reg_status; =20 reg_status =3D CRYPTO_READ(dev, RK_CRYPTO_CTRL) | @@ -281,7 +279,7 @@ static int rk_hash_run(struct crypto_engine *engine, vo= id *breq) goto theend; } =20 - rk_ahash_reg_init(areq); + rk_ahash_reg_init(areq, rkc); =20 while (sg) { reinit_completion(&rkc->complete); --=20 2.35.1 From nobody Sun May 10 19:51:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BFFFEC433F5 for ; Mon, 25 Apr 2022 20:25:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245627AbiDYU2S (ORCPT ); Mon, 25 Apr 2022 16:28:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40946 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245382AbiDYU0o (ORCPT ); Mon, 25 Apr 2022 16:26:44 -0400 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8BF7C1331B0 for ; Mon, 25 Apr 2022 13:22:09 -0700 (PDT) Received: by mail-wr1-x435.google.com with SMTP id q23so9600672wra.1 for ; Mon, 25 Apr 2022 13:22:09 -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=JBfzxCMFwSqtUUAKgLYX1NAdCBaYrQJEwA5Wp5fjHpE=; b=Z1sd3HVLsayY8MumfB1wqk+G5Kp3bdjZm0cqTrmrLPFHjZGYSNcrtnWvywBiPAmSn2 04TiThXfxwHVCG3GNw7Jxw77NnGXa4yLERWXHMkEQPtX84Ag7eoITDX6/Xd8vwdUDZyQ w5zHTd7q0EhgefgJ1inIYexOMbbbX4sYzmNkhVOn8zuTbnAL7jHg3nzlDi5b4xo9xZNI J4GQSYy0zC/VIitJzE0JnS9cHizc/l0tmuDZ9tvDPSthUN8htS08fI4iXq/lpvWHZ3yO 9bcJtW00geKWrH5VJFQj0RtMuzUp+L/udWp6Y7Sutz+PijghwxtQDWHc8MZ8re5p6z9w eoHQ== 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=JBfzxCMFwSqtUUAKgLYX1NAdCBaYrQJEwA5Wp5fjHpE=; b=a5ZXTc9QK5EtnobIvMHwb74DO3C0KGqmP21UwYsPbr2TqjPZAEEIO5CKPHd8IDQSay YsRC4PVdBhF7n+lmVlBvM5hMH+zLygCPZkkRo0+yWZly3bljjOeGbFSkccmzz70OHxTY 03GxxNAUJ9jKIZmM2Y+kXu8OrDpQstq3mtpZQjLXWqIP09qt5NWbnHQ0t8PJrk/Fh55X 28mCToOesdEP+oH8U8c662l4mJR9IBQniQgVtf0Au36fa/7KuduC4LsrTkIbcbzg1lEu YUGN8LTj+xyA3hoyF6MCeVCb+N1VLN2vp7RvkTEyu+E6QpUK9Gwk14uRl+acqZVrOuwA iDiA== X-Gm-Message-State: AOAM532t9YFxu5LRUr/912N9PqP7hpbsEHu3K/QtspKjNMWWs8LSGCYq Fypv5x8NPJoSXPTHH3z/4Sxj5A== X-Google-Smtp-Source: ABdhPJxNWd3M4cRFr5bsPUuzlFPqKIiWknPAwX3WBYB9OYoVFFs1WSG+KDvw11V6w5QEZWs2ErXxIA== X-Received: by 2002:a05:6000:54e:b0:20a:d9d2:e6b2 with SMTP id b14-20020a056000054e00b0020ad9d2e6b2mr6361745wrf.178.1650918118290; Mon, 25 Apr 2022 13:21:58 -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 p3-20020a5d59a3000000b0020a9132d1fbsm11101003wrr.37.2022.04.25.13.21.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 13:21:57 -0700 (PDT) From: Corentin Labbe To: heiko@sntech.de, herbert@gondor.apana.org.au, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org Cc: linux-crypto@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Corentin Labbe Subject: [PATCH v6 32/33] crypto: rockchip: permit to have more than one reset Date: Mon, 25 Apr 2022 20:21:18 +0000 Message-Id: <20220425202119.3566743-33-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220425202119.3566743-1-clabbe@baylibre.com> References: <20220425202119.3566743-1-clabbe@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The RK3399 has 3 resets, so the driver to handle multiple resets. This is done by using devm_reset_control_array_get_exclusive(). Signed-off-by: Corentin Labbe --- drivers/crypto/rockchip/rk3288_crypto.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/crypto/rockchip/rk3288_crypto.c b/drivers/crypto/rockc= hip/rk3288_crypto.c index d6d78b8af57c..9ba9b9e433c4 100644 --- a/drivers/crypto/rockchip/rk3288_crypto.c +++ b/drivers/crypto/rockchip/rk3288_crypto.c @@ -276,7 +276,7 @@ static int rk_crypto_probe(struct platform_device *pdev) return -EINVAL; } =20 - crypto_info->rst =3D devm_reset_control_get(dev, "crypto-rst"); + crypto_info->rst =3D devm_reset_control_array_get_exclusive(dev); if (IS_ERR(crypto_info->rst)) { err =3D PTR_ERR(crypto_info->rst); goto err_crypto; --=20 2.35.1 From nobody Sun May 10 19:51:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 06B88C433F5 for ; Mon, 25 Apr 2022 20:25:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244388AbiDYU2b (ORCPT ); Mon, 25 Apr 2022 16:28:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44086 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245400AbiDYU0p (ORCPT ); Mon, 25 Apr 2022 16:26:45 -0400 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 87B831331B9 for ; Mon, 25 Apr 2022 13:22:10 -0700 (PDT) Received: by mail-wm1-x32c.google.com with SMTP id m15-20020a7bca4f000000b0038fdc1394b1so247060wml.2 for ; Mon, 25 Apr 2022 13:22:10 -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=t0XyAhBL3GzdA5U1sG1AM9uyNSEgXgyAo6t1dX7w57I=; b=Cl8yd7uO0i8GiW80Wh6dUj7v00GRzHnN0Yy5uSsy10IexF5/LOHoHJgNFQ87XrIIpO sHiFh67ECmPYohCyJeTVGqeFxNeZqQMULEuW6RBVpf6DHqVyLmM1i9EFPVGdCCtOtbXf MPKQhPu4auhQnBESPjebLwHDKQyrBTJmz0ydw2q+vyeuPK5UL1PWCXlv9XqvRZEhrIhb AK7e9oGNJ7ZbNBkVW0b4F34maSmQO3Teh2v1OEVO2Gw57kv5bkWbYP0Hm+iNHgo6vmQ4 KwpgsF3Om4w7fml2VMjsFUrMjYTgP5KD940bu34yzxoFZ5Ac1IbUI3a5i5An6kqXonXv NnxA== 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=t0XyAhBL3GzdA5U1sG1AM9uyNSEgXgyAo6t1dX7w57I=; b=T8MrDwHLeCc3MEw/KtfuHApsEwJjHkHvRSb2wMKUd/MKysif2TZOd9UCwCYftYFK6o jQOdOVbZ4QkGPIPvZDqzyqoWesNdPyxoUybgZBk4FWWTuiR6NwBUPb5HTmsJzuyo9ODt gTex9SMEuJI2FfxExpcody3SenWUPeevUByEJBgn962UnETsLgRDtaYhiVn4UIwLiMnW CeUXuzWdz05tsYCsdKbBIve3lE8ZvEUKmHh52t6PRHtXaWVX/X5LeYb2f2pDDUMPIqNA XmSvLBO6XPJXg0w0UcnPb40wZh6giqyKeeug+cBPuumMOZuRwtzMKm3uuaOy5UrS/eaa gN8A== X-Gm-Message-State: AOAM531RtfJbGwt0O/5ZeLePRWfEThI+JpklyNgnS7d4F3X4CIXeK227 AMfrcUbIZMSr7z9OcBNPhDG60A== X-Google-Smtp-Source: ABdhPJzOSKyb30O7gFAeel/g2NHRf0oaukJuAh7eOG1a8VuR0DHNmkiFC5Qd5q4HdkIN23GQDyrWfQ== X-Received: by 2002:a05:600c:3d0e:b0:38f:f83b:e7dc with SMTP id bh14-20020a05600c3d0e00b0038ff83be7dcmr26807242wmb.29.1650918119362; Mon, 25 Apr 2022 13:21:59 -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 p3-20020a5d59a3000000b0020a9132d1fbsm11101003wrr.37.2022.04.25.13.21.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 13:21:58 -0700 (PDT) From: Corentin Labbe To: heiko@sntech.de, herbert@gondor.apana.org.au, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org Cc: linux-crypto@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Corentin Labbe Subject: [PATCH v6 33/33] crypto: rockchip: Add support for RK3399 Date: Mon, 25 Apr 2022 20:21:19 +0000 Message-Id: <20220425202119.3566743-34-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220425202119.3566743-1-clabbe@baylibre.com> References: <20220425202119.3566743-1-clabbe@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The RK3399 has 2 rk3288 compatible crypto device named crypto0 and crypto1. The only difference is lack of RSA in crypto1. We need to add driver support for 2 parallel instance as only one need to register crypto algorithms. Then the driver will round robin each request on each device. For avoiding complexity (device bringup after a TFM is created), PM is modified to be handled per request. Signed-off-by: Corentin Labbe --- drivers/crypto/rockchip/rk3288_crypto.c | 92 +++++++++++++++---- drivers/crypto/rockchip/rk3288_crypto.h | 25 +++-- drivers/crypto/rockchip/rk3288_crypto_ahash.c | 37 ++++---- .../crypto/rockchip/rk3288_crypto_skcipher.c | 37 ++++---- 4 files changed, 123 insertions(+), 68 deletions(-) diff --git a/drivers/crypto/rockchip/rk3288_crypto.c b/drivers/crypto/rockc= hip/rk3288_crypto.c index 9ba9b9e433c4..baf015f6707b 100644 --- a/drivers/crypto/rockchip/rk3288_crypto.c +++ b/drivers/crypto/rockchip/rk3288_crypto.c @@ -19,6 +19,23 @@ #include #include =20 +static struct rockchip_ip rocklist =3D { + .dev_list =3D LIST_HEAD_INIT(rocklist.dev_list), + .lock =3D __SPIN_LOCK_UNLOCKED(rocklist.lock), +}; + +struct rk_crypto_info *get_rk_crypto(void) +{ + struct rk_crypto_info *first; + + spin_lock(&rocklist.lock); + first =3D list_first_entry_or_null(&rocklist.dev_list, + struct rk_crypto_info, list); + list_rotate_left(&rocklist.dev_list); + spin_unlock(&rocklist.lock); + return first; +} + static const struct rk_variant rk3288_variant =3D { .num_clks =3D 4, .rkclks =3D { @@ -30,6 +47,10 @@ static const struct rk_variant rk3328_variant =3D { .num_clks =3D 3, }; =20 +static const struct rk_variant rk3399_variant =3D { + .num_clks =3D 3, +}; + static int rk_crypto_get_clks(struct rk_crypto_info *dev) { int i, j, err; @@ -83,8 +104,8 @@ static void rk_crypto_disable_clk(struct rk_crypto_info = *dev) } =20 /* - * Power management strategy: The device is suspended unless a TFM exists = for - * one of the algorithms proposed by this driver. + * Power management strategy: The device is suspended until a request + * is handled. For avoiding suspend/resume yoyo, the autosuspend is set to= 2s. */ static int rk_crypto_pm_suspend(struct device *dev) { @@ -161,8 +182,17 @@ static struct rk_crypto_tmp *rk_cipher_algs[] =3D { #ifdef CONFIG_CRYPTO_DEV_ROCKCHIP_DEBUG static int rk_crypto_debugfs_show(struct seq_file *seq, void *v) { + struct rk_crypto_info *dd; unsigned int i; =20 + spin_lock(&rocklist.lock); + list_for_each_entry(dd, &rocklist.dev_list, list) { + seq_printf(seq, "%s %s requests: %lu\n", + dev_driver_string(dd->dev), dev_name(dd->dev), + dd->nreq); + } + spin_unlock(&rocklist.lock); + for (i =3D 0; i < ARRAY_SIZE(rk_cipher_algs); i++) { if (!rk_cipher_algs[i]->dev) continue; @@ -193,6 +223,18 @@ static int rk_crypto_debugfs_show(struct seq_file *seq= , void *v) DEFINE_SHOW_ATTRIBUTE(rk_crypto_debugfs); #endif =20 +static void register_debugfs(struct rk_crypto_info *crypto_info) +{ +#ifdef CONFIG_CRYPTO_DEV_ROCKCHIP_DEBUG + /* Ignore error of debugfs */ + rocklist.dbgfs_dir =3D debugfs_create_dir("rk3288_crypto", NULL); + rocklist.dbgfs_stats =3D debugfs_create_file("stats", 0444, + rocklist.dbgfs_dir, + &rocklist, + &rk_crypto_debugfs_fops); +#endif +} + static int rk_crypto_register(struct rk_crypto_info *crypto_info) { unsigned int i, k; @@ -250,6 +292,9 @@ static const struct of_device_id crypto_of_id_table[] = =3D { { .compatible =3D "rockchip,rk3328-crypto", .data =3D &rk3328_variant, }, + { .compatible =3D "rockchip,rk3399-crypto", + .data =3D &rk3399_variant, + }, {} }; MODULE_DEVICE_TABLE(of, crypto_of_id_table); @@ -257,7 +302,7 @@ MODULE_DEVICE_TABLE(of, crypto_of_id_table); static int rk_crypto_probe(struct platform_device *pdev) { struct device *dev =3D &pdev->dev; - struct rk_crypto_info *crypto_info; + struct rk_crypto_info *crypto_info, *first; int err =3D 0; =20 crypto_info =3D devm_kzalloc(&pdev->dev, @@ -316,22 +361,22 @@ static int rk_crypto_probe(struct platform_device *pd= ev) if (err) goto err_pm; =20 - err =3D rk_crypto_register(crypto_info); - if (err) { - dev_err(dev, "err in register alg"); - goto err_register_alg; - } + spin_lock(&rocklist.lock); + first =3D list_first_entry_or_null(&rocklist.dev_list, + struct rk_crypto_info, list); + list_add_tail(&crypto_info->list, &rocklist.dev_list); + spin_unlock(&rocklist.lock); + + if (!first) { + err =3D rk_crypto_register(crypto_info); + if (err) { + dev_err(dev, "Fail to register crypto algorithms"); + goto err_register_alg; + } =20 -#ifdef CONFIG_CRYPTO_DEV_ROCKCHIP_DEBUG - /* Ignore error of debugfs */ - crypto_info->dbgfs_dir =3D debugfs_create_dir("rk3288_crypto", NULL); - crypto_info->dbgfs_stats =3D debugfs_create_file("stats", 0444, - crypto_info->dbgfs_dir, - crypto_info, - &rk_crypto_debugfs_fops); -#endif + register_debugfs(crypto_info); + } =20 - dev_info(dev, "Crypto Accelerator successfully registered\n"); return 0; =20 err_register_alg: @@ -346,11 +391,20 @@ static int rk_crypto_probe(struct platform_device *pd= ev) static int rk_crypto_remove(struct platform_device *pdev) { struct rk_crypto_info *crypto_tmp =3D platform_get_drvdata(pdev); + struct rk_crypto_info *first; + + spin_lock_bh(&rocklist.lock); + list_del(&crypto_tmp->list); + first =3D list_first_entry_or_null(&rocklist.dev_list, + struct rk_crypto_info, list); + spin_unlock_bh(&rocklist.lock); =20 + if (!first) { #ifdef CONFIG_CRYPTO_DEV_ROCKCHIP_DEBUG - debugfs_remove_recursive(crypto_tmp->dbgfs_dir); + debugfs_remove_recursive(rocklist.dbgfs_dir); #endif - rk_crypto_unregister(); + rk_crypto_unregister(); + } rk_crypto_pm_exit(crypto_tmp); crypto_engine_exit(crypto_tmp->engine); return 0; diff --git a/drivers/crypto/rockchip/rk3288_crypto.h b/drivers/crypto/rockc= hip/rk3288_crypto.h index ac979d67ced9..b2695258cade 100644 --- a/drivers/crypto/rockchip/rk3288_crypto.h +++ b/drivers/crypto/rockchip/rk3288_crypto.h @@ -190,6 +190,20 @@ =20 #define RK_MAX_CLKS 4 =20 +/* + * struct rockchip_ip - struct for managing a list of RK crypto instance + * @dev_list: Used for doing a list of rk_crypto_info + * @lock: Control access to dev_list + * @dbgfs_dir: Debugfs dentry for statistic directory + * @dbgfs_stats: Debugfs dentry for statistic counters + */ +struct rockchip_ip { + struct list_head dev_list; + spinlock_t lock; /* Control access to dev_list */ + struct dentry *dbgfs_dir; + struct dentry *dbgfs_stats; +}; + struct rk_clks { const char *name; unsigned long max; @@ -201,6 +215,7 @@ struct rk_variant { }; =20 struct rk_crypto_info { + struct list_head list; struct device *dev; struct clk_bulk_data *clks; int num_clks; @@ -208,19 +223,15 @@ struct rk_crypto_info { void __iomem *reg; int irq; const struct rk_variant *variant; + unsigned long nreq; struct crypto_engine *engine; struct completion complete; int status; -#ifdef CONFIG_CRYPTO_DEV_ROCKCHIP_DEBUG - struct dentry *dbgfs_dir; - struct dentry *dbgfs_stats; -#endif }; =20 /* the private variable of hash */ struct rk_ahash_ctx { struct crypto_engine_ctx enginectx; - struct rk_crypto_info *dev; /* for fallback */ struct crypto_ahash *fallback_tfm; }; @@ -236,7 +247,6 @@ struct rk_ahash_rctx { /* the private variable of cipher */ struct rk_cipher_ctx { struct crypto_engine_ctx enginectx; - struct rk_crypto_info *dev; unsigned int keylen; u8 key[AES_MAX_KEY_SIZE]; u8 iv[AES_BLOCK_SIZE]; @@ -252,7 +262,7 @@ struct rk_cipher_rctx { =20 struct rk_crypto_tmp { u32 type; - struct rk_crypto_info *dev; + struct rk_crypto_info *dev; union { struct skcipher_alg skcipher; struct ahash_alg hash; @@ -276,4 +286,5 @@ extern struct rk_crypto_tmp rk_ahash_sha1; extern struct rk_crypto_tmp rk_ahash_sha256; extern struct rk_crypto_tmp rk_ahash_md5; =20 +struct rk_crypto_info *get_rk_crypto(void); #endif diff --git a/drivers/crypto/rockchip/rk3288_crypto_ahash.c b/drivers/crypto= /rockchip/rk3288_crypto_ahash.c index 30f78256c955..a78ff3dcd0b1 100644 --- a/drivers/crypto/rockchip/rk3288_crypto_ahash.c +++ b/drivers/crypto/rockchip/rk3288_crypto_ahash.c @@ -199,8 +199,8 @@ static int rk_ahash_export(struct ahash_request *req, v= oid *out) static int rk_ahash_digest(struct ahash_request *req) { struct rk_ahash_rctx *rctx =3D ahash_request_ctx(req); - struct rk_ahash_ctx *tctx =3D crypto_tfm_ctx(req->base.tfm); - struct rk_crypto_info *dev =3D tctx->dev; + struct rk_crypto_info *dev; + struct crypto_engine *engine; =20 if (rk_ahash_need_fallback(req)) return rk_ahash_digest_fb(req); @@ -208,9 +208,12 @@ static int rk_ahash_digest(struct ahash_request *req) if (!req->nbytes) return zero_message_process(req); =20 + dev =3D get_rk_crypto(); + rctx->dev =3D dev; + engine =3D dev->engine; =20 - return crypto_transfer_hash_request_to_engine(dev->engine, req); + return crypto_transfer_hash_request_to_engine(engine, req); } =20 static void crypto_ahash_dma_start(struct rk_crypto_info *dev, struct scat= terlist *sg) @@ -260,9 +263,14 @@ static int rk_hash_run(struct crypto_engine *engine, v= oid *breq) int i; u32 v; =20 + err =3D pm_runtime_resume_and_get(rkc->dev); + if (err) + return err; + rctx->mode =3D 0; =20 algt->stat_req++; + rkc->nreq++; =20 switch (crypto_ahash_digestsize(tfm)) { case SHA1_DIGEST_SIZE: @@ -313,6 +321,8 @@ static int rk_hash_run(struct crypto_engine *engine, vo= id *breq) } =20 theend: + pm_runtime_put_autosuspend(rkc->dev); + local_bh_disable(); crypto_finalize_hash_request(engine, breq, err); local_bh_enable(); @@ -323,21 +333,15 @@ static int rk_hash_run(struct crypto_engine *engine, = void *breq) static int rk_cra_hash_init(struct crypto_tfm *tfm) { struct rk_ahash_ctx *tctx =3D crypto_tfm_ctx(tfm); - struct rk_crypto_tmp *algt; - struct ahash_alg *alg =3D __crypto_ahash_alg(tfm->__crt_alg); - const char *alg_name =3D crypto_tfm_alg_name(tfm); - int err; - - algt =3D container_of(alg, struct rk_crypto_tmp, alg.hash); - - tctx->dev =3D algt->dev; + struct ahash_alg *alg =3D __crypto_ahash_alg(tfm->__crt_alg); + struct rk_crypto_tmp *algt =3D container_of(alg, struct rk_crypto_tmp, al= g.hash); =20 /* for fallback */ tctx->fallback_tfm =3D crypto_alloc_ahash(alg_name, 0, CRYPTO_ALG_NEED_FALLBACK); if (IS_ERR(tctx->fallback_tfm)) { - dev_err(tctx->dev->dev, "Could not load fallback driver.\n"); + dev_err(algt->dev->dev, "Could not load fallback driver.\n"); return PTR_ERR(tctx->fallback_tfm); } =20 @@ -349,15 +353,7 @@ static int rk_cra_hash_init(struct crypto_tfm *tfm) tctx->enginectx.op.prepare_request =3D rk_hash_prepare; tctx->enginectx.op.unprepare_request =3D rk_hash_unprepare; =20 - err =3D pm_runtime_resume_and_get(tctx->dev->dev); - if (err < 0) - goto error_pm; - return 0; -error_pm: - crypto_free_ahash(tctx->fallback_tfm); - - return err; } =20 static void rk_cra_hash_exit(struct crypto_tfm *tfm) @@ -365,7 +361,6 @@ static void rk_cra_hash_exit(struct crypto_tfm *tfm) struct rk_ahash_ctx *tctx =3D crypto_tfm_ctx(tfm); =20 crypto_free_ahash(tctx->fallback_tfm); - pm_runtime_put_autosuspend(tctx->dev->dev); } =20 struct rk_crypto_tmp rk_ahash_sha1 =3D { diff --git a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c b/drivers/cry= pto/rockchip/rk3288_crypto_skcipher.c index 0b1c90ababb7..59069457582b 100644 --- a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c +++ b/drivers/crypto/rockchip/rk3288_crypto_skcipher.c @@ -17,11 +17,11 @@ static int rk_cipher_need_fallback(struct skcipher_request *req) { struct crypto_skcipher *tfm =3D crypto_skcipher_reqtfm(req); - unsigned int bs =3D crypto_skcipher_blocksize(tfm); struct skcipher_alg *alg =3D crypto_skcipher_alg(tfm); struct rk_crypto_tmp *algt =3D container_of(alg, struct rk_crypto_tmp, al= g.skcipher); struct scatterlist *sgs, *sgd; unsigned int stodo, dtodo, len; + unsigned int bs =3D crypto_skcipher_blocksize(tfm); =20 if (!req->cryptlen) return true; @@ -84,15 +84,16 @@ static int rk_cipher_fallback(struct skcipher_request *= areq) =20 static int rk_cipher_handle_req(struct skcipher_request *req) { - struct crypto_skcipher *tfm =3D crypto_skcipher_reqtfm(req); - struct rk_cipher_ctx *tctx =3D crypto_skcipher_ctx(tfm); struct rk_cipher_rctx *rctx =3D skcipher_request_ctx(req); - struct rk_crypto_info *rkc =3D tctx->dev; - struct crypto_engine *engine =3D rkc->engine; + struct rk_crypto_info *rkc; + struct crypto_engine *engine; =20 if (rk_cipher_need_fallback(req)) return rk_cipher_fallback(req); =20 + rkc =3D get_rk_crypto(); + + engine =3D rkc->engine; rctx->dev =3D rkc; =20 return crypto_transfer_skcipher_request_to_engine(engine, req); @@ -307,7 +308,12 @@ static int rk_cipher_run(struct crypto_engine *engine,= void *async_req) struct rk_crypto_tmp *algt =3D container_of(alg, struct rk_crypto_tmp, al= g.skcipher); struct rk_crypto_info *rkc =3D rctx->dev; =20 + err =3D pm_runtime_resume_and_get(rkc->dev); + if (err) + return err; + algt->stat_req++; + rkc->nreq++; =20 ivsize =3D crypto_skcipher_ivsize(tfm); if (areq->iv && crypto_skcipher_ivsize(tfm) > 0) { @@ -401,6 +407,8 @@ static int rk_cipher_run(struct crypto_engine *engine, = void *async_req) } =20 theend: + pm_runtime_put_autosuspend(rkc->dev); + local_bh_disable(); crypto_finalize_skcipher_request(engine, areq, err); local_bh_enable(); @@ -420,18 +428,13 @@ static int rk_cipher_run(struct crypto_engine *engine= , void *async_req) static int rk_cipher_tfm_init(struct crypto_skcipher *tfm) { struct rk_cipher_ctx *ctx =3D crypto_skcipher_ctx(tfm); - struct skcipher_alg *alg =3D crypto_skcipher_alg(tfm); const char *name =3D crypto_tfm_alg_name(&tfm->base); - struct rk_crypto_tmp *algt; - int err; - - algt =3D container_of(alg, struct rk_crypto_tmp, alg.skcipher); - - ctx->dev =3D algt->dev; + struct skcipher_alg *alg =3D crypto_skcipher_alg(tfm); + struct rk_crypto_tmp *algt =3D container_of(alg, struct rk_crypto_tmp, al= g.skcipher); =20 ctx->fallback_tfm =3D crypto_alloc_skcipher(name, 0, CRYPTO_ALG_NEED_FALL= BACK); if (IS_ERR(ctx->fallback_tfm)) { - dev_err(ctx->dev->dev, "ERROR: Cannot allocate fallback for %s %ld\n", + dev_err(algt->dev->dev, "ERROR: Cannot allocate fallback for %s %ld\n", name, PTR_ERR(ctx->fallback_tfm)); return PTR_ERR(ctx->fallback_tfm); } @@ -441,14 +444,7 @@ static int rk_cipher_tfm_init(struct crypto_skcipher *= tfm) =20 ctx->enginectx.op.do_one_request =3D rk_cipher_run; =20 - err =3D pm_runtime_resume_and_get(ctx->dev->dev); - if (err < 0) - goto error_pm; - return 0; -error_pm: - crypto_free_skcipher(ctx->fallback_tfm); - return err; } =20 static void rk_cipher_tfm_exit(struct crypto_skcipher *tfm) @@ -457,7 +453,6 @@ static void rk_cipher_tfm_exit(struct crypto_skcipher *= tfm) =20 memzero_explicit(ctx->key, ctx->keylen); crypto_free_skcipher(ctx->fallback_tfm); - pm_runtime_put_autosuspend(ctx->dev->dev); } =20 struct rk_crypto_tmp rk_ecb_aes_alg =3D { --=20 2.35.1