summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/arch/arm/arm/cpufunc_asm_sa1.S13
-rw-r--r--sys/arch/arm/arm/cpufunc_asm_xscale.S30
-rw-r--r--sys/arch/armish/conf/GENERIC3
-rw-r--r--sys/arch/armish/conf/RAMDISK3
-rw-r--r--sys/arch/beagle/conf/GENERIC4
-rw-r--r--sys/arch/beagle/conf/RAMDISK4
-rw-r--r--sys/arch/gumstix/conf/GENERIC4
-rw-r--r--sys/arch/gumstix/conf/RAMDISK4
-rw-r--r--sys/arch/palm/conf/GENERIC4
-rw-r--r--sys/arch/palm/conf/RAMDISK4
-rw-r--r--sys/arch/zaurus/conf/GENERIC4
-rw-r--r--sys/arch/zaurus/conf/RAMDISK4
12 files changed, 15 insertions, 66 deletions
diff --git a/sys/arch/arm/arm/cpufunc_asm_sa1.S b/sys/arch/arm/arm/cpufunc_asm_sa1.S
index e58ee067827..f198b2f1a74 100644
--- a/sys/arch/arm/arm/cpufunc_asm_sa1.S
+++ b/sys/arch/arm/arm/cpufunc_asm_sa1.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpufunc_asm_sa1.S,v 1.2 2004/08/04 20:20:18 miod Exp $ */
+/* $OpenBSD: cpufunc_asm_sa1.S,v 1.3 2011/09/20 22:11:40 miod Exp $ */
/* $NetBSD: cpufunc_asm_sa1.S,v 1.8 2002/08/17 16:36:32 thorpej Exp $ */
/*
@@ -46,11 +46,10 @@
* addresses that are about to change.
*/
ENTRY(sa1_setttb)
-#ifdef CACHE_CLEAN_BLOCK_INTR
mrs r3, cpsr_all
orr r1, r3, #(I32_bit | F32_bit)
msr cpsr_all, r1
-#endif
+
stmfd sp!, {r0-r3, lr}
bl _C_LABEL(sa1_cache_cleanID)
ldmfd sp!, {r0-r3, lr}
@@ -69,9 +68,8 @@ ENTRY(sa1_setttb)
/* Make sure that pipeline is emptied */
mov r0, r0
mov r0, r0
-#ifdef CACHE_CLEAN_BLOCK_INTR
+
msr cpsr_all, r3
-#endif
mov pc, lr
/*
@@ -132,7 +130,6 @@ _C_LABEL(sa1_cache_clean_size):
.Lsa1_cache_clean_size:
.word _C_LABEL(sa1_cache_clean_size)
-#ifdef CACHE_CLEAN_BLOCK_INTR
#define SA1_CACHE_CLEAN_BLOCK \
mrs r3, cpsr_all ; \
orr r0, r3, #(I32_bit | F32_bit) ; \
@@ -140,10 +137,6 @@ _C_LABEL(sa1_cache_clean_size):
#define SA1_CACHE_CLEAN_UNBLOCK \
msr cpsr_all, r3
-#else
-#define SA1_CACHE_CLEAN_BLOCK
-#define SA1_CACHE_CLEAN_UNBLOCK
-#endif /* CACHE_CLEAN_BLOCK_INTR */
#ifdef DOUBLE_CACHE_CLEAN_BANK
#define SA1_DOUBLE_CACHE_CLEAN_BANK \
diff --git a/sys/arch/arm/arm/cpufunc_asm_xscale.S b/sys/arch/arm/arm/cpufunc_asm_xscale.S
index 994148768f4..33decf66ce0 100644
--- a/sys/arch/arm/arm/cpufunc_asm_xscale.S
+++ b/sys/arch/arm/arm/cpufunc_asm_xscale.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpufunc_asm_xscale.S,v 1.3 2009/11/08 13:50:14 miod Exp $ */
+/* $OpenBSD: cpufunc_asm_xscale.S,v 1.4 2011/09/20 22:11:40 miod Exp $ */
/* $NetBSD: cpufunc_asm_xscale.S,v 1.16 2002/08/17 16:36:32 thorpej Exp $ */
/*
@@ -80,11 +80,6 @@
*/
#define CACHE_SIZE 0x8000
-#ifndef CACHE_CLEAN_BLOCK_INTR
-.Lblock_userspace_access:
- .word _C_LABEL(block_userspace_access)
-#endif
-
/*
* CPWAIT -- Canonical method to wait for CP15 update.
* From: Intel 80200 manual, section 2.3.3.
@@ -133,16 +128,10 @@ ENTRY(xscale_control)
* addresses that are about to change.
*/
ENTRY(xscale_setttb)
-#ifdef CACHE_CLEAN_BLOCK_INTR
mrs r3, cpsr_all
orr r1, r3, #(I32_bit | F32_bit)
msr cpsr_all, r1
-#else
- ldr r3, .Lblock_userspace_access
- ldr r2, [r3]
- orr r1, r2, #1
- str r1, [r3]
-#endif
+
stmfd sp!, {r0-r3, lr}
bl _C_LABEL(xscale_cache_cleanID)
mcr p15, 0, r0, c7, c5, 0 /* invalidate I$ and BTB */
@@ -163,11 +152,7 @@ ENTRY(xscale_setttb)
CPWAIT(r0)
-#ifdef CACHE_CLEAN_BLOCK_INTR
msr cpsr_all, r3
-#else
- str r2, [r3]
-#endif
mov pc, lr
/*
@@ -258,7 +243,6 @@ _C_LABEL(xscale_cache_clean_size):
.Lxscale_minidata_clean_size:
.word _C_LABEL(xscale_minidata_clean_size)
-#ifdef CACHE_CLEAN_BLOCK_INTR
#define XSCALE_CACHE_CLEAN_BLOCK \
mrs r3, cpsr_all ; \
orr r0, r3, #(I32_bit | F32_bit) ; \
@@ -266,16 +250,6 @@ _C_LABEL(xscale_cache_clean_size):
#define XSCALE_CACHE_CLEAN_UNBLOCK \
msr cpsr_all, r3
-#else
-#define XSCALE_CACHE_CLEAN_BLOCK \
- ldr r3, .Lblock_userspace_access ; \
- ldr ip, [r3] ; \
- orr r0, ip, #1 ; \
- str r0, [r3]
-
-#define XSCALE_CACHE_CLEAN_UNBLOCK \
- str ip, [r3]
-#endif /* CACHE_CLEAN_BLOCK_INTR */
#define XSCALE_CACHE_CLEAN_PROLOGUE \
XSCALE_CACHE_CLEAN_BLOCK ; \
diff --git a/sys/arch/armish/conf/GENERIC b/sys/arch/armish/conf/GENERIC
index 5d8a3753cfd..bcb20bfdf34 100644
--- a/sys/arch/armish/conf/GENERIC
+++ b/sys/arch/armish/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.42 2011/07/07 23:41:09 tedu Exp $
+# $OpenBSD: GENERIC,v 1.43 2011/09/20 22:11:42 miod Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -20,7 +20,6 @@ makeoptions KERNEL_BASE_VIRT="0xc0200000"
options CPU_XSCALE_80321 # Support the XScale core
options XSCALE_CACHE_READ_WRITE_ALLOCATE
-options CACHE_CLEAN_BLOCK_INTR
#options PERFCTRS # performance counters
diff --git a/sys/arch/armish/conf/RAMDISK b/sys/arch/armish/conf/RAMDISK
index 9b57647b2b6..79447cb6f46 100644
--- a/sys/arch/armish/conf/RAMDISK
+++ b/sys/arch/armish/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.20 2011/08/02 06:36:29 matthieu Exp $
+# $OpenBSD: RAMDISK,v 1.21 2011/09/20 22:11:42 miod Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -20,7 +20,6 @@ makeoptions KERNEL_BASE_VIRT="0xc0200000"
option CPU_XSCALE_80321 # Support the XScale core
option XSCALE_CACHE_READ_WRITE_ALLOCATE
-option CACHE_CLEAN_BLOCK_INTR
#option PERFCTRS # performance counters
diff --git a/sys/arch/beagle/conf/GENERIC b/sys/arch/beagle/conf/GENERIC
index 19db0a17e26..98f17e8c6ca 100644
--- a/sys/arch/beagle/conf/GENERIC
+++ b/sys/arch/beagle/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.6 2011/06/29 20:52:09 matthew Exp $
+# $OpenBSD: GENERIC,v 1.7 2011/09/20 22:11:42 miod Exp $
#
# GENERIC machine description file
#
@@ -26,8 +26,6 @@ options DST=0 # daylight saving time used by RTC
options ARM11_AVIC_INTR
-options CACHE_CLEAN_BLOCK_INTR
-
makeoptions KERNEL_BASE_PHYS="0x80300000"
makeoptions KERNEL_BASE_VIRT="0xc0300000"
options BUILD_STARTUP_PAGETABLE
diff --git a/sys/arch/beagle/conf/RAMDISK b/sys/arch/beagle/conf/RAMDISK
index cd75837f07f..df70608da2a 100644
--- a/sys/arch/beagle/conf/RAMDISK
+++ b/sys/arch/beagle/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.10 2011/06/29 20:52:09 matthew Exp $
+# $OpenBSD: RAMDISK,v 1.11 2011/09/20 22:11:42 miod Exp $
#
# GENERIC machine description file
#
@@ -33,8 +33,6 @@ options FIFO # FIFOs; RECOMMENDED
options ARM11_AVIC_INTR
-options CACHE_CLEAN_BLOCK_INTR
-
makeoptions KERNEL_BASE_PHYS="0x80300000"
makeoptions KERNEL_BASE_VIRT="0xc0300000"
options BUILD_STARTUP_PAGETABLE
diff --git a/sys/arch/gumstix/conf/GENERIC b/sys/arch/gumstix/conf/GENERIC
index 0eca8bff6c9..887efa2bca0 100644
--- a/sys/arch/gumstix/conf/GENERIC
+++ b/sys/arch/gumstix/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.13 2011/06/29 20:52:09 matthew Exp $
+# $OpenBSD: GENERIC,v 1.14 2011/09/20 22:11:42 miod Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -16,8 +16,6 @@ maxusers 32 # estimated number of users
options ARM32
options PXAGPIO_HAS_GPION_INTRS
-options CACHE_CLEAN_BLOCK_INTR
-
makeoptions KERNEL_BASE_PHYS="0xa0200000"
makeoptions KERNEL_BASE_VIRT="0xc0200000"
diff --git a/sys/arch/gumstix/conf/RAMDISK b/sys/arch/gumstix/conf/RAMDISK
index 08797a502e5..bbd4829aba6 100644
--- a/sys/arch/gumstix/conf/RAMDISK
+++ b/sys/arch/gumstix/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.4 2011/06/29 20:52:09 matthew Exp $
+# $OpenBSD: RAMDISK,v 1.5 2011/09/20 22:11:42 miod Exp $
machine gumstix arm
@@ -15,8 +15,6 @@ options EXT2FS # Second Extended Filesystem
options ARM32
options PXAGPIO_HAS_GPION_INTRS
-options CACHE_CLEAN_BLOCK_INTR
-
makeoptions KERNEL_BASE_PHYS="0xa0200000"
makeoptions KERNEL_BASE_VIRT="0xc0200000"
diff --git a/sys/arch/palm/conf/GENERIC b/sys/arch/palm/conf/GENERIC
index 73892e1102c..84f7059be78 100644
--- a/sys/arch/palm/conf/GENERIC
+++ b/sys/arch/palm/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.13 2011/07/07 23:41:09 tedu Exp $
+# $OpenBSD: GENERIC,v 1.14 2011/09/20 22:11:42 miod Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -16,8 +16,6 @@ maxusers 32 # estimated number of users
options ARM32
options PXAGPIO_HAS_GPION_INTRS
-options CACHE_CLEAN_BLOCK_INTR
-
makeoptions KERNEL_BASE_PHYS="0xa0200000"
makeoptions KERNEL_BASE_VIRT="0xc0200000"
diff --git a/sys/arch/palm/conf/RAMDISK b/sys/arch/palm/conf/RAMDISK
index 676d780cb7b..fedb53464ec 100644
--- a/sys/arch/palm/conf/RAMDISK
+++ b/sys/arch/palm/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.8 2011/06/29 20:52:09 matthew Exp $
+# $OpenBSD: RAMDISK,v 1.9 2011/09/20 22:11:42 miod Exp $
machine palm arm
@@ -16,8 +16,6 @@ options CRYPTO # Cryptographic framework
options ARM32
options PXAGPIO_HAS_GPION_INTRS
-options CACHE_CLEAN_BLOCK_INTR
-
makeoptions KERNEL_BASE_PHYS="0xa0200000"
makeoptions KERNEL_BASE_VIRT="0xc0200000"
diff --git a/sys/arch/zaurus/conf/GENERIC b/sys/arch/zaurus/conf/GENERIC
index e36ca3f9148..d2cb1082356 100644
--- a/sys/arch/zaurus/conf/GENERIC
+++ b/sys/arch/zaurus/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.85 2011/07/07 23:41:09 tedu Exp $
+# $OpenBSD: GENERIC,v 1.86 2011/09/20 22:11:42 miod Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -16,8 +16,6 @@ maxusers 32 # estimated number of users
options ARM32
options PXAGPIO_HAS_GPION_INTRS
-options CACHE_CLEAN_BLOCK_INTR
-
makeoptions KERNEL_BASE_PHYS="0xa0200000"
makeoptions KERNEL_BASE_VIRT="0xc0200000"
diff --git a/sys/arch/zaurus/conf/RAMDISK b/sys/arch/zaurus/conf/RAMDISK
index 74b2a62ffc3..415e0199339 100644
--- a/sys/arch/zaurus/conf/RAMDISK
+++ b/sys/arch/zaurus/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.42 2011/06/29 20:52:09 matthew Exp $
+# $OpenBSD: RAMDISK,v 1.43 2011/09/20 22:11:42 miod Exp $
machine zaurus arm
@@ -16,8 +16,6 @@ options CRYPTO # Cryptographic framework
options ARM32
options PXAGPIO_HAS_GPION_INTRS
-options CACHE_CLEAN_BLOCK_INTR
-
makeoptions KERNEL_BASE_PHYS="0xa0200000"
makeoptions KERNEL_BASE_VIRT="0xc0200000"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 12:26:43 +0000