This is a note to let you know that I've just added the patch titled
clk: qcom: mss-sc7180: fix missing resume during probe
to the 6.5-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
clk-qcom-mss-sc7180-fix-missing-resume-during-probe.patch
and it can be found in the queue-6.5 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From e2349da0fa7ca822cda72f427345b95795358fe7 Mon Sep 17 00:00:00 2001
From: Johan Hovold <johan+linaro@xxxxxxxxxx>
Date: Tue, 18 Jul 2023 15:29:01 +0200
Subject: clk: qcom: mss-sc7180: fix missing resume during probe
From: Johan Hovold <johan+linaro@xxxxxxxxxx>
commit e2349da0fa7ca822cda72f427345b95795358fe7 upstream.
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: 8def929c4097 ("clk: qcom: Add modem clock controller driver for SC7180")
Cc: stable@xxxxxxxxxxxxxxx # 5.7
Cc: Taniya Das <quic_tdas@xxxxxxxxxxx>
Signed-off-by: Johan Hovold <johan+linaro@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20230718132902.21430-8-johan+linaro@xxxxxxxxxx
Signed-off-by: Bjorn Andersson <andersson@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/clk/qcom/mss-sc7180.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
--- a/drivers/clk/qcom/mss-sc7180.c
+++ b/drivers/clk/qcom/mss-sc7180.c
@@ -87,11 +87,22 @@ static int mss_sc7180_probe(struct platf
return ret;
}
+ ret = pm_runtime_resume_and_get(&pdev->dev);
+ if (ret)
+ return ret;
+
ret = qcom_cc_probe(pdev, &mss_sc7180_desc);
if (ret < 0)
- 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 mss_sc7180_pm_ops = {
Patches currently in stable-queue which might be from johan+linaro@xxxxxxxxxx are
queue-6.5/clk-qcom-dispcc-sm8550-fix-runtime-pm-imbalance-on-probe-errors.patch
queue-6.5/clk-qcom-camcc-sc7180-fix-async-resume-during-probe.patch
queue-6.5/clk-qcom-lpasscc-sc7280-fix-missing-resume-during-probe.patch
queue-6.5/clk-qcom-mss-sc7180-fix-missing-resume-during-probe.patch
queue-6.5/clk-qcom-turingcc-qcs404-fix-missing-resume-during-probe.patch
queue-6.5/clk-qcom-dispcc-sm8450-fix-runtime-pm-imbalance-on-probe-errors.patch
queue-6.5/clk-qcom-q6sstop-qcs404-fix-missing-resume-during-probe.patch
