diff options
author | Mark Rutland <mark.rutland@arm.com> | 2016-11-03 20:23:09 +0000 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2016-11-11 18:25:44 +0000 |
commit | 623b476fc815464a0241ea7483da7b3580b7d8ac (patch) | |
tree | 5bfda3f2e218b2dd884f28188def7ba73e8104ed /arch/arm64/include/asm/suspend.h | |
parent | 9bbd4c56b0b642f04396da378296e68096d5afca (diff) | |
download | linux-stable-623b476fc815464a0241ea7483da7b3580b7d8ac.tar.gz linux-stable-623b476fc815464a0241ea7483da7b3580b7d8ac.tar.bz2 linux-stable-623b476fc815464a0241ea7483da7b3580b7d8ac.zip |
arm64: move sp_el0 and tpidr_el1 into cpu_suspend_ctx
When returning from idle, we rely on the fact that thread_info lives at
the end of the kernel stack, and restore this by masking the saved stack
pointer. Subsequent patches will sever the relationship between the
stack and thread_info, and to cater for this we must save/restore sp_el0
explicitly, storing it in cpu_suspend_ctx.
As cpu_suspend_ctx must be doubleword aligned, this leaves us with an
extra slot in cpu_suspend_ctx. We can use this to save/restore tpidr_el1
in the same way, which simplifies the code, avoiding pointer chasing on
the restore path (as we no longer need to load thread_info::cpu followed
by the relevant slot in __per_cpu_offset based on this).
This patch stashes both registers in cpu_suspend_ctx.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Tested-by: Laura Abbott <labbott@redhat.com>
Cc: James Morse <james.morse@arm.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64/include/asm/suspend.h')
-rw-r--r-- | arch/arm64/include/asm/suspend.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/suspend.h b/arch/arm64/include/asm/suspend.h index b8a313fd7a09..de5600f40adf 100644 --- a/arch/arm64/include/asm/suspend.h +++ b/arch/arm64/include/asm/suspend.h @@ -1,7 +1,7 @@ #ifndef __ASM_SUSPEND_H #define __ASM_SUSPEND_H -#define NR_CTX_REGS 10 +#define NR_CTX_REGS 12 #define NR_CALLEE_SAVED_REGS 12 /* |