diff options
Diffstat (limited to 'src/arch/arm64/armv8/mmu.c')
| -rw-r--r-- | src/arch/arm64/armv8/mmu.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/arch/arm64/armv8/mmu.c b/src/arch/arm64/armv8/mmu.c index 3cedbcf58f..6105f9a9b2 100644 --- a/src/arch/arm64/armv8/mmu.c +++ b/src/arch/arm64/armv8/mmu.c @@ -224,7 +224,7 @@ void mmu_config_range(void *start, size_t size, uint64_t tag) /* ARMv8 MMUs snoop L1 data cache, no need to flush it. */ dsb(); - tlbiall_el3(); + tlbiall(); dsb(); isb(); } @@ -245,15 +245,15 @@ void mmu_init(void) assert((u8 *)root == _ttb); /* Initialize TTBR */ - raw_write_ttbr0_el3((uintptr_t)root); + raw_write_ttbr0((uintptr_t)root); /* Initialize MAIR indices */ - raw_write_mair_el3(MAIR_ATTRIBUTES); + raw_write_mair(MAIR_ATTRIBUTES); /* Initialize TCR flags */ - raw_write_tcr_el3(TCR_TOSZ | TCR_IRGN0_NM_WBWAC | TCR_ORGN0_NM_WBWAC | - TCR_SH0_IS | TCR_TG0_4KB | TCR_PS_256TB | - TCR_TBI_USED); + raw_write_tcr(TCR_TOSZ | TCR_IRGN0_NM_WBWAC | TCR_ORGN0_NM_WBWAC | + TCR_SH0_IS | TCR_TG0_4KB | TCR_PS_256TB | + TCR_TBI_USED); } /* Func : mmu_save_context @@ -264,10 +264,10 @@ void mmu_save_context(struct mmu_context *mmu_context) assert(mmu_context); /* Back-up MAIR_ATTRIBUTES */ - mmu_context->mair = raw_read_mair_el3(); + mmu_context->mair = raw_read_mair(); /* Back-up TCR value */ - mmu_context->tcr = raw_read_tcr_el3(); + mmu_context->tcr = raw_read_tcr(); } /* Func : mmu_restore_context @@ -278,13 +278,13 @@ void mmu_restore_context(const struct mmu_context *mmu_context) assert(mmu_context); /* Restore TTBR */ - raw_write_ttbr0_el3((uintptr_t)_ttb); + raw_write_ttbr0((uintptr_t)_ttb); /* Restore MAIR indices */ - raw_write_mair_el3(mmu_context->mair); + raw_write_mair(mmu_context->mair); /* Restore TCR flags */ - raw_write_tcr_el3(mmu_context->tcr); + raw_write_tcr(mmu_context->tcr); /* invalidate tlb since ttbr is updated. */ tlb_invalidate_all(); @@ -295,8 +295,8 @@ void mmu_enable(void) assert_correct_ttb_mapping(_ttb); assert_correct_ttb_mapping((void *)((uintptr_t)_ettb - 1)); - uint32_t sctlr = raw_read_sctlr_el3(); - sctlr |= SCTLR_C | SCTLR_M | SCTLR_I; - raw_write_sctlr_el3(sctlr); + uint32_t sctlr = raw_read_sctlr(); + raw_write_sctlr(sctlr | SCTLR_C | SCTLR_M | SCTLR_I); + isb(); } |