CVS commit: src/sys/arch/riscv/riscv

[Nick Hudson]

Module Name:    src
Committed By:   skrll
Date:           Thu Sep  7 12:48:49 UTC 2023

Modified Files:
        src/sys/arch/riscv/riscv: trap.c

Log Message:
Handle CAUSE_LOAD_PAGE_FAULT in trap_pagefault_fixup


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/riscv/riscv/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/riscv/riscv/trap.c
diff -u src/sys/arch/riscv/riscv/trap.c:1.23 src/sys/arch/riscv/riscv/trap.c:1.24
--- src/sys/arch/riscv/riscv/trap.c:1.23	Tue Aug 22 07:11:15 2023
+++ src/sys/arch/riscv/riscv/trap.c	Thu Sep  7 12:48:49 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.23 2023/08/22 07:11:15 rin Exp $	*/
+/*	$NetBSD: trap.c,v 1.24 2023/09/07 12:48:49 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
 #define	__PMAP_PRIVATE
 #define	__UFETCHSTORE_PRIVATE
 
-__RCSID("$NetBSD: trap.c,v 1.23 2023/08/22 07:11:15 rin Exp $");
+__RCSID("$NetBSD: trap.c,v 1.24 2023/09/07 12:48:49 skrll Exp $");
 
 #include <sys/param.h>
 
@@ -358,6 +358,12 @@ trap_pagefault_fixup(struct trapframe *t
 		npte = opte;
 
 		switch (cause) {
+		case CAUSE_LOAD_PAGE_FAULT:
+			if ((npte & PTE_R) == 0) {
+				npte |= PTE_A;
+				attr |= VM_PAGEMD_REFERENCED;
+			}
+			break;
 		case CAUSE_STORE_ACCESS:
 			if ((npte & PTE_W) != 0) {
 				npte |= PTE_A | PTE_D;
@@ -380,8 +386,8 @@ trap_pagefault_fixup(struct trapframe *t
 #endif
 			break;
 		default:
-			panic("%s: Unhandled cause! 0x%016lx (%s)", __func__,
-			    (long)cause, cause_name(cause));
+			panic("%s: Unhandled cause (%#" PRIxREGISTER
+			    ") for addr %lx", __func__, cause, addr);
 		}
 		if (attr == 0)
 			return false;