[src/trunk]: src/sys/arch/arm/arm Fix PR/48332 by reverting to passing 0xffff...

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6d3813a77d5e
branches:  trunk
changeset: 790827:6d3813a77d5e
user:      skrll <skrll%NetBSD.org@localhost>
date:      Wed Oct 23 20:28:11 2013 +0000

description:
Fix PR/48332 by reverting to passing 0xffffffff as the cpuctrlmask.
Comment out the cpuctrlmask that doesn't work for the imx23_olinuxino
leaving it there for reference.

diffstat:

 sys/arch/arm/arm/cpufunc.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (48 lines):

diff -r 1d3b737f5dae -r 6d3813a77d5e sys/arch/arm/arm/cpufunc.c
--- a/sys/arch/arm/arm/cpufunc.c        Wed Oct 23 20:18:50 2013 +0000
+++ b/sys/arch/arm/arm/cpufunc.c        Wed Oct 23 20:28:11 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpufunc.c,v 1.126 2013/10/20 09:30:41 skrll Exp $      */
+/*     $NetBSD: cpufunc.c,v 1.127 2013/10/23 20:28:11 skrll Exp $      */
 
 /*
  * arm7tdmi support code Copyright (c) 2001 John Fremlin
@@ -49,7 +49,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.126 2013/10/20 09:30:41 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.127 2013/10/23 20:28:11 skrll Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_cpuoptions.h"
@@ -2836,17 +2836,19 @@
 void
 arm10_setup(char *args)
 {
-       int cpuctrl, cpuctrlmask;
+       int cpuctrl;
 
        cpuctrl = CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_SYST_ENABLE
            | CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE
            | CPU_CONTROL_WBUF_ENABLE | CPU_CONTROL_BPRD_ENABLE;
+#if 0
        cpuctrlmask = CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_SYST_ENABLE
            | CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE
            | CPU_CONTROL_WBUF_ENABLE | CPU_CONTROL_ROM_ENABLE
            | CPU_CONTROL_BEND_ENABLE | CPU_CONTROL_AFLT_ENABLE
            | CPU_CONTROL_BPRD_ENABLE
            | CPU_CONTROL_ROUNDROBIN | CPU_CONTROL_CPCLK;
+#endif
 
 #ifndef ARM32_DISABLE_ALIGNMENT_FAULTS
        cpuctrl |= CPU_CONTROL_AFLT_ENABLE;
@@ -2871,7 +2873,7 @@
 
        /* Set the control register */
        curcpu()->ci_ctrl = cpuctrl;
-       cpu_control(cpuctrlmask, cpuctrl);
+       cpu_control(0xffffffff, cpuctrl);
 
        /* And again. */
        cpu_idcache_wbinv_all();