UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

powerpc/85xx: Implement 64-bit kexec support 

Unlike 32-bit 85xx kexec, we don't do a core reset.

Signed-off-by: Tiejun Chen <tiejun.chen@windriver.com>
[scottwood: edit changelog, and cleanup]
Signed-off-by: Scott Wood <scottwood@freescale.com>
This commit is contained in:
Tiejun Chen 2015-10-06 22:48:11 -05:00 committed by Scott Wood
parent eba5de8dc1
commit 939fbf0080
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/powerpc/platforms/85xx/smp.c
View File

@ -351,6 +351,7 @@ struct smp_ops_t smp_85xx_ops = {
}; };
#ifdef CONFIG_KEXEC #ifdef CONFIG_KEXEC
#ifdef CONFIG_PPC32
atomic_t kexec_down_cpus = ATOMIC_INIT(0); atomic_t kexec_down_cpus = ATOMIC_INIT(0);
void mpc85xx_smp_kexec_cpu_down(int crash_shutdown, int secondary) void mpc85xx_smp_kexec_cpu_down(int crash_shutdown, int secondary)
@ -370,9 +371,18 @@ static void mpc85xx_smp_kexec_down(void *arg)
if (ppc_md.kexec_cpu_down) if (ppc_md.kexec_cpu_down)
ppc_md.kexec_cpu_down(0,1); ppc_md.kexec_cpu_down(0,1);
} }
#else
void mpc85xx_smp_kexec_cpu_down(int crash_shutdown, int secondary)
{
local_irq_disable();
hard_irq_disable();
mpic_teardown_this_cpu(secondary);
}
#endif
static void mpc85xx_smp_machine_kexec(struct kimage *image) static void mpc85xx_smp_machine_kexec(struct kimage *image)
{ {
#ifdef CONFIG_PPC32
int timeout = INT_MAX; int timeout = INT_MAX;
int i, num_cpus = num_present_cpus(); int i, num_cpus = num_present_cpus();
@ -393,6 +403,7 @@ static void mpc85xx_smp_machine_kexec(struct kimage *image)
if ( i == smp_processor_id() ) continue; if ( i == smp_processor_id() ) continue;
mpic_reset_core(i); mpic_reset_core(i);
} }
#endif
default_machine_kexec(image); default_machine_kexec(image);
} }