[src/netbsd-10]: src/sys/arch/arm Pull up following revision(s) (requested by...

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

details:   https://anonhg.NetBSD.org/src/rev/caa13d71670d
branches:  netbsd-10
changeset: 372673:caa13d71670d
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Dec 19 11:44:29 2022 +0000

description:
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.

diffstat:

 sys/arch/arm/arm/efi_machdep.c |  8 +++++---
 sys/arch/arm/arm32/pmap.c      |  6 +++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diffs (62 lines):

diff -r 7c0b1eda35e4 -r caa13d71670d sys/arch/arm/arm/efi_machdep.c
--- a/sys/arch/arm/arm/efi_machdep.c    Mon Dec 19 11:37:14 2022 +0000
+++ b/sys/arch/arm/arm/efi_machdep.c    Mon Dec 19 11:44:29 2022 +0000
@@ -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 @@
        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);
diff -r 7c0b1eda35e4 -r caa13d71670d sys/arch/arm/arm32/pmap.c
--- a/sys/arch/arm/arm32/pmap.c Mon Dec 19 11:37:14 2022 +0000
+++ b/sys/arch/arm/arm32/pmap.c Mon Dec 19 11:44:29 2022 +0000
@@ -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 @@
        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 ");