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

[Nick Hudson]

Module Name:    src
Committed By:   skrll
Date:           Sun Mar  2 08:14:26 UTC 2025

Modified Files:
        src/sys/arch/riscv/riscv: locore.S riscv_machdep.c

Log Message:
risc-v: ensure the boot stacks are mapped so that pmap_extract works


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/riscv/riscv/locore.S
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/riscv/riscv/riscv_machdep.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/locore.S
diff -u src/sys/arch/riscv/riscv/locore.S:1.45 src/sys/arch/riscv/riscv/locore.S:1.46
--- src/sys/arch/riscv/riscv/locore.S:1.45	Fri Feb  9 22:08:33 2024
+++ src/sys/arch/riscv/riscv/locore.S	Sun Mar  2 08:14:26 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.45 2024/02/09 22:08:33 andvar Exp $ */
+/* $NetBSD: locore.S,v 1.46 2025/03/02 08:14:26 skrll Exp $ */
 
 /*-
  * Copyright (c) 2014, 2022 The NetBSD Foundation, Inc.
@@ -702,7 +702,7 @@ hart_boot:
 	 * bootstrap L1PT
 	 */
 
-	.section "_init_memory", "aw", %nobits
+//	.section "_init_memory", "aw", %nobits
 	.align PGSHIFT
 	.global _C_LABEL(lwp0uspace)
 _C_LABEL(lwp0uspace):
@@ -713,7 +713,7 @@ bootstk:
 	.space	BOOT_AP_STACKSIZE * (MAXCPUS - 1)
 #endif
 
-	.section "_init_memory", "aw", %nobits
+//	.section "_init_memory", "aw", %nobits
 	.align PGSHIFT
 mmutables_start:
 bootstrap_pde:

Index: src/sys/arch/riscv/riscv/riscv_machdep.c
diff -u src/sys/arch/riscv/riscv/riscv_machdep.c:1.42 src/sys/arch/riscv/riscv/riscv_machdep.c:1.43
--- src/sys/arch/riscv/riscv/riscv_machdep.c:1.42	Sat Jan  4 14:23:03 2025
+++ src/sys/arch/riscv/riscv/riscv_machdep.c	Sun Mar  2 08:14:26 2025
@@ -1,4 +1,4 @@
-/*	$NetBSD: riscv_machdep.c,v 1.42 2025/01/04 14:23:03 skrll Exp $	*/
+/*	$NetBSD: riscv_machdep.c,v 1.43 2025/03/02 08:14:26 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2014, 2019, 2022 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 #include "opt_riscv_debug.h"
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: riscv_machdep.c,v 1.42 2025/01/04 14:23:03 skrll Exp $");
+__RCSID("$NetBSD: riscv_machdep.c,v 1.43 2025/03/02 08:14:26 skrll Exp $");
 
 #include <sys/param.h>
 
@@ -571,6 +571,7 @@ cpu_kernel_vm_init(paddr_t memory_start,
 	fdt_memory_remove_range(kernstart_phys,
 	    kernend_phys - kernstart_phys);
 
+#if 0
 	/*
 	 * Don't give these pages to UVM.
 	 *
@@ -590,6 +591,7 @@ cpu_kernel_vm_init(paddr_t memory_start,
 		    " end %#" PRIxPADDR "\n", __func__, spa, epa);
 		fdt_memory_remove_range(spa, epa - spa);
 	}
+#endif
 
 #ifdef _LP64
 	paddr_t pa = memory_start & ~XSEGOFSET;