summaryrefslogtreecommitdiff
path: root/drivers/soc
diff options
context:
space:
mode:
authorDouglas Anderson <dianders@chromium.org>2020-05-04 20:50:16 +0300
committerBjorn Andersson <bjorn.andersson@linaro.org>2020-05-15 21:42:58 +0300
commitc45def5d804abaa48c205f8ba5cd52bfbeeae70c (patch)
treee4c2e1a511f70cf390876d2c6ffb26b03a1007f0 /drivers/soc
parent1143c36656b8dccf0ece93053502a147d3c60961 (diff)
downloadlinux-c45def5d804abaa48c205f8ba5cd52bfbeeae70c.tar.xz
soc: qcom: rpmh-rsc: We aren't notified of our own failure w/ NOTIFY_BAD
When a PM Notifier returns NOTIFY_BAD it doesn't get called with CPU_PM_ENTER_FAILED. It only get called for CPU_PM_ENTER_FAILED if someone else (further down the notifier chain) returns NOTIFY_BAD. Handle this case by taking our CPU out of the list of ones that have entered PM. Without this it's possible we could detect that the last CPU went down (and we would flush) even if some CPU was alive. That's not good since our flushing routines currently assume they're running on the last CPU for mutual exclusion. Fixes: 985427f997b6 ("soc: qcom: rpmh: Invoke rpmh_flush() for dirty caches") Signed-off-by: Douglas Anderson <dianders@chromium.org> Reviewed-by: Maulik Shah <mkshah@codeaurora.org> Reviewed-by: Stephen Boyd <swboyd@chromium.org> Link: https://lore.kernel.org/r/20200504104917.v6.2.I1927d1bca2569a27b2d04986baf285027f0818a2@changeid Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Diffstat (limited to 'drivers/soc')
-rw-r--r--drivers/soc/qcom/rpmh-rsc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/soc/qcom/rpmh-rsc.c b/drivers/soc/qcom/rpmh-rsc.c
index 5a2659df98da..a5659a7306e4 100644
--- a/drivers/soc/qcom/rpmh-rsc.c
+++ b/drivers/soc/qcom/rpmh-rsc.c
@@ -837,6 +837,10 @@ static int rpmh_rsc_cpu_pm_callback(struct notifier_block *nfb,
ret = NOTIFY_OK;
exit:
+ if (ret == NOTIFY_BAD)
+ /* We won't be called w/ CPU_PM_ENTER_FAILED */
+ cpumask_clear_cpu(smp_processor_id(), &drv->cpus_entered_pm);
+
spin_unlock(&drv->pm_lock);
return ret;
}