c3e8506c54
This splits off the kexec path bits of the xics_teardown_cpu() routine into its own xics_kexec_teardown_cpu() routine. With the previous combined routine the CPPR for a cpu that is being removed may have its CPPR reset in the plpar_eoi() call (which explicitly sets the CPPR to a non-zero value). Splitting of the kexec bits of the code prevents this from happening in the cpu remove path. Once again, this does not cause the cpu remove from the kernel to fail, but it does cause cpu dlpar operations to not be able to return the cpu to the hypervisor. Signed-off-by: Nathan Fontenot <nfont@austin.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
74 lines
2 KiB
C
74 lines
2 KiB
C
/*
|
|
* Copyright 2006 Michael Ellerman, IBM Corporation
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version
|
|
* 2 of the License, or (at your option) any later version.
|
|
*/
|
|
|
|
#include <asm/machdep.h>
|
|
#include <asm/page.h>
|
|
#include <asm/firmware.h>
|
|
#include <asm/kexec.h>
|
|
#include <asm/mpic.h>
|
|
#include <asm/smp.h>
|
|
|
|
#include "pseries.h"
|
|
#include "xics.h"
|
|
#include "plpar_wrappers.h"
|
|
|
|
static void pseries_kexec_cpu_down(int crash_shutdown, int secondary)
|
|
{
|
|
/* Don't risk a hypervisor call if we're crashing */
|
|
if (firmware_has_feature(FW_FEATURE_SPLPAR) && !crash_shutdown) {
|
|
unsigned long addr;
|
|
|
|
addr = __pa(get_slb_shadow());
|
|
if (unregister_slb_shadow(hard_smp_processor_id(), addr))
|
|
printk("SLB shadow buffer deregistration of "
|
|
"cpu %u (hw_cpu_id %d) failed\n",
|
|
smp_processor_id(),
|
|
hard_smp_processor_id());
|
|
|
|
addr = __pa(get_lppaca());
|
|
if (unregister_vpa(hard_smp_processor_id(), addr)) {
|
|
printk("VPA deregistration of cpu %u (hw_cpu_id %d) "
|
|
"failed\n", smp_processor_id(),
|
|
hard_smp_processor_id());
|
|
}
|
|
}
|
|
}
|
|
|
|
static void pseries_kexec_cpu_down_mpic(int crash_shutdown, int secondary)
|
|
{
|
|
pseries_kexec_cpu_down(crash_shutdown, secondary);
|
|
mpic_teardown_this_cpu(secondary);
|
|
}
|
|
|
|
void __init setup_kexec_cpu_down_mpic(void)
|
|
{
|
|
ppc_md.kexec_cpu_down = pseries_kexec_cpu_down_mpic;
|
|
}
|
|
|
|
static void pseries_kexec_cpu_down_xics(int crash_shutdown, int secondary)
|
|
{
|
|
pseries_kexec_cpu_down(crash_shutdown, secondary);
|
|
xics_kexec_teardown_cpu(secondary);
|
|
}
|
|
|
|
void __init setup_kexec_cpu_down_xics(void)
|
|
{
|
|
ppc_md.kexec_cpu_down = pseries_kexec_cpu_down_xics;
|
|
}
|
|
|
|
static int __init pseries_kexec_setup(void)
|
|
{
|
|
ppc_md.machine_kexec = default_machine_kexec;
|
|
ppc_md.machine_kexec_prepare = default_machine_kexec_prepare;
|
|
ppc_md.machine_crash_shutdown = default_machine_crash_shutdown;
|
|
|
|
return 0;
|
|
}
|
|
__initcall(pseries_kexec_setup);
|