[src/trunk]: src/sys/arch/mips/mips Move the hpcmips L1 cache disable hack up

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

details:   https://anonhg.NetBSD.org/src/rev/703fe75d0d61
branches:  trunk
changeset: 321239:703fe75d0d61
user:      maya <maya%NetBSD.org@localhost>
date:      Wed Mar 07 15:52:43 2018 +0000

description:
Move the hpcmips L1 cache disable hack up
where another machine-specific hacks exists.

Note that no existing kernel seems to enable this option.

diffstat:

 sys/arch/mips/mips/locore.S |  21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diffs (49 lines):

diff -r 938d0df3634c -r 703fe75d0d61 sys/arch/mips/mips/locore.S
--- a/sys/arch/mips/mips/locore.S       Wed Mar 07 15:49:45 2018 +0000
+++ b/sys/arch/mips/mips/locore.S       Wed Mar 07 15:52:43 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.S,v 1.212 2018/03/07 15:49:45 maya Exp $        */
+/*     $NetBSD: locore.S,v 1.213 2018/03/07 15:52:43 maya Exp $        */
 
 /*
  * Copyright (c) 1992, 1993
@@ -63,7 +63,7 @@
 #include <mips/trap.h>
 #include <mips/locore.h>
 
-RCSID("$NetBSD: locore.S,v 1.212 2018/03/07 15:49:45 maya Exp $")
+RCSID("$NetBSD: locore.S,v 1.213 2018/03/07 15:52:43 maya Exp $")
 
 #include "assym.h"
 
@@ -93,6 +93,15 @@
        mtc0    k0, MIPS_COP_0_STATUS
 #endif
 
+#ifdef HPCMIPS_L1CACHE_DISABLE
+       mfc0    t0, MIPS_COP_0_CONFIG
+       li      t1, 0xfffffff8
+       and     t0, t0, t1
+       or      t0, 0x00000002                  # XXX, KSEG0 is uncached
+       mtc0    t0, MIPS_COP_0_CONFIG
+       COP0_SYNC
+#endif /* HPCMIPS_L1CACHE_DISABLE */
+
 #ifdef MIPS64_OCTEON
        //
        // U-boot on the erlite starts all cpus at the kernel entry point.
@@ -145,14 +154,6 @@
        mtc0    t0, MIPS_COP_0_STATUS           # the fp coprocessor
        COP0_SYNC
 #endif /* !emips */
-#ifdef HPCMIPS_L1CACHE_DISABLE
-       mfc0    t0, MIPS_COP_0_CONFIG
-       li      t1, 0xfffffff8
-       and     t0, t0, t1
-       or      t0, 0x00000002                  # XXX, KSEG0 is uncached
-       mtc0    t0, MIPS_COP_0_CONFIG
-       COP0_SYNC
-#endif /* HPCMIPS_L1CACHE_DISABLE */
 #else /* NOFPU */
        mfc0    t0, MIPS_COP_0_STATUS
        MFC0_HAZARD