Module Name: src
Committed By: riastradh
Date: Thu Jul 24 13:42:29 UTC 2014
Modified Files:
src/sys/arch/amd64/include: vmparam.h
src/sys/arch/i386/include: vmparam.h
src/sys/arch/x86/x86: x86_machdep.c
Log Message:
Add a FIRST1G page freelist to x86, for old graphics devices.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/amd64/include/vmparam.h
cvs rdiff -u -r1.80 -r1.81 src/sys/arch/i386/include/vmparam.h
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/x86/x86/x86_machdep.c
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/include/vmparam.h
diff -u src/sys/arch/amd64/include/vmparam.h:1.35 src/sys/arch/amd64/include/vmparam.h:1.36
--- src/sys/arch/amd64/include/vmparam.h:1.35 Thu Jun 12 19:02:35 2014
+++ src/sys/arch/amd64/include/vmparam.h Thu Jul 24 13:42:28 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.35 2014/06/12 19:02:35 riastradh Exp $ */
+/* $NetBSD: vmparam.h,v 1.36 2014/07/24 13:42:28 riastradh Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -157,12 +157,13 @@
#define VM_PHYSSEG_MAX 32 /* 1 "hole" + 31 free lists */
#define VM_PHYSSEG_STRAT VM_PSTRAT_BIGFIRST
-#define VM_NFREELIST 5
+#define VM_NFREELIST 6
#define VM_FREELIST_DEFAULT 0
#define VM_FREELIST_FIRST1T 1
#define VM_FREELIST_FIRST64G 2
#define VM_FREELIST_FIRST4G 3
-#define VM_FREELIST_FIRST16 4
+#define VM_FREELIST_FIRST1G 4
+#define VM_FREELIST_FIRST16 5
#else /* !__x86_64__ */
Index: src/sys/arch/i386/include/vmparam.h
diff -u src/sys/arch/i386/include/vmparam.h:1.80 src/sys/arch/i386/include/vmparam.h:1.81
--- src/sys/arch/i386/include/vmparam.h:1.80 Thu Jun 12 19:02:35 2014
+++ src/sys/arch/i386/include/vmparam.h Thu Jul 24 13:42:28 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.80 2014/06/12 19:02:35 riastradh Exp $ */
+/* $NetBSD: vmparam.h,v 1.81 2014/07/24 13:42:28 riastradh Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -135,8 +135,9 @@
#define VM_NFREELIST 1
#else
#define VM_PHYSSEG_MAX 32 /* 1 "hole" + 31 free lists */
-#define VM_NFREELIST 3
-#define VM_FREELIST_FIRST16 2
+#define VM_NFREELIST 4
+#define VM_FREELIST_FIRST16 3
+#define VM_FREELIST_FIRST1G 2
#define VM_FREELIST_FIRST4G 1
#endif /* XEN */
#define VM_FREELIST_DEFAULT 0
Index: src/sys/arch/x86/x86/x86_machdep.c
diff -u src/sys/arch/x86/x86/x86_machdep.c:1.65 src/sys/arch/x86/x86/x86_machdep.c:1.66
--- src/sys/arch/x86/x86/x86_machdep.c:1.65 Thu Jun 12 19:02:35 2014
+++ src/sys/arch/x86/x86/x86_machdep.c Thu Jul 24 13:42:28 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_machdep.c,v 1.65 2014/06/12 19:02:35 riastradh Exp $ */
+/* $NetBSD: x86_machdep.c,v 1.66 2014/07/24 13:42:28 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007 YAMAMOTO Takashi,
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.65 2014/06/12 19:02:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.66 2014/07/24 13:42:28 riastradh Exp $");
#include "opt_modular.h"
#include "opt_physmem.h"
@@ -703,7 +703,9 @@ static struct {
/* 32-bit addresses needed for PCI 32-bit DMA and old graphics. */
{ VM_FREELIST_FIRST4G, 4ULL * 1024 * 1024 * 1024 },
#endif
- /* 24-bit addresses needed for ISA DMA and ancient graphics. */
+ /* 30-bit addresses needed for ancient graphics. */
+ { VM_FREELIST_FIRST1G, 1ULL * 1024 * 1024 * 1024 },
+ /* 24-bit addresses needed for ISA DMA. */
{ VM_FREELIST_FIRST16, 16 * 1024 * 1024 },
};
