Index: sys/arch/aarch64/aarch64/efi_machdep.c =================================================================== RCS file: /cvsroot/src/sys/arch/aarch64/aarch64/efi_machdep.c,v retrieving revision 1.5 diff -u -p -r1.5 efi_machdep.c --- sys/arch/aarch64/aarch64/efi_machdep.c 16 Dec 2019 00:03:50 -0000 1.5 +++ sys/arch/aarch64/aarch64/efi_machdep.c 10 Jan 2020 22:17:06 -0000 @@ -52,18 +52,16 @@ arm_efirt_md_map_range(vaddr_t va, paddr switch (type) { case ARM_EFIRT_MEM_CODE: - attr = LX_BLKPAG_OS_READ | LX_BLKPAG_OS_WRITE | - LX_BLKPAG_AF | LX_BLKPAG_AP_RW | LX_BLKPAG_UXN | + // XXXNH RO, hmm + attr = LX_BLKPAG_AF | LX_BLKPAG_AP_RW | LX_BLKPAG_UXN | LX_BLKPAG_ATTR_NORMAL_WB; break; case ARM_EFIRT_MEM_DATA: - attr = LX_BLKPAG_OS_READ | LX_BLKPAG_OS_WRITE | - LX_BLKPAG_AF | LX_BLKPAG_AP_RW | LX_BLKPAG_UXN | LX_BLKPAG_PXN | + attr = LX_BLKPAG_AF | LX_BLKPAG_AP_RW | LX_BLKPAG_UXN | LX_BLKPAG_PXN | LX_BLKPAG_ATTR_NORMAL_WB; break; case ARM_EFIRT_MEM_MMIO: - attr = LX_BLKPAG_OS_READ | LX_BLKPAG_OS_WRITE | - LX_BLKPAG_AF | LX_BLKPAG_AP_RW | LX_BLKPAG_UXN | LX_BLKPAG_PXN | + attr = LX_BLKPAG_AF | LX_BLKPAG_AP_RW | LX_BLKPAG_UXN | LX_BLKPAG_PXN | LX_BLKPAG_ATTR_DEVICE_MEM; break; default: