From: Johan Hovold <johan+linaro@kernel.org>
To: Bjorn Andersson <andersson@kernel.org>
Cc: Andy Gross <agross@kernel.org>,
Konrad Dybcio <konrad.dybcio@linaro.org>,
Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>,
linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org,
linux-kernel@vger.kernel.org,
Johan Hovold <johan+linaro@kernel.org>,
stable@vger.kernel.org
Subject: [PATCH 6/8] clk: qcom: q6sstop-qcs404: fix missing resume during probe
Date: Tue, 18 Jul 2023 15:29:00 +0200 [thread overview]
Message-ID: <20230718132902.21430-7-johan+linaro@kernel.org> (raw)
In-Reply-To: <20230718132902.21430-1-johan+linaro@kernel.org>
Drivers that enable runtime PM must make sure that the controller is
runtime resumed before accessing its registers to prevent the power
domain from being disabled.
Fixes: 6cdef2738db0 ("clk: qcom: Add Q6SSTOP clock controller for QCS404")
Cc: stable@vger.kernel.org # 5.5
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
---
drivers/clk/qcom/q6sstop-qcs404.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/drivers/clk/qcom/q6sstop-qcs404.c b/drivers/clk/qcom/q6sstop-qcs404.c
index 780074e05841..26e2d63614ac 100644
--- a/drivers/clk/qcom/q6sstop-qcs404.c
+++ b/drivers/clk/qcom/q6sstop-qcs404.c
@@ -174,21 +174,32 @@ static int q6sstopcc_qcs404_probe(struct platform_device *pdev)
return ret;
}
+ ret = pm_runtime_resume_and_get(&pdev->dev);
+ if (ret)
+ return ret;
+
q6sstop_regmap_config.name = "q6sstop_tcsr";
desc = &tcsr_qcs404_desc;
ret = qcom_cc_probe_by_index(pdev, 1, desc);
if (ret)
- return ret;
+ goto err_put_rpm;
q6sstop_regmap_config.name = "q6sstop_cc";
desc = &q6sstop_qcs404_desc;
ret = qcom_cc_probe_by_index(pdev, 0, desc);
if (ret)
- return ret;
+ goto err_put_rpm;
+
+ pm_runtime_put(&pdev->dev);
return 0;
+
+err_put_rpm:
+ pm_runtime_put_sync(&pdev->dev);
+
+ return ret;
}
static const struct dev_pm_ops q6sstopcc_pm_ops = {
--
2.41.0
next prev parent reply other threads:[~2023-07-18 13:29 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-18 13:28 [PATCH 0/8] clk: qcom: fix runtime PM bugs Johan Hovold
2023-07-18 13:28 ` [PATCH 1/8] clk: qcom: camcc-sc7180: fix async resume during probe Johan Hovold
2023-07-18 13:28 ` [PATCH 2/8] clk: qcom: dispcc-sm8450: fix runtime PM imbalance on probe errors Johan Hovold
2023-07-18 13:28 ` [PATCH 3/8] clk: qcom: dispcc-sm8550: " Johan Hovold
2023-07-18 13:28 ` [PATCH 4/8] clk: qcom: gcc-sc8280xp: " Johan Hovold
2023-07-19 7:09 ` Johan Hovold
2023-07-18 13:28 ` [PATCH 5/8] clk: qcom: lpasscc-sc7280: fix missing resume during probe Johan Hovold
2023-07-18 14:58 ` Bjorn Andersson
2023-07-18 15:39 ` Johan Hovold
2023-07-18 13:29 ` Johan Hovold [this message]
2023-07-18 13:29 ` [PATCH 7/8] clk: qcom: mss-sc7180: " Johan Hovold
2023-07-18 13:29 ` [PATCH 8/8] clk: qcom: turingcc-qcs404: " Johan Hovold
2023-07-18 13:46 ` [PATCH 0/8] clk: qcom: fix runtime PM bugs Konrad Dybcio
2023-07-19 7:23 ` Johan Hovold
2023-07-18 19:10 ` Bjorn Andersson
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=20230718132902.21430-7-johan+linaro@kernel.org \
--to=johan+linaro@kernel.org \
--cc=agross@kernel.org \
--cc=andersson@kernel.org \
--cc=konrad.dybcio@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=sboyd@kernel.org \
--cc=stable@vger.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.