Commit 290130a1 authored by Will Deacon's avatar Will Deacon
Browse files

ARM: reset: implement soft_restart for jumping to a physical address



Tools such as kexec and CPU hotplug require a way to reset the processor
and branch to some code in physical space. This requires various bits of
jiggery pokery with the caches and MMU which, when it goes wrong, tends
to lock up the system.

This patch fleshes out the soft_restart implementation so that it
branches to the reset code using the identity mapping. This requires us
to change to a temporary stack, held within the kernel image as a static
array, to avoid conflicting with the new view of memory.
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 2d81f1fe
...@@ -92,17 +92,23 @@ static int __init hlt_setup(char *__unused) ...@@ -92,17 +92,23 @@ static int __init hlt_setup(char *__unused)
__setup("nohlt", nohlt_setup); __setup("nohlt", nohlt_setup);
__setup("hlt", hlt_setup); __setup("hlt", hlt_setup);
void soft_restart(unsigned long addr) extern void call_with_stack(void (*fn)(void *), void *arg, void *sp);
{ typedef void (*phys_reset_t)(unsigned long);
/* Disable interrupts first */
local_irq_disable();
local_fiq_disable();
/* /*
* Tell the mm system that we are going to reboot - * A temporary stack to use for CPU reset. This is static so that we
* we may need it to insert some 1:1 mappings so that * don't clobber it with the identity mapping. When running with this
* soft boot works. * stack, any references to the current task *will not work* so you
* should really do as little as possible before jumping to your reset
* code.
*/ */
static u64 soft_restart_stack[16];
static void __soft_restart(void *addr)
{
phys_reset_t phys_reset;
/* Take out a flat memory mapping. */
setup_mm_for_reboot(); setup_mm_for_reboot();
/* Clean and invalidate caches */ /* Clean and invalidate caches */
...@@ -114,7 +120,31 @@ void soft_restart(unsigned long addr) ...@@ -114,7 +120,31 @@ void soft_restart(unsigned long addr)
/* Push out any further dirty data, and ensure cache is empty */ /* Push out any further dirty data, and ensure cache is empty */
flush_cache_all(); flush_cache_all();
cpu_reset(addr); /* Switch to the identity mapping. */
phys_reset = (phys_reset_t)(unsigned long)virt_to_phys(cpu_reset);
phys_reset((unsigned long)addr);
/* Should never get here. */
BUG();
}
void soft_restart(unsigned long addr)
{
u64 *stack = soft_restart_stack + ARRAY_SIZE(soft_restart_stack);
/* Disable interrupts first */
local_irq_disable();
local_fiq_disable();
/* Disable the L2 if we're the last man standing. */
if (num_online_cpus() == 1)
outer_disable();
/* Change to the new stack and continue with the reset. */
call_with_stack(__soft_restart, (void *)addr, (void *)stack);
/* Should never get here. */
BUG();
} }
void arm_machine_restart(char mode, const char *cmd) void arm_machine_restart(char mode, const char *cmd)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment