From f5034a4732baa6d18db97250542029fd379abd0c Mon Sep 17 00:00:00 2001 From: Jeremy Gebben Date: Tue, 26 Apr 2016 09:40:31 -0600 Subject: [PATCH] Revert "Perf: arm64: restore registers after reset" This reverts commit 6470f7956ac6b479 ("Perf: arm64: restore registers after reset") This change is being reverted so that it can be replaced by equivalent functionality from upstream. CRs-Fixed: 1008368 Change-Id: Ieaa6da68173aaf31c8a38bce64f1bc46bae957c4 Signed-off-by: Jeremy Gebben --- arch/arm64/kernel/perf_debug.c | 1 - drivers/perf/arm_pmu.c | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm64/kernel/perf_debug.c b/arch/arm64/kernel/perf_debug.c index 260c71b54382..4828cfbca654 100644 --- a/arch/arm64/kernel/perf_debug.c +++ b/arch/arm64/kernel/perf_debug.c @@ -31,7 +31,6 @@ static char *descriptions = "10 Perf: arm64: tracectr: initialize counts after hotplug\n" "11 Perf: arm64: Refine disable/enable in tracecounters\n" "12 Perf: arm64: fix disable of pmu irq during hotplug\n" - "13 Perf: arm64: restore registers after reset\n" "15 Perf: arm64: make debug dir handle exportable\n" "16 Perf: arm64: add perf trace user\n" "17 Perf: arm64: add support for kryo pmu\n" diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c index 67b6b5bc3482..d8708fe77317 100644 --- a/drivers/perf/arm_pmu.c +++ b/drivers/perf/arm_pmu.c @@ -858,16 +858,15 @@ static int perf_cpu_pm_notifier(struct notifier_block *self, unsigned long cmd, case CPU_PM_ENTER_FAILED: case CPU_PM_EXIT: - if (cpu_has_active_perf(cpu, cpu_pmu) && cpu_pmu->reset) - cpu_pmu->reset(NULL); if (cpu_pmu->restore_pm_registers) cpu_pmu->restore_pm_registers((void *)lcpu); - if (cpu_has_active_perf(cpu, cpu_pmu)) { + if (cpu_has_active_perf(cpu, cpu_pmu) && cpu_pmu->reset) { /* * Flip this bit so armpmu_enable knows it needs * to re-enable active counters. */ get_cpu_var(from_idle) = 1; + cpu_pmu->reset(NULL); pmu = &cpu_pmu->pmu; pmu->pmu_enable(pmu); }