From 92bec97f5c39b16b1599d41337ae4556b6da6c72 Mon Sep 17 00:00:00 2001 From: Jeenu Viswambharan Date: Fri, 27 Apr 2018 15:06:57 +0100 Subject: [PATCH] xlat v1: Provide direct MMU-enabling stubs An earlier patch split MMU-enabling function for translation library v2. Although we don't intend to introduce the exact same functionality for xlat v1, this patch introduces stubs for directly enabling MMU to maintain API-compatibility. Change-Id: Id7d56e124c80af71de999fcda10f1734b50bca97 Signed-off-by: Jeenu Viswambharan --- lib/xlat_tables/aarch32/xlat_tables.c | 7 ++++++- lib/xlat_tables/aarch64/xlat_tables.c | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/xlat_tables/aarch32/xlat_tables.c b/lib/xlat_tables/aarch32/xlat_tables.c index 720d4461..dd639397 100644 --- a/lib/xlat_tables/aarch32/xlat_tables.c +++ b/lib/xlat_tables/aarch32/xlat_tables.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2016-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -130,3 +130,8 @@ void enable_mmu_secure(unsigned int flags) /* Ensure the MMU enable takes effect immediately */ isb(); } + +void enable_mmu_direct(unsigned int flags) +{ + enable_mmu_secure(flags); +} diff --git a/lib/xlat_tables/aarch64/xlat_tables.c b/lib/xlat_tables/aarch64/xlat_tables.c index a72c6454..5717516a 100644 --- a/lib/xlat_tables/aarch64/xlat_tables.c +++ b/lib/xlat_tables/aarch64/xlat_tables.c @@ -181,6 +181,11 @@ void init_xlat_tables(void) \ /* Ensure the MMU enable takes effect immediately */ \ isb(); \ + } \ + \ + void enable_mmu_direct_el##_el(unsigned int flags) \ + { \ + enable_mmu_el##_el(flags); \ } /* Define EL1 and EL3 variants of the function enabling the MMU */ -- 2.30.2