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 <olivier.martin@arm.com>



git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14164 6f19259b-4bc3-4df7-8a09-765794883524

6 files changed, 276 insertions, 0 deletions

diff --git a/ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.S b/ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.S
new file mode 100644
index 0000000000..c9c0740feb
--- /dev/null
+++ b/ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.S
@@ -0,0 +1,75 @@
+//

+//  Copyright (c) 2012, 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

+.arch_extension sec

+

+GCC_ASM_EXPORT(ArmCallSmc)

+GCC_ASM_EXPORT(ArmCallSmcArg1)

+GCC_ASM_EXPORT(ArmCallSmcArg2)

+GCC_ASM_EXPORT(ArmCallSmcArg3)

+

+ASM_PFX(ArmCallSmc):

+    push    {r1}

+    mov     r1, r0

+    ldr     r0,[r1]

+    smc     #0

+    str     r0,[r1]

+    pop     {r1}

+    bx      lr

+

+ASM_PFX(ArmCallSmcArg1):

+    push    {r2-r3}

+    mov     r2, r0

+    mov     r3, r1

+    ldr     r0,[r2]

+    ldr     r1,[r3]

+    smc     #0

+    str     r0,[r2]

+    str     r1,[r3]

+    pop     {r2-r3}

+    bx      lr

+

+ASM_PFX(ArmCallSmcArg2):

+    push    {r3-r5}

+    mov     r3, r0

+    mov     r4, r1

+    mov     r5, r2

+    ldr     r0,[r3]

+    ldr     r1,[r4]

+    ldr     r2,[r5]

+    smc     #0

+    str     r0,[r3]

+    str     r1,[r4]

+    str     r2,[r5]

+    pop     {r3-r5}

+    bx      lr

+

+ASM_PFX(ArmCallSmcArg3):

+    push    {r4-r7}

+    mov     r4, r0

+    mov     r5, r1

+    mov     r6, r2

+    mov     r7, r3

+    ldr     r0,[r4]

+    ldr     r1,[r5]

+    ldr     r2,[r6]

+    ldr     r3,[r7]

+    smc     #0

+    str     r0,[r4]

+    str     r1,[r5]

+    str     r2,[r6]

+    str     r3,[r7]

+    pop     {r4-r7}

+    bx      lr

diff --git a/ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.asm b/ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.asm
new file mode 100644
index 0000000000..f46bd7ecd4
--- /dev/null
+++ b/ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.asm
@@ -0,0 +1,75 @@
+//

+//  Copyright (c) 2012, 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

+    push    {r1}

+    mov     r1, r0

+    ldr     r0,[r1]

+    smc     #0

+    str     r0,[r1]

+    pop     {r1}

+    bx      lr

+

+ArmCallSmcArg1

+    push    {r2-r3}

+    mov     r2, r0

+    mov     r3, r1

+    ldr     r0,[r2]

+    ldr     r1,[r3]

+    smc     #0

+    str     r0,[r2]

+    str     r1,[r3]

+    pop     {r2-r3}

+    bx      lr

+

+ArmCallSmcArg2

+    push    {r3-r5}

+    mov     r3, r0

+    mov     r4, r1

+    mov     r5, r2

+    ldr     r0,[r3]

+    ldr     r1,[r4]

+    ldr     r2,[r5]

+    smc     #0

+    str     r0,[r3]

+    str     r1,[r4]

+    str     r2,[r5]

+    pop     {r3-r5}

+    bx      lr

+

+ArmCallSmcArg3

+    push    {r4-r7}

+    mov     r4, r0

+    mov     r5, r1

+    mov     r6, r2

+    mov     r7, r3

+    ldr     r0,[r4]

+    ldr     r1,[r5]

+    ldr     r2,[r6]

+    ldr     r3,[r7]

+    smc     #0

+    str     r0,[r4]

+    str     r1,[r5]

+    str     r2,[r6]

+    str     r3,[r7]

+    pop     {r4-r7}

+    bx      lr

+

+    END

diff --git a/ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf b/ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
new file mode 100644
index 0000000000..a3e12d26d1
--- /dev/null
+++ b/ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
@@ -0,0 +1,28 @@
+#/** @file

+#  

+#  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                      = ArmSmcLib

+  FILE_GUID                      = eb3f17d5-a3cc-4eac-8912-84162d0f79da 

+  MODULE_TYPE                    = BASE

+  VERSION_STRING                 = 1.0

+  LIBRARY_CLASS                  = ArmSmcLib

+  

+[Sources.ARM]

+  Arm/ArmSmc.asm    | RVCT

+  Arm/ArmSmc.S      | GCC

+

+[Packages]

+  MdePkg/MdePkg.dec

+  ArmPkg/ArmPkg.dec

diff --git a/ArmPkg/Library/ArmSmcLibNull/Arm/ArmSmcNull.S b/ArmPkg/Library/ArmSmcLibNull/Arm/ArmSmcNull.S
new file mode 100644
index 0000000000..4896dd0c9b
--- /dev/null
+++ 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
new file mode 100644
index 0000000000..24c20752e3
--- /dev/null
+++ 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
new file mode 100644
index 0000000000..fed6e95ddf
--- /dev/null
+++ 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