From cf33fa7e8033c63e10a00d1e7066f47346f0315e Mon Sep 17 00:00:00 2001 From: Justin Hibbits Date: Wed, 13 Nov 2019 02:22:00 +0000 Subject: [PATCH] powerpc64: Don't guard ISA 3.0 partition table setup with hw_direct_map PowerISA 3.0 eliminated the 64-bit bridge mode which allowed 32-bit kernels to run on 64-bit AIM/Book-S hardware. Since therefore only a 64-bit kernel can run on this hardware, and 64-bit native always has the direct map, there is no need to guard it. --- sys/powerpc/aim/moea64_native.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/powerpc/aim/moea64_native.c b/sys/powerpc/aim/moea64_native.c index d9f8c63cbe4f..37fdf7ce2ebf 100644 --- a/sys/powerpc/aim/moea64_native.c +++ b/sys/powerpc/aim/moea64_native.c @@ -545,9 +545,8 @@ moea64_bootstrap_native(mmu_t mmup, vm_offset_t kernelstart, if (cpu_features2 & PPC_FEATURE2_ARCH_3_00) { moea64_part_table = (struct pate *)moea64_bootstrap_alloc(PART_SIZE, PART_SIZE); - if (hw_direct_map) - moea64_part_table = - (struct pate *)PHYS_TO_DMAP((vm_offset_t)moea64_part_table); + moea64_part_table = + (struct pate *)PHYS_TO_DMAP((vm_offset_t)moea64_part_table); } DISABLE_TRANS(msr); bzero(__DEVOLATILE(void *, moea64_pteg_table), moea64_pteg_count *