[POWERPC] Don't enable cpu hotplug on pSeries machines with MPIC
Don't allow cpu hotplug on systems lacking XICS interrupt controller (i.e. with an MPIC interrupt controller), since the current pSeries platform code is hardcoded for XICS. This works around the bug reported by Paul Mackerras where the disable_nonboot_cpus() call recently added to the shutdown path will cause an oops on older pSeries machines. Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Родитель
84dd4676f5
Коммит
64f2758514
|
@ -252,6 +252,20 @@ static struct notifier_block pseries_smp_nb = {
|
|||
|
||||
static int __init pseries_cpu_hotplug_init(void)
|
||||
{
|
||||
struct device_node *np;
|
||||
const char *typep;
|
||||
|
||||
for_each_node_by_name(np, "interrupt-controller") {
|
||||
typep = of_get_property(np, "compatible", NULL);
|
||||
if (strstr(typep, "open-pic")) {
|
||||
of_node_put(np);
|
||||
|
||||
printk(KERN_INFO "CPU Hotplug not supported on "
|
||||
"systems using MPIC\n");
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
rtas_stop_self_args.token = rtas_token("stop-self");
|
||||
qcss_tok = rtas_token("query-cpu-stopped-state");
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче