From 07783fdd67e40fa7cff3ebf34399c1ab65937802 Mon Sep 17 00:00:00 2001 From: Supreeth Venkatesh Date: Fri, 29 Jul 2016 18:06:32 -0500 Subject: [PATCH] ArmPkg/Library: Add ArmReadSctlr for AArch64 ArmLib defines a prototype for the ArmReadSctlr() function, but the AArch64 implementation is missing. So add it. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: John Powell Signed-off-by: Supreeth Venkatesh [ardb: update commit log] Signed-off-by: Ard Biesheuvel --- ArmPkg/Library/ArmLib/Common/AArch64/ArmLibSupport.S | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/ArmPkg/Library/ArmLib/Common/AArch64/ArmLibSupport.S b/ArmPkg/Library/ArmLib/Common/AArch64/ArmLibSupport.S index a6fd5e3445..c9f3bd1e88 100644 --- a/ArmPkg/Library/ArmLib/Common/AArch64/ArmLibSupport.S +++ b/ArmPkg/Library/ArmLib/Common/AArch64/ArmLibSupport.S @@ -1,7 +1,7 @@ #------------------------------------------------------------------------------ # # Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.
-# Copyright (c) 2011 - 2014, ARM Limited. All rights reserved. +# Copyright (c) 2011 - 2016, ARM Limited. All rights reserved. # # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -39,6 +39,7 @@ GCC_ASM_EXPORT (ArmCallWFE) GCC_ASM_EXPORT (ArmCallSEV) GCC_ASM_EXPORT (ArmReadCpuActlr) GCC_ASM_EXPORT (ArmWriteCpuActlr) +GCC_ASM_EXPORT (ArmReadSctlr) #------------------------------------------------------------------------------ @@ -205,4 +206,13 @@ ASM_PFX(ArmWriteCpuActlr): isb ret +ASM_PFX(ArmReadSctlr): + EL1_OR_EL2_OR_EL3(x1) +1:mrs x0, sctlr_el1 + ret +2:mrs x0, sctlr_el2 + ret +3:mrs x0, sctlr_el3 +4:ret + ASM_FUNCTION_REMOVE_IF_UNREFERENCED -- 2.39.2