[src/netbsd-8]: src/sys/arch/mips/mips Pull up following revision(s) (request...

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

details:   https://anonhg.NetBSD.org/src/rev/5d92ccf57fc7
branches:  netbsd-8
changeset: 850719:5d92ccf57fc7
user:      snj <snj%NetBSD.org@localhost>
date:      Sat Jun 10 06:25:29 2017 +0000

description:
Pull up following revision(s) (requested by skrll in ticket #25):
        sys/arch/mips/mips/locore_mips1.S: revision 1.92, 1.93
fix tlb_record_asids 2nd arg to match usage - it's a maximum asid value
and not a mask
--
Add a missing ".set at" to make previous build

diffstat:

 sys/arch/mips/mips/locore_mips1.S |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (45 lines):

diff -r 43eaa0780890 -r 5d92ccf57fc7 sys/arch/mips/mips/locore_mips1.S
--- a/sys/arch/mips/mips/locore_mips1.S Sat Jun 10 06:23:01 2017 +0000
+++ b/sys/arch/mips/mips/locore_mips1.S Sat Jun 10 06:25:29 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore_mips1.S,v 1.91 2016/07/27 09:32:35 skrll Exp $  */
+/*     $NetBSD: locore_mips1.S,v 1.91.8.1 2017/06/10 06:25:29 snj Exp $        */
 
 /*
  * Copyright (c) 1992, 1993
@@ -57,7 +57,7 @@
 #include <mips/asm.h>
 #include <mips/cpuregs.h>
 
-RCSID("$NetBSD: locore_mips1.S,v 1.91 2016/07/27 09:32:35 skrll Exp $")
+RCSID("$NetBSD: locore_mips1.S,v 1.91.8.1 2017/06/10 06:25:29 snj Exp $")
 
 #include "assym.h"
 
@@ -1035,6 +1035,7 @@
        tlbwr                                   # write random TLB
        j       k1
         rfe
+       .set    at
 END(MIPSX(kern_tlb_miss))
 
 #if 0
@@ -1368,7 +1369,7 @@
 END(MIPSX(tlb_invalidate_all))
 
 /*
- * u_int mipsN_tlb_record_asids(u_long *bitmap, uint32_t asid_mask)
+ * u_int mipsN_tlb_record_asids(u_long *bitmap, uint32_t asid_max)
  *
  * Scan the random part of the TLB looking at non-global entries and
  * record each ASID in use into the bitmap.  Additionally, return the
@@ -1402,7 +1403,8 @@
        nop
        and     t0, MIPS1_TLB_PID
        srl     t0, MIPS1_TLB_PID_SHIFT         # shift to low bits
-       and     t0, a1                          # focus on asid_mask
+       bgt     t0, a1, 4f                      # > ASID max? skip
+        nop
 
        srl     a2, t0, 3 + LONG_SCALESHIFT     # drop low 5 bits
        sll     a2, LONG_SCALESHIFT             # make an index for the bitmap