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

Commit 6663a4fa authored by Scott Wood's avatar Scott Wood Committed by Benjamin Herrenschmidt
Browse files

powerpc: Don't skip ePAPR spin-table CPUs 



Commit 59a53afe "powerpc: Don't setup
CPUs with bad status" broke ePAPR SMP booting.  ePAPR says that CPUs
that aren't presently running shall have status of disabled, with
enable-method being used to determine whether the CPU can be enabled.

Fix by checking for spin-table, which is currently the only supported
enable-method.

Signed-off-by: default avatarScott Wood <scottwood@freescale.com>
Cc: Michael Neuling <mikey@neuling.org>
Cc: Emil Medve <Emilian.Medve@Freescale.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent c2cbcf53

arch/powerpc/kernel/setup-common.c

+9 −1
Original line number Diff line number Diff line
@@ -469,9 +469,17 @@ void __init smp_setup_cpu_maps(void) 
		}



		for (j = 0; j < nthreads && cpu < nr_cpu_ids; j++) {

			bool avail;



			DBG("    thread %d -> cpu %d (hard id %d)\n",

			    j, cpu, be32_to_cpu(intserv[j]));

			set_cpu_present(cpu, of_device_is_available(dn));



			avail = of_device_is_available(dn);

			if (!avail)

				avail = !of_property_match_string(dn,

						"enable-method", "spin-table");



			set_cpu_present(cpu, avail);

			set_hard_smp_processor_id(cpu, be32_to_cpu(intserv[j]));

			set_cpu_possible(cpu, true);

			cpu++;