| From 0d7fd70f26039bd4b33444ca47f0e69ce3ae0354 Mon Sep 17 00:00:00 2001 |
| From: Will Deacon <will@kernel.org> |
| Date: Mon, 29 Jul 2019 11:43:48 +0100 |
| Subject: drivers/perf: arm_pmu: Fix failure path in PM notifier |
| |
| From: Will Deacon <will@kernel.org> |
| |
| commit 0d7fd70f26039bd4b33444ca47f0e69ce3ae0354 upstream. |
| |
| Handling of the CPU_PM_ENTER_FAILED transition in the Arm PMU PM |
| notifier code incorrectly skips restoration of the counters. Fix the |
| logic so that CPU_PM_ENTER_FAILED follows the same path as CPU_PM_EXIT. |
| |
| Cc: <stable@vger.kernel.org> |
| Fixes: da4e4f18afe0f372 ("drivers/perf: arm_pmu: implement CPU_PM notifier") |
| Reported-by: Anders Roxell <anders.roxell@linaro.org> |
| Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> |
| Signed-off-by: Will Deacon <will@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/perf/arm_pmu.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/perf/arm_pmu.c |
| +++ b/drivers/perf/arm_pmu.c |
| @@ -804,8 +804,8 @@ static int cpu_pm_pmu_notify(struct noti |
| cpu_pm_pmu_setup(armpmu, cmd); |
| break; |
| case CPU_PM_EXIT: |
| - cpu_pm_pmu_setup(armpmu, cmd); |
| case CPU_PM_ENTER_FAILED: |
| + cpu_pm_pmu_setup(armpmu, cmd); |
| armpmu->start(armpmu); |
| break; |
| default: |
