summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDale Rahn <drahn@cvs.openbsd.org>2005-02-01 15:41:25 +0000
committerDale Rahn <drahn@cvs.openbsd.org>2005-02-01 15:41:25 +0000
commit21c045b816dd3a61b8888854db6126834e078870 (patch)
treeff332b83f490f3121c6426d2df781f1608820170
parent1b0c2756f2ed59c98af0244f8e4bc953aa86d9d5 (diff)
enable writeback, with a workaround for the xscale pte updates.
-rw-r--r--sys/arch/arm/arm/pmap.c4
-rw-r--r--sys/arch/zaurus/conf/GENERIC6
-rw-r--r--sys/arch/zaurus/conf/RAMDISK6
3 files changed, 9 insertions, 7 deletions
diff --git a/sys/arch/arm/arm/pmap.c b/sys/arch/arm/arm/pmap.c
index f6fb03cd9bf..a102bc344c9 100644
--- a/sys/arch/arm/arm/pmap.c
+++ b/sys/arch/arm/arm/pmap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap.c,v 1.4 2004/12/30 23:40:08 drahn Exp $ */
+/* $OpenBSD: pmap.c,v 1.5 2005/02/01 15:41:24 drahn Exp $ */
/* $NetBSD: pmap.c,v 1.147 2004/01/18 13:03:50 scw Exp $ */
/*
@@ -4865,6 +4865,8 @@ pmap_pte_init_xscale(void)
__asm __volatile("mrc p15, 0, %0, c1, c0, 1" : "=r" (auxctl));
auxctl &= ~XSCALE_AUXCTL_P;
__asm __volatile("mcr p15, 0, %0, c1, c0, 1" : : "r" (auxctl));
+
+ pmap_needs_pte_sync = 1;
}
/*
diff --git a/sys/arch/zaurus/conf/GENERIC b/sys/arch/zaurus/conf/GENERIC
index 01a918fc9ec..cab5b8b7465 100644
--- a/sys/arch/zaurus/conf/GENERIC
+++ b/sys/arch/zaurus/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.25 2005/01/28 17:14:31 drahn Exp $
+# $OpenBSD: GENERIC,v 1.26 2005/02/01 15:41:24 drahn Exp $
#
# GENERIC machine description file
#
@@ -41,8 +41,8 @@ maxusers 32
# CPU options
options CPU_XSCALE_PXA2X0 # Support the XScale core
-options XSCALE_CACHE_WRITE_THROUGH
-#options XSCALE_CACHE_WRITE_BACK
+#options XSCALE_CACHE_WRITE_THROUGH
+options XSCALE_CACHE_WRITE_BACK
makeoptions CPUFLAGS="-mcpu=xscale"
option WSDISPLAY_COMPAT_USL # VT handling
diff --git a/sys/arch/zaurus/conf/RAMDISK b/sys/arch/zaurus/conf/RAMDISK
index 9ddf56b7633..15907531eb3 100644
--- a/sys/arch/zaurus/conf/RAMDISK
+++ b/sys/arch/zaurus/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.18 2005/01/26 06:34:53 uwe Exp $
+# $OpenBSD: RAMDISK,v 1.19 2005/02/01 15:41:24 drahn Exp $
#
# GENERIC machine description file
#
@@ -48,8 +48,8 @@ maxusers 32
# CPU options
options CPU_XSCALE_PXA2X0 # Support the XScale core
-options XSCALE_CACHE_WRITE_THROUGH
-#options XSCALE_CACHE_WRITE_BACK
+#options XSCALE_CACHE_WRITE_THROUGH
+options XSCALE_CACHE_WRITE_BACK
makeoptions CPUFLAGS="-mcpu=xscale"
#option WSDISPLAY_COMPAT_USL # VT handling