x86: Save registers in saved_context during suspend and hibernation
During hibernation and suspend on x86_64 save CPU registers in the saved_context structure rather than in a handful of separate variables. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
parent
ef685298b4
commit
0de80bcc2b
5 changed files with 125 additions and 105 deletions
|
|
@ -3,6 +3,9 @@
|
|||
* Based on code
|
||||
* Copyright 2001 Patrick Mochel <mochel@osdl.org>
|
||||
*/
|
||||
#ifndef __ASM_X86_64_SUSPEND_H
|
||||
#define __ASM_X86_64_SUSPEND_H
|
||||
|
||||
#include <asm/desc.h>
|
||||
#include <asm/i387.h>
|
||||
|
||||
|
|
@ -12,8 +15,9 @@ arch_prepare_suspend(void)
|
|||
return 0;
|
||||
}
|
||||
|
||||
/* Image of the saved processor state. If you touch this, fix acpi_wakeup.S. */
|
||||
/* Image of the saved processor state. If you touch this, fix acpi/wakeup.S. */
|
||||
struct saved_context {
|
||||
struct pt_regs regs;
|
||||
u16 ds, es, fs, gs, ss;
|
||||
unsigned long gs_base, gs_kernel_base, fs_base;
|
||||
unsigned long cr0, cr2, cr3, cr4, cr8;
|
||||
|
|
@ -29,29 +33,16 @@ struct saved_context {
|
|||
unsigned long tr;
|
||||
unsigned long safety;
|
||||
unsigned long return_address;
|
||||
unsigned long eflags;
|
||||
} __attribute__((packed));
|
||||
|
||||
/* We'll access these from assembly, so we'd better have them outside struct */
|
||||
extern unsigned long saved_context_eax, saved_context_ebx, saved_context_ecx, saved_context_edx;
|
||||
extern unsigned long saved_context_esp, saved_context_ebp, saved_context_esi, saved_context_edi;
|
||||
extern unsigned long saved_context_r08, saved_context_r09, saved_context_r10, saved_context_r11;
|
||||
extern unsigned long saved_context_r12, saved_context_r13, saved_context_r14, saved_context_r15;
|
||||
extern unsigned long saved_context_eflags;
|
||||
|
||||
#define loaddebug(thread,register) \
|
||||
set_debugreg((thread)->debugreg##register, register)
|
||||
|
||||
extern void fix_processor_context(void);
|
||||
|
||||
extern unsigned long saved_rip;
|
||||
extern unsigned long saved_rsp;
|
||||
extern unsigned long saved_rbp;
|
||||
extern unsigned long saved_rbx;
|
||||
extern unsigned long saved_rsi;
|
||||
extern unsigned long saved_rdi;
|
||||
|
||||
/* routines for saving/restoring kernel state */
|
||||
extern int acpi_save_state_mem(void);
|
||||
extern char core_restore_code;
|
||||
extern char restore_registers;
|
||||
|
||||
#endif /* __ASM_X86_64_SUSPEND_H */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue