Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9224305c authored by Will Deacon's avatar Will Deacon Committed by Greg Kroah-Hartman
Browse files

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: da4e4f18 ("drivers/perf: arm_pmu: implement CPU_PM notifier")
Reported-by: default avatarAnders Roxell <anders.roxell@linaro.org>
Acked-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: default avatarWill Deacon <will@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0a878192

drivers/perf/arm_pmu.c

+1 −1
Original line number Diff line number Diff line
@@ -804,8 +804,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: