diff options
| author | Will Deacon <will@kernel.org> | 2019-07-29 11:43:48 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2020-11-15 15:49:07 +0100 |
| commit | 8b3e83b2bceddb0845f0f8aa4e9f8be54ffd8b3e (patch) | |
| tree | 286a557817ce09b518927b96af5af218a8bf7e1d | |
| parent | cc0a2d3283681c37f6dee3a71e3fc2bd622fec55 (diff) | |
UPSTREAM: drivers/perf: arm_pmu: Fix failure path in PM notifier
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>
(cherry picked from commit 0d7fd70f26039bd4b33444ca47f0e69ce3ae0354)
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I2b56119ebfce18f535bbb51be0c77414b8a74a99
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
| -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 9ffa22814de3..e24e77da2fd9 100644 --- a/drivers/perf/arm_pmu.c +++ b/drivers/perf/arm_pmu.c @@ -797,8 +797,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: |