Module Name: src
Committed By: skrll
Date: Wed Oct 23 20:28:11 UTC 2013
Modified Files:
src/sys/arch/arm/arm: cpufunc.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 src/sys/arch/arm/arm/cpufunc.c
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/arm/arm/cpufunc.c
diff -u src/sys/arch/arm/arm/cpufunc.c:1.126 src/sys/arch/arm/arm/cpufunc.c:1.127
--- src/sys/arch/arm/arm/cpufunc.c:1.126 Sun Oct 20 09:30:41 2013
+++ src/sys/arch/arm/arm/cpufunc.c Wed Oct 23 20:28:11 2013
@@ -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 @@ struct cpu_option arm10_options[] = {
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 @@ arm10_setup(char *args)
/* Set the control register */
curcpu()->ci_ctrl = cpuctrl;
- cpu_control(cpuctrlmask, cpuctrl);
+ cpu_control(0xffffffff, cpuctrl);
/* And again. */
cpu_idcache_wbinv_all();
