Module Name: src
Committed By: martin
Date: Mon Dec 19 11:44:30 UTC 2022
Modified Files:
src/sys/arch/arm/arm [netbsd-10]: efi_machdep.c
src/sys/arch/arm/arm32 [netbsd-10]: pmap.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #4):
sys/arch/arm/arm32/pmap.c: revision 1.438
sys/arch/arm/arm/efi_machdep.c: revision 1.3
Appease KDASSERT / LOCKDEBUG.
Tested by mlelstv.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.4.1 src/sys/arch/arm/arm/efi_machdep.c
cvs rdiff -u -r1.437 -r1.437.4.1 src/sys/arch/arm/arm32/pmap.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/arm/arm/efi_machdep.c
diff -u src/sys/arch/arm/arm/efi_machdep.c:1.2 src/sys/arch/arm/arm/efi_machdep.c:1.2.4.1
--- src/sys/arch/arm/arm/efi_machdep.c:1.2 Tue May 3 20:12:27 2022
+++ src/sys/arch/arm/arm/efi_machdep.c Mon Dec 19 11:44:30 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: efi_machdep.c,v 1.2 2022/05/03 20:12:27 skrll Exp $ */
+/* $NetBSD: efi_machdep.c,v 1.2.4.1 2022/12/19 11:44:30 martin Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: efi_machdep.c,v 1.2 2022/05/03 20:12:27 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: efi_machdep.c,v 1.2.4.1 2022/12/19 11:44:30 martin Exp $");
#include <sys/param.h>
#include <uvm/uvm_extern.h>
@@ -111,13 +111,15 @@ arm_efirt_md_map_range(vaddr_t va, paddr
case ARM_EFIRT_MEM_CODE:
/* need write permission because fw devs */
prot = VM_PROT_READ | VM_PROT_WRITE | VM_PROT_EXECUTE;
+ flags = prot;
break;
case ARM_EFIRT_MEM_DATA:
prot = VM_PROT_READ | VM_PROT_WRITE;
+ flags = prot;
break;
case ARM_EFIRT_MEM_MMIO:
prot = VM_PROT_READ | VM_PROT_WRITE;
- flags = PMAP_DEV;
+ flags = prot | PMAP_DEV;
break;
default:
panic("%s: unsupported type %d", __func__, type);
Index: src/sys/arch/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.437 src/sys/arch/arm/arm32/pmap.c:1.437.4.1
--- src/sys/arch/arm/arm32/pmap.c:1.437 Tue May 3 20:12:28 2022
+++ src/sys/arch/arm/arm32/pmap.c Mon Dec 19 11:44:29 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.437 2022/05/03 20:12:28 skrll Exp $ */
+/* $NetBSD: pmap.c,v 1.437.4.1 2022/12/19 11:44:29 martin Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -193,7 +193,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.437 2022/05/03 20:12:28 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.437.4.1 2022/12/19 11:44:29 martin Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -6379,7 +6379,7 @@ pmap_bootstrap(vaddr_t vstart, vaddr_t v
kcpuset_create(&efipm->pm_active, true);
kcpuset_create(&efipm->pm_onproc, true);
#endif
- mutex_init(&efipm->pm_lock, MUTEX_DEFAULT, IPL_VM);
+ mutex_init(&efipm->pm_lock, MUTEX_DEFAULT, IPL_NONE);
#endif
VPRINTF("locks ");
