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

Commit 1e3c1dd1 authored by Anna-Maria Gleixner's avatar Anna-Maria Gleixner Committed by Martin Schwidefsky
Browse files

s390/cpum_sf: Fix cpu hotplug notifier transitions 



The cpumf_pmu_notfier() hotplug callback lacks handling of the
CPU_DOWN_FAILED case. That means, if CPU_DOWN_PREPARE failes, the PMC
of the CPU is not setup again. Furthermore the CPU_ONLINE_FROZEN case
will never be processed because of masking the switch expression with
CPU_TASKS_FROZEN.

Add handling for CPU_DOWN_FAILED transition to setup the PMC of the
CPU. Remove CPU_ONLINE_FROZEN case.

Signed-off-by: default avatarAnna-Maria Gleixner <anna-maria@linutronix.de>
Acked-by: default avatarHendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent a9878842

arch/s390/kernel/perf_cpum_sf.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1521,7 +1521,7 @@ static int cpumf_pmu_notifier(struct notifier_block *self, 




	switch (action & ~CPU_TASKS_FROZEN) {

	switch (action & ~CPU_TASKS_FROZEN) {

	case CPU_ONLINE:

	case CPU_ONLINE:

	case CPU_ONLINE_FROZEN:

	case CPU_DOWN_FAILED:

		flags = PMC_INIT;

		flags = PMC_INIT;

		smp_call_function_single(cpu, setup_pmc_cpu, &flags, 1);

		smp_call_function_single(cpu, setup_pmc_cpu, &flags, 1);

		break;

		break;