Module Name: src
Committed By: riz
Date: Fri Apr 20 23:32:15 UTC 2012
Modified Files:
src/sys/arch/amd64/acpi [netbsd-6]: acpi_wakecode.S
src/sys/arch/amd64/amd64 [netbsd-6]: locore.S mptramp.S
src/sys/arch/i386/acpi [netbsd-6]: acpi_wakecode.S
src/sys/arch/i386/i386 [netbsd-6]: locore.S mptramp.S
src/sys/arch/x86/include [netbsd-6]: psl.h
Log Message:
Pull up following revision(s) (requested by jym in ticket #189):
sys/arch/x86/include/psl.h: revision 1.7
sys/arch/i386/i386/locore.S: revision 1.98
sys/arch/amd64/acpi/acpi_wakecode.S: revision 1.11
sys/arch/amd64/amd64/mptramp.S: revision 1.13
sys/arch/i386/acpi/acpi_wakecode.S: revision 1.15
sys/arch/i386/i386/mptramp.S: revision 1.23
sys/arch/amd64/amd64/locore.S: revision 1.68
Set the CR0_AM bit so processes can enable alignment check errors under
x86 through PSL_AC bit.
ATF test incoming shortly.
PSL_AC is user-settable.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.18.1 src/sys/arch/amd64/acpi/acpi_wakecode.S
cvs rdiff -u -r1.66 -r1.66.2.1 src/sys/arch/amd64/amd64/locore.S
cvs rdiff -u -r1.12 -r1.12.14.1 src/sys/arch/amd64/amd64/mptramp.S
cvs rdiff -u -r1.14 -r1.14.18.1 src/sys/arch/i386/acpi/acpi_wakecode.S
cvs rdiff -u -r1.95.10.1 -r1.95.10.2 src/sys/arch/i386/i386/locore.S
cvs rdiff -u -r1.22 -r1.22.14.1 src/sys/arch/i386/i386/mptramp.S
cvs rdiff -u -r1.6 -r1.6.34.1 src/sys/arch/x86/include/psl.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/acpi/acpi_wakecode.S
diff -u src/sys/arch/amd64/acpi/acpi_wakecode.S:1.10 src/sys/arch/amd64/acpi/acpi_wakecode.S:1.10.18.1
--- src/sys/arch/amd64/acpi/acpi_wakecode.S:1.10 Mon Aug 24 22:06:50 2009
+++ src/sys/arch/amd64/acpi/acpi_wakecode.S Fri Apr 20 23:32:14 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_wakecode.S,v 1.10 2009/08/24 22:06:50 jmcneill Exp $ */
+/* $NetBSD: acpi_wakecode.S,v 1.10.18.1 2012/04/20 23:32:14 riz Exp $ */
/*-
* Copyright (c) 2007 Joerg Sonnenberger <[email protected]>
@@ -198,7 +198,7 @@ wakeup_32:
/* Enable paging */
movl %cr0,%eax
- orl $(CR0_PE|CR0_PG|CR0_NE|CR0_TS|CR0_MP|CR0_WP),%eax
+ orl $(CR0_PE|CR0_PG|CR0_NE|CR0_TS|CR0_MP|CR0_WP|CR0_AM),%eax
movl %eax,%cr0
/* Flush prefetch queue */
jmp 1f
Index: src/sys/arch/amd64/amd64/locore.S
diff -u src/sys/arch/amd64/amd64/locore.S:1.66 src/sys/arch/amd64/amd64/locore.S:1.66.2.1
--- src/sys/arch/amd64/amd64/locore.S:1.66 Sun Dec 4 16:24:13 2011
+++ src/sys/arch/amd64/amd64/locore.S Fri Apr 20 23:32:14 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.66 2011/12/04 16:24:13 chs Exp $ */
+/* $NetBSD: locore.S,v 1.66.2.1 2012/04/20 23:32:14 riz Exp $ */
/*
* Copyright-o-rama!
@@ -626,7 +626,7 @@ start: movw $0x1234,0x472 # warm boot
* 4. Enable paging and the rest of it.
*/
movl %cr0,%eax
- orl $(CR0_PE|CR0_PG|CR0_NE|CR0_TS|CR0_MP|CR0_WP),%eax
+ orl $(CR0_PE|CR0_PG|CR0_NE|CR0_TS|CR0_MP|CR0_WP|CR0_AM),%eax
movl %eax,%cr0
jmp compat
compat:
Index: src/sys/arch/amd64/amd64/mptramp.S
diff -u src/sys/arch/amd64/amd64/mptramp.S:1.12 src/sys/arch/amd64/amd64/mptramp.S:1.12.14.1
--- src/sys/arch/amd64/amd64/mptramp.S:1.12 Tue Apr 20 15:42:21 2010
+++ src/sys/arch/amd64/amd64/mptramp.S Fri Apr 20 23:32:14 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mptramp.S,v 1.12 2010/04/20 15:42:21 jym Exp $ */
+/* $NetBSD: mptramp.S,v 1.12.14.1 2012/04/20 23:32:14 riz Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -173,7 +173,7 @@ _TRMP_LABEL(mp_startup)
movl %ecx,%cr3 # load ptd addr into mmu
movl %cr0,%eax # get control word
- orl $(CR0_PE|CR0_PG|CR0_NE|CR0_TS|CR0_MP|CR0_WP),%eax
+ orl $(CR0_PE|CR0_PG|CR0_NE|CR0_TS|CR0_MP|CR0_WP|CR0_AM),%eax
movl %eax,%cr0
jmp mptramp_compat
mptramp_compat:
Index: src/sys/arch/i386/acpi/acpi_wakecode.S
diff -u src/sys/arch/i386/acpi/acpi_wakecode.S:1.14 src/sys/arch/i386/acpi/acpi_wakecode.S:1.14.18.1
--- src/sys/arch/i386/acpi/acpi_wakecode.S:1.14 Mon Aug 24 10:16:12 2009
+++ src/sys/arch/i386/acpi/acpi_wakecode.S Fri Apr 20 23:32:15 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_wakecode.S,v 1.14 2009/08/24 10:16:12 jmcneill Exp $ */
+/* $NetBSD: acpi_wakecode.S,v 1.14.18.1 2012/04/20 23:32:15 riz Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -165,7 +165,7 @@ wakeup_32:
movl WAKEUP_r_cr3 + ACPI_WAKEUP_ADDR,%eax
movl %eax,%cr3
movl %cr0,%eax
- orl $(CR0_PE|CR0_PG|CR0_NE|CR0_TS|CR0_EM|CR0_MP|CR0_WP),%eax
+ orl $(CR0_PE|CR0_PG|CR0_NE|CR0_TS|CR0_EM|CR0_MP|CR0_WP|CR0_AM),%eax
movl %eax,%cr0
/* Flush the prefetch queue */
Index: src/sys/arch/i386/i386/locore.S
diff -u src/sys/arch/i386/i386/locore.S:1.95.10.1 src/sys/arch/i386/i386/locore.S:1.95.10.2
--- src/sys/arch/i386/i386/locore.S:1.95.10.1 Mon Mar 5 20:18:01 2012
+++ src/sys/arch/i386/i386/locore.S Fri Apr 20 23:32:14 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.95.10.1 2012/03/05 20:18:01 sborrill Exp $ */
+/* $NetBSD: locore.S,v 1.95.10.2 2012/04/20 23:32:14 riz Exp $ */
/*
* Copyright-o-rama!
@@ -129,7 +129,7 @@
*/
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.95.10.1 2012/03/05 20:18:01 sborrill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.95.10.2 2012/04/20 23:32:14 riz Exp $");
#include "opt_compat_oldboot.h"
#include "opt_ddb.h"
@@ -677,7 +677,7 @@ try586: /* Use the `cpuid' instruction.
*/
movl %cr0,%eax # get control word
# enable paging & NPX emulation
- orl $(CR0_PE|CR0_PG|CR0_NE|CR0_TS|CR0_EM|CR0_MP),%eax
+ orl $(CR0_PE|CR0_PG|CR0_NE|CR0_TS|CR0_EM|CR0_MP|CR0_AM),%eax
movl %eax,%cr0 # and page NOW!
pushl $begin # jump to high mem
Index: src/sys/arch/i386/i386/mptramp.S
diff -u src/sys/arch/i386/i386/mptramp.S:1.22 src/sys/arch/i386/i386/mptramp.S:1.22.14.1
--- src/sys/arch/i386/i386/mptramp.S:1.22 Wed Jul 28 17:05:51 2010
+++ src/sys/arch/i386/i386/mptramp.S Fri Apr 20 23:32:14 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mptramp.S,v 1.22 2010/07/28 17:05:51 jym Exp $ */
+/* $NetBSD: mptramp.S,v 1.22.14.1 2012/04/20 23:32:14 riz Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
*/
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: mptramp.S,v 1.22 2010/07/28 17:05:51 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mptramp.S,v 1.22.14.1 2012/04/20 23:32:14 riz Exp $");
#include "opt_mpbios.h" /* for MPDEBUG */
@@ -174,7 +174,7 @@ _TRMP_LABEL(mp_startup)
movl %ecx,%cr3 # load ptd addr into mmu
movl %cr0,%eax # get control word
# enable paging & NPX emulation
- orl $(CR0_PE|CR0_PG|CR0_NE|CR0_TS|CR0_EM|CR0_MP|CR0_WP),%eax
+ orl $(CR0_PE|CR0_PG|CR0_NE|CR0_TS|CR0_EM|CR0_MP|CR0_WP|CR0_AM),%eax
movl %eax,%cr0 # and page NOW!
#ifdef MPDEBUG
Index: src/sys/arch/x86/include/psl.h
diff -u src/sys/arch/x86/include/psl.h:1.6 src/sys/arch/x86/include/psl.h:1.6.34.1
--- src/sys/arch/x86/include/psl.h:1.6 Thu Sep 18 21:09:18 2008
+++ src/sys/arch/x86/include/psl.h Fri Apr 20 23:32:14 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: psl.h,v 1.6 2008/09/18 21:09:18 dsl Exp $ */
+/* $NetBSD: psl.h,v 1.6.34.1 2012/04/20 23:32:14 riz Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -71,7 +71,7 @@
#define PSL_USERSTATIC (PSL_MBO | PSL_MBZ | PSL_I | PSL_IOPL | PSL_NT | PSL_VM | PSL_VIF | PSL_VIP)
#endif
#define PSL_USER (PSL_C | PSL_PF | PSL_AF | PSL_Z | PSL_N | \
- PSL_T | PSL_V | PSL_D)
+ PSL_T | PSL_V | PSL_D | PSL_AC)
#define PSL_CLEARSIG (PSL_T | PSL_VM | PSL_AC | PSL_D)
