diff options
| author | Patrick Wildt <patrick@cvs.openbsd.org> | 2013-05-18 17:48:49 +0000 |
|---|---|---|
| committer | Patrick Wildt <patrick@cvs.openbsd.org> | 2013-05-18 17:48:49 +0000 |
| commit | b7bb423d9b7d7c22a89eecc556b2a84dc8948af3 (patch) | |
| tree | 413f257405d6fc0ef8c0bc061342ea1113520cfe /sys | |
| parent | 4840f3e17ebc298ec8c87bf43426e578afcee13d (diff) | |
Mask out the TEX remap and the Access Flag bits when setting the
system control register. Also actually use the mask.
ok miod@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/arm/arm/cpufunc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/arch/arm/arm/cpufunc.c b/sys/arch/arm/arm/cpufunc.c index 1a374663470..9e463016619 100644 --- a/sys/arch/arm/arm/cpufunc.c +++ b/sys/arch/arm/arm/cpufunc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpufunc.c,v 1.22 2013/05/18 17:42:11 patrick Exp $ */ +/* $OpenBSD: cpufunc.c,v 1.23 2013/05/18 17:48:48 patrick Exp $ */ /* $NetBSD: cpufunc.c,v 1.65 2003/11/05 12:53:15 scw Exp $ */ /* @@ -1392,7 +1392,8 @@ armv7_setup() | CPU_CONTROL_ROM_ENABLE | CPU_CONTROL_BPRD_ENABLE | CPU_CONTROL_BEND_ENABLE | CPU_CONTROL_AFLT_ENABLE | CPU_CONTROL_ROUNDROBIN | CPU_CONTROL_CPCLK - | CPU_CONTROL_VECRELOC | CPU_CONTROL_FI | CPU_CONTROL_VE; + | CPU_CONTROL_VECRELOC | CPU_CONTROL_FI | CPU_CONTROL_VE + | CPU_CONTROL_TRE | CPU_CONTROL_AFE; if (vector_page == ARM_VECTORS_HIGH) cpuctrl |= CPU_CONTROL_VECRELOC; @@ -1408,7 +1409,7 @@ armv7_setup() /* Set the control register */ curcpu()->ci_ctrl = cpuctrl; - cpu_control(0xffffffff, cpuctrl); + cpu_control(cpuctrlmask, cpuctrl); /* And again. */ cpu_idcache_wbinv_all(); |