Module Name: src
Committed By: snj
Date: Thu Mar 26 17:28:48 UTC 2009
Modified Files:
src/sys/arch/atari/atari [netbsd-5]: atari_init.c pmap_bootstrap.c
src/sys/arch/atari/include [netbsd-5]: pmap.h vmparam.h
Log Message:
Pull up following revision(s) (requested by abs in ticket #612):
sys/arch/atari/atari/pmap_bootstrap.c: revision 1.3
sys/arch/atari/atari/atari_init.c: revision 1.76
sys/arch/atari/include/pmap.h: revision 1.40
sys/arch/atari/include/vmparam.h: revision 1.24
Use separate free lists for TT and ST ram, and give TT a lower id
so all TT ram will be used before any ST ram. (free_list param to
uvm_page_physload())
Tested on a TT with and without TT ram.
To generate a diff of this commit:
cvs rdiff -u -r1.67.54.3 -r1.67.54.4 src/sys/arch/atari/atari/atari_init.c
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/arch/atari/atari/pmap_bootstrap.c
cvs rdiff -u -r1.36.20.2 -r1.36.20.3 src/sys/arch/atari/include/pmap.h
cvs rdiff -u -r1.21.88.1 -r1.21.88.2 src/sys/arch/atari/include/vmparam.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/atari/atari/atari_init.c
diff -u src/sys/arch/atari/atari/atari_init.c:1.67.54.3 src/sys/arch/atari/atari/atari_init.c:1.67.54.4
--- src/sys/arch/atari/atari/atari_init.c:1.67.54.3 Thu Jan 8 22:47:06 2009
+++ src/sys/arch/atari/atari/atari_init.c Thu Mar 26 17:28:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: atari_init.c,v 1.67.54.3 2009/01/08 22:47:06 snj Exp $ */
+/* $NetBSD: atari_init.c,v 1.67.54.4 2009/03/26 17:28:47 snj Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atari_init.c,v 1.67.54.3 2009/01/08 22:47:06 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atari_init.c,v 1.67.54.4 2009/03/26 17:28:47 snj Exp $");
#include "opt_ddb.h"
#include "opt_mbtype.h"
@@ -475,8 +475,10 @@
*/
usable_segs[0].start = 0;
usable_segs[0].end = stphysize;
+ usable_segs[0].free_list = VM_FREELIST_STRAM;
usable_segs[1].start = ttphystart;
usable_segs[1].end = ttphystart + ttphysize;
+ usable_segs[1].free_list = VM_FREELIST_TTRAM;
usable_segs[2].start = usable_segs[2].end = 0; /* End of segments! */
if(kbase) {
Index: src/sys/arch/atari/atari/pmap_bootstrap.c
diff -u src/sys/arch/atari/atari/pmap_bootstrap.c:1.1.2.2 src/sys/arch/atari/atari/pmap_bootstrap.c:1.1.2.3
--- src/sys/arch/atari/atari/pmap_bootstrap.c:1.1.2.2 Thu Jan 8 22:45:30 2009
+++ src/sys/arch/atari/atari/pmap_bootstrap.c Thu Mar 26 17:28:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_bootstrap.c,v 1.1.2.2 2009/01/08 22:45:30 snj Exp $ */
+/* $NetBSD: pmap_bootstrap.c,v 1.1.2.3 2009/03/26 17:28:47 snj Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -150,7 +150,7 @@
atop(usable_segs[i].end),
atop(usable_segs[i].start),
atop(usable_segs[i].end),
- VM_FREELIST_DEFAULT);
+ usable_segs[i].free_list);
avail_start = usable_segs[0].start;
avail_end = usable_segs[i - 1].end;
Index: src/sys/arch/atari/include/pmap.h
diff -u src/sys/arch/atari/include/pmap.h:1.36.20.2 src/sys/arch/atari/include/pmap.h:1.36.20.3
--- src/sys/arch/atari/include/pmap.h:1.36.20.2 Thu Jan 8 22:45:30 2009
+++ src/sys/arch/atari/include/pmap.h Thu Mar 26 17:28:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.36.20.2 2009/01/08 22:45:30 snj Exp $ */
+/* $NetBSD: pmap.h,v 1.36.20.3 2009/03/26 17:28:47 snj Exp $ */
/*
* Copyright (c) 1991 Regents of the University of California.
@@ -88,6 +88,7 @@
paddr_t start; /* PA of first page in segment */
paddr_t end; /* PA of last page in segment */
int first_page; /* relative page# of 'start' */
+ int free_list; /* Memory priority, lower = faster */
};
#ifdef _KERNEL
Index: src/sys/arch/atari/include/vmparam.h
diff -u src/sys/arch/atari/include/vmparam.h:1.21.88.1 src/sys/arch/atari/include/vmparam.h:1.21.88.2
--- src/sys/arch/atari/include/vmparam.h:1.21.88.1 Thu Jan 8 22:45:30 2009
+++ src/sys/arch/atari/include/vmparam.h Thu Mar 26 17:28:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.21.88.1 2009/01/08 22:45:30 snj Exp $ */
+/* $NetBSD: vmparam.h,v 1.21.88.2 2009/03/26 17:28:47 snj Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -166,8 +166,10 @@
#define VM_PHYSSEG_STRAT VM_PSTRAT_RANDOM
#define VM_PHYSSEG_NOADD
-#define VM_NFREELIST 1
+#define VM_NFREELIST 2
#define VM_FREELIST_DEFAULT 0
+#define VM_FREELIST_TTRAM VM_FREELIST_DEFAULT
+#define VM_FREELIST_STRAM 1
#define __HAVE_PMAP_PHYSSEG
