CVS commit: [netbsd-9] src/sys/arch/mips/mips
Module Name:src
Committed By: martin
Date: Sat Dec 9 12:57:16 UTC 2023
Modified Files:
src/sys/arch/mips/mips [netbsd-9]: lock_stubs_llsc.S
Log Message:
Pull up following revision(s) (requested by andvar in ticket #1773):
sys/arch/mips/mips/lock_stubs_llsc.S: revision 1.18
Add missing PTR_WORD command in front of 0.
Likely accidentally missed in the commit, since rev 1.9.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.4.1 src/sys/arch/mips/mips/lock_stubs_llsc.S
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/mips/mips/lock_stubs_llsc.S
diff -u src/sys/arch/mips/mips/lock_stubs_llsc.S:1.9 src/sys/arch/mips/mips/lock_stubs_llsc.S:1.9.4.1
--- src/sys/arch/mips/mips/lock_stubs_llsc.S:1.9 Sat Apr 6 03:06:26 2019
+++ src/sys/arch/mips/mips/lock_stubs_llsc.S Sat Dec 9 12:57:16 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: lock_stubs_llsc.S,v 1.9 2019/04/06 03:06:26 thorpej Exp $ */
+/* $NetBSD: lock_stubs_llsc.S,v 1.9.4.1 2023/12/09 12:57:16 martin Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include
-RCSID("$NetBSD: lock_stubs_llsc.S,v 1.9 2019/04/06 03:06:26 thorpej Exp $")
+RCSID("$NetBSD: lock_stubs_llsc.S,v 1.9.4.1 2023/12/09 12:57:16 martin Exp $")
#include "assym.h"
@@ -364,7 +364,7 @@ EXPORT(mips_llsc_locore_atomicvec)
#ifdef _LP64
PTR_WORD llsc_ucas_64
#else
- 0
+ PTR_WORD 0
#endif /* _LP64 */
#ifdef LOCKDEBUG
PTR_WORD mutex_vector_enter
CVS commit: [netbsd-9] src/sys/arch/mips/mips
Module Name:src Committed By: martin Date: Sat Dec 9 12:57:16 UTC 2023 Modified Files: src/sys/arch/mips/mips [netbsd-9]: lock_stubs_llsc.S Log Message: Pull up following revision(s) (requested by andvar in ticket #1773): sys/arch/mips/mips/lock_stubs_llsc.S: revision 1.18 Add missing PTR_WORD command in front of 0. Likely accidentally missed in the commit, since rev 1.9. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.9.4.1 src/sys/arch/mips/mips/lock_stubs_llsc.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/arch/mips/mips
Module Name:src
Committed By: martin
Date: Sun Sep 5 10:48:48 UTC 2021
Modified Files:
src/sys/arch/mips/mips [netbsd-9]: trap.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1342):
sys/arch/mips/mips/trap.c: revision 1.250
sys/arch/mips/mips/trap.c: revision 1.251
Add missing newline to a diagnostic printf.
Comment out the diagnostic message in the TLB_MOD handler that's logged if
pmap_tlb_update_addr() indicates that the VA+ASID was not found in the TLB.
It's a harmless race condition that can happen for legitimate reasons (e.g.
a TLB miss in an interrupt handler that evicts the entry from the TLB).
See discussion:
http://mail-index.netbsd.org/port-mips/2020/03/07/msg000927.html
To generate a diff of this commit:
cvs rdiff -u -r1.249 -r1.249.4.1 src/sys/arch/mips/mips/trap.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/mips/mips/trap.c
diff -u src/sys/arch/mips/mips/trap.c:1.249 src/sys/arch/mips/mips/trap.c:1.249.4.1
--- src/sys/arch/mips/mips/trap.c:1.249 Sat Apr 6 11:54:20 2019
+++ src/sys/arch/mips/mips/trap.c Sun Sep 5 10:48:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.249 2019/04/06 11:54:20 kamil Exp $ */
+/* $NetBSD: trap.c,v 1.249.4.1 2021/09/05 10:48:48 martin Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.249 2019/04/06 11:54:20 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.249.4.1 2021/09/05 10:48:48 martin Exp $");
#include "opt_cputype.h" /* which mips CPU levels do we support? */
#include "opt_ddb.h"
@@ -296,10 +296,20 @@ trap(uint32_t status, uint32_t cause, va
vaddr = trunc_page(vaddr);
int ok = pmap_tlb_update_addr(pmap, vaddr, pte, 0);
kpreempt_enable();
- if (ok != 1)
+ if (ok != 1) {
+#if 0 /* PMAP_FAULTINFO? */
+ /*
+ * Since we don't block interrupts here,
+ * this can legitimately happen if we get
+ * a TLB miss that's serviced in an interrupt
+ * hander that happens to randomly evict the
+ * TLB entry we're concerned about.
+ */
printf("pmap_tlb_update_addr(%p,%#"
- PRIxVADDR",%#"PRIxPTE", 0) returned %d",
+ PRIxVADDR",%#"PRIxPTE", 0) returned %d\n",
pmap, vaddr, pte_value(pte), ok);
+#endif
+ }
paddr_t pa = pte_to_paddr(pte);
KASSERTMSG(uvm_pageismanaged(pa),
"%#"PRIxVADDR" pa %#"PRIxPADDR, vaddr, pa);
CVS commit: [netbsd-9] src/sys/arch/mips/mips
Module Name:src Committed By: martin Date: Sun Sep 5 10:48:48 UTC 2021 Modified Files: src/sys/arch/mips/mips [netbsd-9]: trap.c Log Message: Pull up following revision(s) (requested by tsutsui in ticket #1342): sys/arch/mips/mips/trap.c: revision 1.250 sys/arch/mips/mips/trap.c: revision 1.251 Add missing newline to a diagnostic printf. Comment out the diagnostic message in the TLB_MOD handler that's logged if pmap_tlb_update_addr() indicates that the VA+ASID was not found in the TLB. It's a harmless race condition that can happen for legitimate reasons (e.g. a TLB miss in an interrupt handler that evicts the entry from the TLB). See discussion: http://mail-index.netbsd.org/port-mips/2020/03/07/msg000927.html To generate a diff of this commit: cvs rdiff -u -r1.249 -r1.249.4.1 src/sys/arch/mips/mips/trap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/arch/mips/mips
Module Name:src
Committed By: martin
Date: Fri Sep 13 06:56:23 UTC 2019
Modified Files:
src/sys/arch/mips/mips [netbsd-9]: locore.S
Log Message:
Pull up following revision(s) (requested by skrll in ticket #199):
sys/arch/mips/mips/locore.S: revision 1.220
Fix a maya fix so that cobalt boots again.
Set MIPS_COP_0_CAUSE to zero before the rest of the initialisation
To generate a diff of this commit:
cvs rdiff -u -r1.219 -r1.219.4.1 src/sys/arch/mips/mips/locore.S
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/mips/mips/locore.S
diff -u src/sys/arch/mips/mips/locore.S:1.219 src/sys/arch/mips/mips/locore.S:1.219.4.1
--- src/sys/arch/mips/mips/locore.S:1.219 Fri Sep 7 21:14:45 2018
+++ src/sys/arch/mips/mips/locore.S Fri Sep 13 06:56:23 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.219 2018/09/07 21:14:45 macallan Exp $ */
+/* $NetBSD: locore.S,v 1.219.4.1 2019/09/13 06:56:23 martin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -63,7 +63,7 @@
#include
#include
-RCSID("$NetBSD: locore.S,v 1.219 2018/09/07 21:14:45 macallan Exp $")
+RCSID("$NetBSD: locore.S,v 1.219.4.1 2019/09/13 06:56:23 martin Exp $")
#include "assym.h"
@@ -73,10 +73,10 @@ RCSID("$NetBSD: locore.S,v 1.219 2018/09
.globl _C_LABEL(kernel_text) # libkvm refers this
start:
_C_LABEL(kernel_text):
+ /* First disable the interrupts only, for safety */
mfc0 k0, MIPS_COP_0_STATUS
MFC0_HAZARD
- /* First disable the interrupts only, for safety */
and k0, ~MIPS_SR_INT_IE
mtc0 k0, MIPS_COP_0_STATUS
COP0_SYNC
@@ -85,6 +85,7 @@ _C_LABEL(kernel_text):
/* Leaving TS | RE alone (for emips) */
and k0, MIPS_SR_TS | MIPS3_SR_RE
mtc0 k0, MIPS_COP_0_STATUS
+ mtc0 zero, MIPS_COP_0_CAUSE
COP0_SYNC
#if defined(_LP64)
CVS commit: [netbsd-9] src/sys/arch/mips/mips
Module Name:src Committed By: martin Date: Fri Sep 13 06:56:23 UTC 2019 Modified Files: src/sys/arch/mips/mips [netbsd-9]: locore.S Log Message: Pull up following revision(s) (requested by skrll in ticket #199): sys/arch/mips/mips/locore.S: revision 1.220 Fix a maya fix so that cobalt boots again. Set MIPS_COP_0_CAUSE to zero before the rest of the initialisation To generate a diff of this commit: cvs rdiff -u -r1.219 -r1.219.4.1 src/sys/arch/mips/mips/locore.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
