Skip to content

Commit c45def5

Browse files
diandersandersson
authored andcommitted
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: 985427f ("soc: qcom: rpmh: Invoke rpmh_flush() for dirty caches") Signed-off-by: Douglas Anderson <[email protected]> Reviewed-by: Maulik Shah <[email protected]> Reviewed-by: Stephen Boyd <[email protected]> Link: https://lore.kernel.org/r/20200504104917.v6.2.I1927d1bca2569a27b2d04986baf285027f0818a2@changeid Signed-off-by: Bjorn Andersson <[email protected]>
1 parent 1143c36 commit c45def5

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

drivers/soc/qcom/rpmh-rsc.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -837,6 +837,10 @@ static int rpmh_rsc_cpu_pm_callback(struct notifier_block *nfb,
837837
ret = NOTIFY_OK;
838838

839839
exit:
840+
if (ret == NOTIFY_BAD)
841+
/* We won't be called w/ CPU_PM_ENTER_FAILED */
842+
cpumask_clear_cpu(smp_processor_id(), &drv->cpus_entered_pm);
843+
840844
spin_unlock(&drv->pm_lock);
841845
return ret;
842846
}

0 commit comments

Comments
 (0)