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

Commit aef40e87 authored by Michael Neuling's avatar Michael Neuling Committed by Benjamin Herrenschmidt
Browse files

powerpc/pseries: Only call start-cpu when a CPU is stopped 



Currently we always call start-cpu irrespective of if the CPU is
stopped or not. Unfortunatley on POWER7, firmware seems to not like
start-cpu being called when a cpu already been started.  This was not
the case on POWER6 and earlier.

This patch checks to see if the CPU is stopped or not via an
query-cpu-stopped-state call, and only calls start-cpu on CPUs which
are stopped.

This fixes a bug with kexec on POWER7 on PHYP where only the primary
thread would make it to the second kernel.

Reported-by: default avatarAnkita Garg <ankita@linux.vnet.ibm.com>
Cc: <stable@kernel.org>
Signed-off-by: default avatarMichael Neuling <mikey@neuling.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent f8b67691

arch/powerpc/platforms/pseries/smp.c

+6 −0
Original line number Diff line number Diff line
@@ -104,6 +104,12 @@ static inline int __devinit smp_startup_cpu(unsigned int lcpu) 


	pcpu = get_hard_smp_processor_id(lcpu);



	/* Check to see if the CPU out of FW already for kexec */

	if (smp_query_cpu_stopped(pcpu) == QCSS_NOT_STOPPED){

		cpu_set(lcpu, of_spin_map);

		return 1;

	}



	/* Fixup atomic count: it exited inside IRQ handler. */

	task_thread_info(paca[lcpu].__current)->preempt_count	= 0;