hotplug/rtas: Disable rtas_event_scan during device-tree property updates after migration to reduce conflicts with changes propagated to other parts of the kernel configuration, such as CPUs or memory.
Signed-off-by: Michael Bringmann <m...@linux.vnet.ibm.com> --- arch/powerpc/platforms/pseries/hotplug-cpu.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c index df1791b..09633de 100644 --- a/arch/powerpc/platforms/pseries/hotplug-cpu.c +++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c @@ -685,14 +685,18 @@ static int dlpar_cpu_readd_by_index(u32 drc_index) pr_info("Attempting to re-add CPU, drc index %x\n", drc_index); + rtas_event_scan_disable(); arch_update_cpu_topology_suspend(); rc = dlpar_cpu_remove_by_index(drc_index, false); arch_update_cpu_topology_resume(); + rtas_event_scan_enable(); if (!rc) { + rtas_event_scan_disable(); arch_update_cpu_topology_suspend(); rc = dlpar_cpu_add(drc_index, false); arch_update_cpu_topology_resume(); + rtas_event_scan_enable(); } if (rc)