e44b7b7525
Move wakeup code to .c, so that video mode setting code can be shared between boot and wakeup. Remove nasty assembly code in 64-bit case by re-using trampoline code. Stack setup was fixed to clear high 16bits of %esp, maybe that fixes some machines. .c code sharing and morse code was done H. Peter Anvin, Sam Ravnborg reviewed kbuild related stuff, and it seems okay to him. Rafael did some cleanups. [rjw: * Made the patch stop breaking compilation on x86-32 * Added arch/x86/kernel/acpi/sleep.h * Got rid of compiler warnings in arch/x86/kernel/acpi/sleep.c * Fixed 32-bit compilation on x86-64 systems * Added include/asm-x86/trampoline.h and fixed the non-SMP compilation on 64-bit x86 * Removed arch/x86/kernel/acpi/sleep_32.c which was not used * Fixed some breakage caused by the integration of smpboot.c done under us in the meantime] Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: H. Peter Anvin <hpa@zytor.com> Reviewed-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Ingo Molnar <mingo@elte.hu>
37 lines
1.0 KiB
C
37 lines
1.0 KiB
C
/*
|
|
* Definitions for the wakeup data structure at the head of the
|
|
* wakeup code.
|
|
*/
|
|
|
|
#ifndef ARCH_X86_KERNEL_ACPI_RM_WAKEUP_H
|
|
#define ARCH_X86_KERNEL_ACPI_RM_WAKEUP_H
|
|
|
|
#ifndef __ASSEMBLY__
|
|
#include <linux/types.h>
|
|
|
|
/* This must match data at wakeup.S */
|
|
struct wakeup_header {
|
|
u16 video_mode; /* Video mode number */
|
|
u16 _jmp1; /* ljmpl opcode, 32-bit only */
|
|
u32 pmode_entry; /* Protected mode resume point, 32-bit only */
|
|
u16 _jmp2; /* CS value, 32-bit only */
|
|
u32 pmode_cr0; /* Protected mode cr0 */
|
|
u32 pmode_cr3; /* Protected mode cr3 */
|
|
u32 pmode_cr4; /* Protected mode cr4 */
|
|
u32 pmode_efer_low; /* Protected mode EFER */
|
|
u32 pmode_efer_high;
|
|
u64 pmode_gdt;
|
|
u32 realmode_flags;
|
|
u32 real_magic;
|
|
u16 trampoline_segment; /* segment with trampoline code, 64-bit only */
|
|
u32 signature; /* To check we have correct structure */
|
|
} __attribute__((__packed__));
|
|
|
|
extern struct wakeup_header wakeup_header;
|
|
#endif
|
|
|
|
#define HEADER_OFFSET 0x3f00
|
|
#define WAKEUP_SIZE 0x4000
|
|
|
|
#endif /* ARCH_X86_KERNEL_ACPI_RM_WAKEUP_H */
|