From 99123b591f6b2276df7f566f95a267025d6211e3 Mon Sep 17 00:00:00 2001 From: Jonathan Woodruff Date: Thu, 11 Jul 2024 14:29:59 +0100 Subject: [PATCH] Clean up stray cases that don't fit the 4 states. --- sys/arm64/include/pte.h | 2 +- sys/arm64/vmm/vmm_mmu.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/arm64/include/pte.h b/sys/arm64/include/pte.h index 801a14eea549..2b6064044a8b 100644 --- a/sys/arm64/include/pte.h +++ b/sys/arm64/include/pte.h @@ -132,7 +132,7 @@ typedef uint64_t pt_entry_t; /* page table entry */ * ATTR_CAP_RW as a single operand, so separate orr instructions are * required for ATTR_CAP_RW. */ -#define ATTR_CAP_RW (ATTR_LC_ENABLED | ATTR_SC) +#define ATTR_CAP_RW ATTR_CAP_GEN0 #endif #define ATTR_DEFAULT (ATTR_AF | ATTR_SH(ATTR_SH_IS)) diff --git a/sys/arm64/vmm/vmm_mmu.c b/sys/arm64/vmm/vmm_mmu.c index 3669b796a1c4..51d2bede1a31 100644 --- a/sys/arm64/vmm/vmm_mmu.c +++ b/sys/arm64/vmm/vmm_mmu.c @@ -309,10 +309,10 @@ vmmpmap_enter(vm_offset_t va, vm_size_t size, vm_paddr_t pa, vm_prot_t prot) } #if __has_feature(capabilities) if ((prot & VM_PROT_READ_CAP) != 0) { - l3e |= ATTR_LC_ENABLED; + l3e |= ATTR_CAP_GEN0; } if ((prot & VM_PROT_WRITE_CAP) != 0) { - l3e |= ATTR_SC; + l3e |= ATTR_CAP_GEN0; } #endif