[PATCH] soc: qcom: rpmh-rsc: Write the sleep and wake sets again after hibernation
From: Abel Vesa
Date: Fri Nov 20 2026 - 10:08:46 EST
The sleep and wake TCSes are written by rpmh_flush() right before the
last CPU of the RSC power domain goes down, but only when the cached
votes changed since the last flush. A hibernation image is restored by
another kernel, which used the TCSes for its own votes. The cache of the
restored kernel still says the TCSes hold its votes, so it never writes
them again and every power collapse after the restore applies the sleep
and wake votes of the kernel that loaded the image, until one of the
cached votes happens to change.
Mark the cache dirty when restoring from hibernation, so that the next
power collapse writes the sleep and wake sets of the restored kernel.
Signed-off-by: Abel Vesa <abel.vesa@xxxxxxxxxxxxxxxx>
---
drivers/soc/qcom/rpmh-rsc.c | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/drivers/soc/qcom/rpmh-rsc.c b/drivers/soc/qcom/rpmh-rsc.c
index 02b74c510c3f..3f89857d9d22 100644
--- a/drivers/soc/qcom/rpmh-rsc.c
+++ b/drivers/soc/qcom/rpmh-rsc.c
@@ -1169,12 +1169,35 @@ static const struct of_device_id rpmh_drv_match[] = {
};
MODULE_DEVICE_TABLE(of, rpmh_drv_match);
+/*
+ * A hibernation image is restored by another kernel, which filled the sleep
+ * and wake TCSes with its own votes. Our cache still says they hold ours, so
+ * rpmh_flush() would never write them again and the next power collapse would
+ * use what the other kernel left behind. Write them again before that.
+ */
+static int rpmh_rsc_restore_early(struct device *dev)
+{
+ struct rsc_drv *drv = dev_get_drvdata(dev);
+ unsigned long flags;
+
+ spin_lock_irqsave(&drv->client.cache_lock, flags);
+ drv->client.dirty = true;
+ spin_unlock_irqrestore(&drv->client.cache_lock, flags);
+
+ return 0;
+}
+
+static const struct dev_pm_ops rpmh_rsc_pm_ops = {
+ .restore_early = pm_sleep_ptr(rpmh_rsc_restore_early),
+};
+
static struct platform_driver rpmh_driver = {
.probe = rpmh_rsc_probe,
.driver = {
.name = "rpmh",
.of_match_table = rpmh_drv_match,
.suppress_bind_attrs = true,
+ .pm = pm_sleep_ptr(&rpmh_rsc_pm_ops),
},
};
---
base-commit: adcad7f4e6332cff3d6d7165f41584899f598534
change-id: 20261120-soc-qcom-rpmh-rsc-restore-hibernation-e536287de56c
Best regards,
--
Abel