sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ArmPkg: Move ArmSmcLib from ArmPlatformLib to ArmPkg

Browse Source 
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
This commit is contained in:
oliviermartin
2013-03-06 00:01:49 +00:00
parent 28929e20d4
commit 166c01fbc2
12 changed files with 119 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb.dsc.inc
View File

@@ -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

2
ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc
View File

@@ -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)

1
ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
View File

@@ -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

44
ArmPlatformPkg/Include/Library/ArmSmcLib.h
View File

@@ -1,44 +0,0 @@
/** @file
*
* 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.
*
**/
#ifndef __ARM_SMC_LIB__
#define __ARM_SMC_LIB__
VOID
ArmCallSmc (
IN OUT UINTN *Rx
);
VOID
ArmCallSmcArg1 (
IN OUT UINTN *Rx,
IN OUT UINTN *Arg1
);
VOID
ArmCallSmcArg2 (
IN OUT UINTN *Rx,
IN OUT UINTN *Arg1,
IN OUT UINTN *Arg2
);
VOID
ArmCallSmcArg3 (
IN OUT UINTN *Rx,
IN OUT UINTN *Arg1,
IN OUT UINTN *Arg2,
IN OUT UINTN *Arg3
);
#endif

76
ArmPlatformPkg/Library/ArmSmcLib/ArmSmc.S
View File

@@ -1,76 +0,0 @@
//
// 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}
blx lr
// Arg1 in R1
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}
blx 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}
blx 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}
blx lr

76
ArmPlatformPkg/Library/ArmSmcLib/ArmSmc.asm
View File

@@ -1,76 +0,0 @@
//
// 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}
blx lr
// Arg1 in R1
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}
blx 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}
blx 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}
blx lr
END

28
ArmPlatformPkg/Library/ArmSmcLib/ArmSmcLib.inf
View File

@@ -1,28 +0,0 @@
#/** @file
#
# Copyright (c) 2012, 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.common]
ArmSmc.asm | RVCT
ArmSmc.S | GCC
[Packages]
MdePkg/MdePkg.dec
ArmPlatformPkg/ArmPlatformPkg.dec