ArmPkg: Replace BSD License with BSD+Patent License

[mirror_edk2.git] / ArmPkg / Library / ArmLib / Arm / ArmLibSupport.asm

diff --git a/ArmPkg/Library/ArmLib/Arm/ArmLibSupport.asm b/ArmPkg/Library/ArmLib/Arm/ArmLibSupport.asm
index 85b0feee20d43f98f33672bb39b3b19bacaedec8..1265dddea6360b2a22cfddd17e53f2f7b351e508 100644 (file)
--- a/ArmPkg/Library/ArmLib/Arm/ArmLibSupport.asm
+++ b/ArmPkg/Library/ArmLib/Arm/ArmLibSupport.asm
@@ -3,13 +3,7 @@
 // Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
 // Copyright (c) 2011 - 2016, ARM Limited. All rights reserved.\r
 //\r
-// This program and the accompanying materials\r
-// are licensed and made available under the terms and conditions of the BSD License\r
-// which accompanies this distribution.  The full text of the license may be found at\r
-// http://opensource.org/licenses/bsd-license.php\r
-//\r
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+// SPDX-License-Identifier: BSD-2-Clause-Patent\r
 //\r
 //------------------------------------------------------------------------------\r
 \r
@@ -155,6 +149,9 @@
   mrc     p15, 0, r0, c1, c0, 0      // Read SCTLR into R0 (Read control register configuration data)\r
   bx      lr\r
 \r
+ RVCT_ASM_EXPORT ArmWriteSctlr\r
+  mcr     p15, 0, r0, c1, c0, 0\r
+  bx      lr\r
 \r
  RVCT_ASM_EXPORT ArmReadCpuActlr\r
   mrc     p15, 0, r0, c1, c0, 1\r
@@ -166,4 +163,12 @@
   isb\r
   bx      lr\r
 \r
+ RVCT_ASM_EXPORT ArmGetPhysicalAddressBits\r
+  mrc     p15, 0, r0, c0, c1, 4   ; MMFR0\r
+  and     r0, r0, #0xf            ; VMSA [3:0]\r
+  cmp     r0, #5                  ; >= 5 implies LPAE support\r
+  movlt   r0, #32                 ; 32 bits if no LPAE\r
+  movge   r0, #40                 ; 40 bits if LPAE\r
+  bx      lr\r
+\r
   END\r