[src/trunk]: src/sys/arch/arm/arm If __ARMEB__ is defined, always set CPU_CON...

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

details:   https://anonhg.NetBSD.org/src/rev/6f91a139d2f3
branches:  trunk
changeset: 535345:6f91a139d2f3
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Fri Aug 16 00:06:26 2002 +0000

description:
If __ARMEB__ is defined, always set CPU_CONTROL_BEND_ENABLE in
the CPU control register.

diffstat:

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

diffs (123 lines):

diff -r 48dc7b32d022 -r 6f91a139d2f3 sys/arch/arm/arm/cpufunc.c
--- a/sys/arch/arm/arm/cpufunc.c        Thu Aug 15 19:17:04 2002 +0000
+++ b/sys/arch/arm/arm/cpufunc.c        Fri Aug 16 00:06:26 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpufunc.c,v 1.50 2002/08/07 05:14:56 briggs Exp $      */
+/*     $NetBSD: cpufunc.c,v 1.51 2002/08/16 00:06:26 thorpej Exp $     */
 
 /*
  * arm7tdmi support code Copyright (c) 2001 John Fremlin
@@ -1486,6 +1486,10 @@
        cpuctrl = parse_cpu_options(args, arm678_options, cpuctrl);
        cpuctrl = parse_cpu_options(args, arm6_options, cpuctrl);
 
+#ifdef __ARMEB__
+       cpuctrl |= CPU_CONTROL_BEND_ENABLE;
+#endif
+
        /* Clear out the cache */
        cpu_idcache_wbinv_all();
 
@@ -1527,6 +1531,10 @@
        cpuctrl = parse_cpu_options(args, arm678_options, cpuctrl);
        cpuctrl = parse_cpu_options(args, arm7_options, cpuctrl);
 
+#ifdef __ARMEB__
+       cpuctrl |= CPU_CONTROL_BEND_ENABLE;
+#endif
+
        /* Clear out the cache */
        cpu_idcache_wbinv_all();
 
@@ -1562,6 +1570,10 @@
        cpuctrl = parse_cpu_options(args, arm678_options, cpuctrl);
        cpuctrl = parse_cpu_options(args, arm7tdmi_options, cpuctrl);
 
+#ifdef __ARMEB__
+       cpuctrl |= CPU_CONTROL_BEND_ENABLE;
+#endif
+
        /* Clear out the cache */
        cpu_idcache_wbinv_all();
 
@@ -1606,6 +1618,10 @@
        cpuctrl = parse_cpu_options(args, arm678_options, cpuctrl);
        cpuctrl = parse_cpu_options(args, arm8_options, cpuctrl);
 
+#ifdef __ARMEB__
+       cpuctrl |= CPU_CONTROL_BEND_ENABLE;
+#endif
+
        /* Get clock configuration */
        clocktest = arm8_clock_config(0, 0) & 0x0f;
 
@@ -1683,6 +1699,10 @@
 
        cpuctrl = parse_cpu_options(args, arm9_options, cpuctrl);
 
+#ifdef __ARMEB__
+       cpuctrl |= CPU_CONTROL_BEND_ENABLE;
+#endif
+
        /* Clear out the cache */
        cpu_idcache_wbinv_all();
 
@@ -1730,6 +1750,10 @@
 
        cpuctrl = parse_cpu_options(args, sa110_options, cpuctrl);
 
+#ifdef __ARMEB__
+       cpuctrl |= CPU_CONTROL_BEND_ENABLE;
+#endif
+
        /* Clear out the cache */
        cpu_idcache_wbinv_all();
 
@@ -1783,6 +1807,10 @@
 
        cpuctrl = parse_cpu_options(args, sa11x0_options, cpuctrl);
 
+#ifdef __ARMEB__
+       cpuctrl |= CPU_CONTROL_BEND_ENABLE;
+#endif
+
        /* Clear out the cache */
        cpu_idcache_wbinv_all();
 
@@ -1823,6 +1851,10 @@
 
        cpuctrl = parse_cpu_options(args, ixp12x0_options, cpuctrl);
 
+#ifdef __ARMEB__
+       cpuctrl |= CPU_CONTROL_BEND_ENABLE;
+#endif
+
        /* Clear out the cache */
        cpu_idcache_wbinv_all();
 
@@ -1876,6 +1908,10 @@
 
        cpuctrl = parse_cpu_options(args, xscale_options, cpuctrl);
 
+#ifdef __ARMEB__
+       cpuctrl |= CPU_CONTROL_BEND_ENABLE;
+#endif
+
        /* Clear out the cache */
        cpu_idcache_wbinv_all();
 
@@ -1886,14 +1922,5 @@
        curcpu()->ci_ctrl = cpuctrl;
 /*     cpu_control(cpuctrlmask, cpuctrl);*/
        cpu_control(0xffffffff, cpuctrl);
-
-#if 0
-       /*
-        * XXX FIXME
-        * Disable write buffer coalescing, PT ECC, and set
-        * the mini-cache to write-back/read-allocate.
-        */
-       __asm ("mcr p15, 0, %0, c1, c0, 1" :: "r" (0));
-#endif
 }
 #endif /* CPU_XSCALE_80200 || CPU_XSCALE_80321 || CPU_XSCALE_PXA2X0 */