diff options
| author | Mike Larkin <mlarkin@cvs.openbsd.org> | 2014-11-22 20:09:37 +0000 |
|---|---|---|
| committer | Mike Larkin <mlarkin@cvs.openbsd.org> | 2014-11-22 20:09:37 +0000 |
| commit | 5e8ebc0ba26080ec34ce02341b986fa6f944a2cc (patch) | |
| tree | a83925e9800b4f121857a5ffec7447408ab72ea9 /sys | |
| parent | 83e4350010e6362f69caeb86aa2d9f83a722cca0 (diff) | |
Previous diff changed the location of the ACPI S3/S4 trampoline, which has
a common #defined location for both i386 and amd64. This diff fixes i386 to
match.
Also fix a tab/space issue in amd64 hibernate_var.h
discussed with deraadt
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amd64/include/hibernate_var.h | 4 | ||||
| -rw-r--r-- | sys/arch/i386/i386/acpi_wakecode.S | 6 | ||||
| -rw-r--r-- | sys/arch/i386/include/hibernate_var.h | 12 |
3 files changed, 11 insertions, 11 deletions
diff --git a/sys/arch/amd64/include/hibernate_var.h b/sys/arch/amd64/include/hibernate_var.h index 83943b7fc4b..103cccd3354 100644 --- a/sys/arch/amd64/include/hibernate_var.h +++ b/sys/arch/amd64/include/hibernate_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: hibernate_var.h,v 1.10 2014/11/22 18:31:46 mlarkin Exp $ */ +/* $OpenBSD: hibernate_var.h,v 1.11 2014/11/22 20:09:36 mlarkin Exp $ */ /* * Copyright (c) 2011 Mike Larkin <mlarkin@openbsd.org> @@ -53,7 +53,7 @@ #define HIBERNATE_INFLATE_PAGE (PAGE_SIZE * 32) /* HIBERNATE_HIBALLOC_PAGE must be the last stolen page (see machdep.c) */ -#define HIBERNATE_HIBALLOC_PAGE (PAGE_SIZE * 33) +#define HIBERNATE_HIBALLOC_PAGE (PAGE_SIZE * 33) /* Use 4MB hibernation chunks */ #define HIBERNATE_CHUNK_SIZE 0x400000 diff --git a/sys/arch/i386/i386/acpi_wakecode.S b/sys/arch/i386/i386/acpi_wakecode.S index ee8634d090a..129a76c209b 100644 --- a/sys/arch/i386/i386/acpi_wakecode.S +++ b/sys/arch/i386/i386/acpi_wakecode.S @@ -70,7 +70,7 @@ * * We wakeup in real mode, at some phys addr based on the ACPI * specification (cs = phys>>8, ip = phys & 0xF). For example, - * if our phys addr is 0x11000, we'd have cs=0x1100,ip=0 + * if our phys addr is 0x13000, we'd have cs=0x1300,ip=0 * * The wakeup code needs to do the following: * 1. Reenable the video display @@ -329,7 +329,7 @@ _ACPI_TRMP_LABEL(hibernate_resume_vector_3) movl %eax, %cr3 /* Set up real mode segment selectors */ - movw $0x1100, %ax + movw $0x1300, %ax movw %ax, %ds movw %ax, %es movw %ax, %fs @@ -338,7 +338,7 @@ _ACPI_TRMP_LABEL(hibernate_resume_vector_3) lidtl clean_idt /* Jump to the S3 resume vector */ - ljmp $0x1100, $acpi_s3_vector_real + ljmp $0x1300, $acpi_s3_vector_real .code32 /* Switch to hibernate resume pagetable */ diff --git a/sys/arch/i386/include/hibernate_var.h b/sys/arch/i386/include/hibernate_var.h index df8839de34b..6dc69e280c4 100644 --- a/sys/arch/i386/include/hibernate_var.h +++ b/sys/arch/i386/include/hibernate_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: hibernate_var.h,v 1.10 2014/10/01 19:41:06 mlarkin Exp $ */ +/* $OpenBSD: hibernate_var.h,v 1.11 2014/11/22 20:09:36 mlarkin Exp $ */ /* * Copyright (c) 2011 Mike Larkin <mlarkin@openbsd.org> @@ -18,13 +18,13 @@ #define PIGLET_PAGE_MASK (PD_MASK) -#define HIBERNATE_PD_PAGE (PAGE_SIZE * 18) -#define HIBERNATE_PT_PAGE (PAGE_SIZE * 19) +#define HIBERNATE_PD_PAGE (PAGE_SIZE * 20) +#define HIBERNATE_PT_PAGE (PAGE_SIZE * 21) /* 2 pages for stack */ -#define HIBERNATE_STACK_PAGE (PAGE_SIZE * 21) -#define HIBERNATE_INFLATE_PAGE (PAGE_SIZE * 22) +#define HIBERNATE_STACK_PAGE (PAGE_SIZE * 23) +#define HIBERNATE_INFLATE_PAGE (PAGE_SIZE * 24) /* HIBERNATE_HIBALLOC_PAGE must be the last stolen page (see machdep.c) */ -#define HIBERNATE_HIBALLOC_PAGE (PAGE_SIZE * 23) +#define HIBERNATE_HIBALLOC_PAGE (PAGE_SIZE * 25) /* Use 4MB hibernation chunks */ #define HIBERNATE_CHUNK_SIZE 0x400000 |