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

Commit 43964ae3 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Perf: arm64: restore registers after reset"

parents 4160a850 d42a3dae

arch/arm64/kernel/perf_debug.c

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 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"

;



static ssize_t desc_read(struct file *fp, char __user *buf,

arch/arm64/kernel/perf_event.c

+3 −2
Original line number Diff line number Diff line
@@ -1556,15 +1556,16 @@ 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->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->reset) {

		if (cpu_has_active_perf(cpu)) {

			/*

			 * 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);

		}