Skip to contentSkip to conversation

powerpc/pseries: Don't try to register pseries cpu hotplug on non-pseries

PATCH In review Benjamin Herrenschmidt 2 participants 3 messages Dec 10, 2013 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc/pseries: Don't try to register pseries cpu hotplug on non-pseries

This results in oddball messages at boot on other platforms telling us that CPU hotplug isn't supported even when it is.

---
 arch/powerpc/platforms/pseries/hotplug-cpu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/platforms/pseries/hotplug-cpu.c +1 -1
index a8ef932..171b0c7 100644
@@ -420,4 +420,4 @@ static int __init pseries_cpu_hotplug_init(void)
 
 	return 0;
 }
-arch_initcall(pseries_cpu_hotplug_init);
+machine_arch_initcall(pseries, pseries_cpu_hotplug_init);
#1 lore raw
Quoted 2 lines · Benjamin Herrenschmidt

This results in oddball messages at boot on other platforms telling us that CPU hotplug isn't supported even when it is.

We have a bunch more. Most are probably safe because they rely on the device tree but we should probably convert them anyway?

$ git grep initcall arch/powerpc/platforms/pseries/ | grep -v machine_
arch/powerpc/platforms/pseries/dtl.c:arch_initcall(dtl_init);
arch/powerpc/platforms/pseries/eeh_pseries.c:early_initcall(eeh_pseries_init);
arch/powerpc/platforms/pseries/hotplug-cpu.c:arch_initcall(pseries_cpu_hotplug_init);
arch/powerpc/platforms/pseries/hvCall_inst.c:__initcall(hcall_inst_init);
arch/powerpc/platforms/pseries/mobility.c:device_initcall(mobility_sysfs_init);
arch/powerpc/platforms/pseries/msi.c:arch_initcall(rtas_msi_init);
arch/powerpc/platforms/pseries/power.c:core_initcall(pm_init);
arch/powerpc/platforms/pseries/power.c:__initcall(apo_pm_init);
arch/powerpc/platforms/pseries/ras.c:subsys_initcall(init_ras_IRQ);
arch/powerpc/platforms/pseries/reconfig.c:__initcall(proc_ppc64_create_ofdt);
arch/powerpc/platforms/pseries/rng.c:subsys_initcall(rng_init);
arch/powerpc/platforms/pseries/setup.c:early_initcall(alloc_dispatch_log_kmem_cache);
arch/powerpc/platforms/pseries/suspend.c:__initcall(pseries_suspend_init);

cheers

#2 lore raw
Quoted 6 lines · Michael Ellerman
Quoted 2 lines · Benjamin Herrenschmidt

This results in oddball messages at boot on other platforms telling us that CPU hotplug isn't supported even when it is.

We have a bunch more. Most are probably safe because they rely on the device tree but we should probably convert them anyway?

Possibly :-) This one I spotted specifically because I was looking at a boot log on powernv and it was insulting me !

Quoted 17 lines
$ git grep initcall arch/powerpc/platforms/pseries/ | grep -v machine_
arch/powerpc/platforms/pseries/dtl.c:arch_initcall(dtl_init);
arch/powerpc/platforms/pseries/eeh_pseries.c:early_initcall(eeh_pseries_init);
arch/powerpc/platforms/pseries/hotplug-cpu.c:arch_initcall(pseries_cpu_hotplug_init);
arch/powerpc/platforms/pseries/hvCall_inst.c:__initcall(hcall_inst_init);
arch/powerpc/platforms/pseries/mobility.c:device_initcall(mobility_sysfs_init);
arch/powerpc/platforms/pseries/msi.c:arch_initcall(rtas_msi_init);
arch/powerpc/platforms/pseries/power.c:core_initcall(pm_init);
arch/powerpc/platforms/pseries/power.c:__initcall(apo_pm_init);
arch/powerpc/platforms/pseries/ras.c:subsys_initcall(init_ras_IRQ);
arch/powerpc/platforms/pseries/reconfig.c:__initcall(proc_ppc64_create_ofdt);
arch/powerpc/platforms/pseries/rng.c:subsys_initcall(rng_init);
arch/powerpc/platforms/pseries/setup.c:early_initcall(alloc_dispatch_log_kmem_cache);
arch/powerpc/platforms/pseries/suspend.c:__initcall(pseries_suspend_init);

cheers