diff options
| author | Will Deacon <will@kernel.org> | 2019-07-29 11:43:48 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-06 19:05:27 +0200 |
| commit | 1cc390b313cd07662fb38c79fb3dc16d7fedff31 (patch) | |
| tree | 07a2996781c740921d07aaf6fc8bc32c137056b6 | |
| parent | 45842c3b55d7792bec170d9eb950bbcd14cd45cb (diff) | |
| download | linux-stable-1cc390b313cd07662fb38c79fb3dc16d7fedff31.tar.gz linux-stable-1cc390b313cd07662fb38c79fb3dc16d7fedff31.tar.bz2 linux-stable-1cc390b313cd07662fb38c79fb3dc16d7fedff31.zip | |
drivers/perf: arm_pmu: Fix failure path in PM notifier
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>
| -rw-r--r-- | drivers/perf/arm_pmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c index 5e06917b4cef..22e365fa440c 100644 --- a/drivers/perf/arm_pmu.c +++ b/drivers/perf/arm_pmu.c @@ -751,8 +751,8 @@ static int cpu_pm_pmu_notify(struct notifier_block *b, unsigned long cmd, 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: |