ArmPkg: Move ArmSmcLib from ArmPlatformLib to ArmPkg

A ArmSmcLib Null implementation has also been added for CPU without the ARM Security Extension (Trustzone support). Signed-off-by: Olivier Martin <[email protected]> git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14164 6f19259b-4bc3-4df7-8a09-765794883524
DNA64 · Mar 6, 2013 · 166c01f · 166c01f
1 parent 28929e2
commit 166c01f
Show file tree

Hide file tree

Showing 12 changed files with 119 additions and 16 deletions.
diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc
@@ -63,6 +63,7 @@
 
   ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf
   CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
+  ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
   ArmDisassemblerLib|ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf
   DmaLib|ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf
 
@@ -125,6 +126,9 @@
   ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf
   ArmPkg/Drivers/TimerDxe/TimerDxe.inf
 
+  ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
+  ArmPkg/Library/ArmSmcLibNull/ArmSmcLibNull.inf
+
   ArmPkg/Filesystem/SemihostFs/SemihostFs.inf
 
   ArmPkg/Application/LinuxLoader/LinuxAtagLoader.inf

diff --git a/ArmPlatformPkg/Include/Library/ArmSmcLib.h → ArmPkg/Include/Library/ArmSmcLib.h b/ArmPlatformPkg/Include/Library/ArmSmcLib.h → ArmPkg/Include/Library/ArmSmcLib.h
diff --git a/ArmPlatformPkg/Library/ArmSmcLib/ArmSmc.S → ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.S b/ArmPlatformPkg/Library/ArmSmcLib/ArmSmc.S → ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.S
@@ -27,9 +27,8 @@ ASM_PFX(ArmCallSmc):
     smc     #0
     str     r0,[r1]
     pop     {r1}
-    blx     lr
+    bx      lr
 
-// Arg1 in R1
 ASM_PFX(ArmCallSmcArg1):
     push    {r2-r3}
     mov     r2, r0
@@ -40,7 +39,7 @@ ASM_PFX(ArmCallSmcArg1):
     str     r0,[r2]
     str     r1,[r3]
     pop     {r2-r3}
-    blx     lr
+    bx      lr
 
 ASM_PFX(ArmCallSmcArg2):
     push    {r3-r5}
@@ -55,7 +54,7 @@ ASM_PFX(ArmCallSmcArg2):
     str     r1,[r4]
     str     r2,[r5]
     pop     {r3-r5}
-    blx     lr
+    bx      lr
 
 ASM_PFX(ArmCallSmcArg3):
     push    {r4-r7}
@@ -73,4 +72,4 @@ ASM_PFX(ArmCallSmcArg3):
     str     r2,[r6]
     str     r3,[r7]
     pop     {r4-r7}
-    blx     lr
+    bx      lr
diff --git a/ArmPlatformPkg/Library/ArmSmcLib/ArmSmc.asm → ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.asm b/ArmPlatformPkg/Library/ArmSmcLib/ArmSmc.asm → ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.asm
@@ -25,9 +25,8 @@ ArmCallSmc
     smc     #0
     str     r0,[r1]
     pop     {r1}
-    blx     lr
+    bx      lr
 
-// Arg1 in R1
 ArmCallSmcArg1
     push    {r2-r3}
     mov     r2, r0
@@ -38,7 +37,7 @@ ArmCallSmcArg1
     str     r0,[r2]
     str     r1,[r3]
     pop     {r2-r3}
-    blx     lr
+    bx      lr
 
 ArmCallSmcArg2
     push    {r3-r5}
@@ -53,7 +52,7 @@ ArmCallSmcArg2
     str     r1,[r4]
     str     r2,[r5]
     pop     {r3-r5}
-    blx     lr
+    bx      lr
 
 ArmCallSmcArg3
     push    {r4-r7}
@@ -71,6 +70,6 @@ ArmCallSmcArg3
     str     r2,[r6]
     str     r3,[r7]
     pop     {r4-r7}
-    blx     lr
+    bx      lr
 
     END
diff --git a/...atformPkg/Library/ArmSmcLib/ArmSmcLib.inf → ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf b/...atformPkg/Library/ArmSmcLib/ArmSmcLib.inf → ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
@@ -1,6 +1,6 @@
 #/** @file
 #  
-#  Copyright (c) 2012, ARM Ltd. All rights reserved.<BR>
+#  Copyright (c) 2012-2013, ARM Ltd. All rights reserved.<BR>
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
 #  which accompanies this distribution.  The full text of the license may be found at
@@ -19,10 +19,10 @@
   VERSION_STRING                 = 1.0
   LIBRARY_CLASS                  = ArmSmcLib
 
-[Sources.common]
-  ArmSmc.asm    | RVCT
-  ArmSmc.S      | GCC
+[Sources.ARM]
+  Arm/ArmSmc.asm    | RVCT
+  Arm/ArmSmc.S      | GCC
 
 [Packages]
   MdePkg/MdePkg.dec
-  ArmPlatformPkg/ArmPlatformPkg.dec
+  ArmPkg/ArmPkg.dec
diff --git a/ArmPkg/Library/ArmSmcLibNull/Arm/ArmSmcNull.S b/ArmPkg/Library/ArmSmcLibNull/Arm/ArmSmcNull.S
@@ -0,0 +1,33 @@
+//
+//  Copyright (c) 2012-2013, 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
+//  which accompanies this distribution.  The full text of the license may be found at
+//  http://opensource.org/licenses/bsd-license.php
+//
+//  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+//
+//
+
+.text
+.align 3
+
+GCC_ASM_EXPORT(ArmCallSmc)
+GCC_ASM_EXPORT(ArmCallSmcArg1)
+GCC_ASM_EXPORT(ArmCallSmcArg2)
+GCC_ASM_EXPORT(ArmCallSmcArg3)
+
+ASM_PFX(ArmCallSmc):
+  bx     lr
+
+// Arg1 in R1
+ASM_PFX(ArmCallSmcArg1):
+  bx     lr
+
+ASM_PFX(ArmCallSmcArg2):
+  bx     lr
+
+ASM_PFX(ArmCallSmcArg3):
+  bx     lr
diff --git a/ArmPkg/Library/ArmSmcLibNull/Arm/ArmSmcNull.asm b/ArmPkg/Library/ArmSmcLibNull/Arm/ArmSmcNull.asm
@@ -0,0 +1,34 @@
+//
+//  Copyright (c) 2012-2013, 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
+//  which accompanies this distribution.  The full text of the license may be found at
+//  http://opensource.org/licenses/bsd-license.php
+//
+//  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+//
+//
+
+    EXPORT ArmCallSmc
+    EXPORT ArmCallSmcArg1
+    EXPORT ArmCallSmcArg2
+    EXPORT ArmCallSmcArg3
+
+    AREA   ArmSmc, CODE, READONLY
+
+ArmCallSmc
+  bx     lr
+
+// Arg1 in R1
+ArmCallSmcArg1
+  bx     lr
+
+ArmCallSmcArg2
+  bx     lr
+
+ArmCallSmcArg3
+  bx     lr
+
+  END
diff --git a/ArmPkg/Library/ArmSmcLibNull/ArmSmcLibNull.inf b/ArmPkg/Library/ArmSmcLibNull/ArmSmcLibNull.inf
@@ -0,0 +1,31 @@
+#/** @file
+#  
+#  ArmSmcLib when no SMC support is desired (might be the case for CPU without the
+#  Trustzone support / ARM Security Extension)
+#
+#  Copyright (c) 2012-2013, ARM Ltd. All rights reserved.<BR>
+#  This program and the accompanying materials
+#  are licensed and made available under the terms and conditions of the BSD License
+#  which accompanies this distribution.  The full text of the license may be found at
+#  http://opensource.org/licenses/bsd-license.php
+#  
+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#
+#**/
+
+[Defines]
+  INF_VERSION                    = 0x00010005
+  BASE_NAME                      = ArmSmcLibNull
+  FILE_GUID                      = 140e8004-16e1-4de1-a352-c6ef51110ecf
+  MODULE_TYPE                    = BASE
+  VERSION_STRING                 = 1.0
+  LIBRARY_CLASS                  = ArmSmcLib
+
+[Sources.ARM]
+  Arm/ArmSmcNull.asm    | RVCT
+  Arm/ArmSmcNull.S      | GCC
+
+[Packages]
+  MdePkg/MdePkg.dec
+  ArmPkg/ArmPkg.dec
diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb.dsc.inc b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb.dsc.inc
@@ -61,6 +61,7 @@
   ArmDisassemblerLib|ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf
   DmaLib|ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf
   ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf
+  ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
 
   # RealView Emulation Board Specific Libraries
   EfiResetSystemLib|ArmPlatformPkg/ArmRealViewEbPkg/Library/ResetSystemLib/ResetSystemLib.inf

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc
@@ -45,7 +45,7 @@
   LcdPlatformLib|ArmPlatformPkg/ArmVExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpressLib.inf
 
   TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf 
-  ArmSmcLib|ArmPlatformPkg/Library/ArmSmcLib/ArmSmcLib.inf
+  ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
 
 [BuildOptions]
 !ifdef $(ARM_BIGLITTLE_TC2)

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
@@ -62,6 +62,7 @@
   DmaLib|ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf
   ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf
   ArmPlatformStackLib|ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf
+  ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
 
   # Versatile Express Specific Libraries
   ArmPlatformSysConfigLib|ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf

diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc b/BeagleBoardPkg/BeagleBoardPkg.dsc
@@ -35,6 +35,7 @@
   ArmPlatformLib|BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardLib.inf
   ArmCpuLib|ArmPkg/Drivers/ArmCpuLib/ArmCortexA8Lib/ArmCortexA8Lib.inf
   ArmPlatformStackLib|ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf
+  ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
 
   HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
   UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf