From: Corentin Labbe <clabbe@baylibre.com>
To: heiko@sntech.de, herbert@gondor.apana.org.au, ardb@kernel.org,
davem@davemloft.net, krzysztof.kozlowski+dt@linaro.org,
mturquette@baylibre.com, robh+dt@kernel.org, sboyd@kernel.org
Cc: linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org,
Corentin Labbe <clabbe@baylibre.com>,
John Keeping <john@metanate.com>
Subject: [PATCH v9 13/33] crypto: rockchip: introduce PM
Date: Thu, 1 Sep 2022 12:56:50 +0000 [thread overview]
Message-ID: <20220901125710.3733083-14-clabbe@baylibre.com> (raw)
In-Reply-To: <20220901125710.3733083-1-clabbe@baylibre.com>
Add runtime PM support for rockchip crypto.
Reviewed-by: John Keeping <john@metanate.com>
Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
---
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/rockchip/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);
}
+/*
+ * 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 = 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 = dev_get_drvdata(dev);
+
+ return rk_crypto_enable_clk(rkdev);
+}
+
+static const struct dev_pm_ops rk_crypto_pm_ops = {
+ 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 = 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 = 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);
- rk_crypto_enable_clk(crypto_info);
+ err = rk_crypto_pm_init(crypto_info);
+ if (err)
+ goto err_pm;
err = rk_crypto_register(crypto_info);
if (err) {
@@ -294,6 +338,8 @@ static int rk_crypto_probe(struct platform_device *pdev)
return 0;
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 *pdev)
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 = {
.remove = rk_crypto_remove,
.driver = {
.name = "rk3288-crypto",
+ .pm = &rk_crypto_pm_ops,
.of_match_table = crypto_of_id_table,
},
};
diff --git a/drivers/crypto/rockchip/rk3288_crypto.h b/drivers/crypto/rockchip/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 <linux/interrupt.h>
#include <linux/debugfs.h>
#include <linux/delay.h>
+#include <linux/pm_runtime.h>
#include <linux/scatterlist.h>
#include <crypto/engine.h>
#include <crypto/internal/hash.h>
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 = __crypto_ahash_alg(tfm->__crt_alg);
const char *alg_name = crypto_tfm_alg_name(tfm);
+ int err;
algt = container_of(alg, struct rk_crypto_tmp, alg.hash);
@@ -349,7 +350,15 @@ static int rk_cra_hash_init(struct crypto_tfm *tfm)
tctx->enginectx.op.prepare_request = rk_hash_prepare;
tctx->enginectx.op.unprepare_request = rk_hash_unprepare;
+ err = 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;
}
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 = crypto_tfm_ctx(tfm);
crypto_free_ahash(tctx->fallback_tfm);
+ pm_runtime_put_autosuspend(tctx->dev->dev);
}
struct rk_crypto_tmp rk_ahash_sha1 = {
diff --git a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c b/drivers/crypto/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 = crypto_skcipher_alg(tfm);
const char *name = crypto_tfm_alg_name(&tfm->base);
struct rk_crypto_tmp *algt;
+ int err;
algt = container_of(alg, struct rk_crypto_tmp, alg.skcipher);
@@ -471,7 +472,14 @@ static int rk_ablk_init_tfm(struct crypto_skcipher *tfm)
ctx->enginectx.op.do_one_request = rk_cipher_run;
+ err = 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;
}
static void rk_ablk_exit_tfm(struct crypto_skcipher *tfm)
@@ -480,6 +488,7 @@ static void rk_ablk_exit_tfm(struct crypto_skcipher *tfm)
memzero_explicit(ctx->key, ctx->keylen);
crypto_free_skcipher(ctx->fallback_tfm);
+ pm_runtime_put_autosuspend(ctx->dev->dev);
}
struct rk_crypto_tmp rk_ecb_aes_alg = {
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-09-01 14:06 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-01 12:56 [PATCH v9 00/33] crypto: rockchip: permit to pass self-tests Corentin Labbe
2022-09-01 12:56 ` [PATCH v9 01/33] crypto: rockchip: use dev_err for error message about interrupt Corentin Labbe
2022-09-01 12:56 ` [PATCH v9 02/33] crypto: rockchip: do not use uninitialized variable Corentin Labbe
2022-09-01 12:56 ` [PATCH v9 03/33] crypto: rockchip: do not do custom power management Corentin Labbe
2022-09-01 12:56 ` [PATCH v9 04/33] crypto: rockchip: fix privete/private typo Corentin Labbe
2022-09-01 12:56 ` [PATCH v9 05/33] crypto: rockchip: do not store mode globally Corentin Labbe
2022-09-01 12:56 ` [PATCH v9 06/33] crypto: rockchip: add fallback for cipher Corentin Labbe
2022-09-01 12:56 ` [PATCH v9 07/33] crypto: rockchip: add fallback for ahash Corentin Labbe
2022-09-01 12:56 ` [PATCH v9 08/33] crypto: rockchip: better handle cipher key Corentin Labbe
2022-09-01 12:56 ` [PATCH v9 09/33] crypto: rockchip: remove non-aligned handling Corentin Labbe
2022-09-01 12:56 ` [PATCH v9 10/33] crypto: rockchip: rework by using crypto_engine Corentin Labbe
2022-09-01 12:56 ` [PATCH v9 11/33] crypto: rockchip: rewrite type Corentin Labbe
2022-09-01 12:56 ` [PATCH v9 12/33] crypto: rockchip: add debugfs Corentin Labbe
2022-09-01 12:56 ` Corentin Labbe [this message]
2022-09-01 12:56 ` [PATCH v9 14/33] crypto: rockchip: handle reset also in PM Corentin Labbe
2022-09-01 12:56 ` [PATCH v9 15/33] crypto: rockchip: use clk_bulk to simplify clock management Corentin Labbe
2022-09-01 12:56 ` [PATCH v9 16/33] crypto: rockchip: add myself as maintainer Corentin Labbe
2022-09-01 12:56 ` [PATCH v9 17/33] crypto: rockchip: use read_poll_timeout Corentin Labbe
2022-09-01 12:56 ` [PATCH v9 18/33] crypto: rockchip: fix style issue Corentin Labbe
2022-09-01 12:56 ` [PATCH v9 19/33] crypto: rockchip: add support for rk3328 Corentin Labbe
2022-09-01 12:56 ` [PATCH v9 20/33] crypto: rockchip: rename ablk functions to cipher Corentin Labbe
2022-09-01 12:56 ` [PATCH v9 21/33] crypto: rockchip: rework rk_handle_req function Corentin Labbe
2022-09-01 12:56 ` [PATCH v9 22/33] crypto: rockchip: use a rk_crypto_info variable instead of lot of indirection Corentin Labbe
2022-09-01 12:57 ` [PATCH v9 23/33] crypto: rockchip: use the rk_crypto_info given as parameter Corentin Labbe
2022-09-01 12:57 ` [PATCH v9 24/33] dt-bindings: crypto: convert rockchip-crypto to YAML Corentin Labbe
2022-09-01 12:57 ` [PATCH v9 25/33] dt-bindings: crypto: rockchip: convert to new driver bindings Corentin Labbe
2022-09-07 20:38 ` Rob Herring
2022-09-09 8:57 ` LABBE Corentin
2022-09-01 12:57 ` [PATCH v9 26/33] clk: rk3399: use proper crypto0 name Corentin Labbe
2022-09-01 12:57 ` [PATCH v9 27/33] arm64: dts: rockchip: add rk3328 crypto node Corentin Labbe
2022-09-01 12:57 ` [PATCH v9 28/33] arm64: dts: rockchip: rk3399: add " Corentin Labbe
2022-09-01 12:57 ` [PATCH v9 29/33] crypto: rockchip: store crypto_info in request context Corentin Labbe
2022-09-01 12:57 ` [PATCH v9 30/33] crypto: rockchip: Check for clocks numbers and their frequencies Corentin Labbe
2022-09-01 12:57 ` [PATCH v9 31/33] crypto: rockchip: rk_ahash_reg_init use crypto_info from parameter Corentin Labbe
2022-09-01 12:57 ` [PATCH v9 32/33] crypto: rockchip: permit to have more than one reset Corentin Labbe
2022-09-01 12:57 ` [PATCH v9 33/33] crypto: rockchip: Add support for RK3399 Corentin Labbe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220901125710.3733083-14-clabbe@baylibre.com \
--to=clabbe@baylibre.com \
--cc=ardb@kernel.org \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=heiko@sntech.de \
--cc=herbert@gondor.apana.org.au \
--cc=john@metanate.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mturquette@baylibre.com \
--cc=robh+dt@kernel.org \
--cc=sboyd@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).