commit 118f27eecdf8eea38e78666f57668087b82c99a2 Author: Brandon Bergren Date: Sun May 10 13:22:49 2020 -0500 Radix fixes. diff --git a/sys/powerpc/aim/mmu_radix.c b/sys/powerpc/aim/mmu_radix.c index b7dbff9b14a..880fc32f15d 100644 --- a/sys/powerpc/aim/mmu_radix.c +++ b/sys/powerpc/aim/mmu_radix.c @@ -1926,7 +1926,7 @@ mmu_radix_proctab_register(vm_paddr_t proctabpa, uint64_t table_size) uint64_t pagetab, proctab; pagetab = be64toh(isa3_parttab[0].pagetab); - proctab = proctabpa | table_size | PARTTAB_GR; + proctab = DMAP_TO_PHYS(proctabpa) | table_size | PARTTAB_GR; mmu_parttab_update(0, pagetab, proctab); } diff --git a/sys/powerpc/include/pmap_private.h b/sys/powerpc/include/pmap_private.h index 3650b901e08..27d487abae2 100644 --- a/sys/powerpc/include/pmap_private.h +++ b/sys/powerpc/include/pmap_private.h @@ -126,7 +126,7 @@ radix_tlbie(uint8_t ric, uint8_t prs, uint16_t is, uint32_t pid, uint32_t lpid, rs = ((uint64_t)pid << 32) | lpid; rb = va | is | ap; __asm __volatile(PPC_TLBIE_5(%0, %1, %2, %3, 1) : : - "r" (rb), "r" (rs), "i" (ric), "i" (prs)); + "r" (rb), "r" (rs), "i" (ric), "i" (prs) : "memory"); } static __inline void