Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ArmPlatformPkg/Sec: Move 'ArmPlatformSecExtraAction' before we set NSACR & SCR 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13061 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
oliviermartin 2012-02-28 17:29:41 +00:00
parent a853088911
commit 3d93aeaef8
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ArmPlatformPkg/Sec/Sec.c
View File

@ -32,6 +32,7 @@ CEntryPoint (
{ {
CHAR8 Buffer[100]; CHAR8 Buffer[100];
UINTN CharCount; UINTN CharCount;
UINTN JumpAddress;
// Invalidate the data cache. Doesn't have to do the Data cache clean. // Invalidate the data cache. Doesn't have to do the Data cache clean.
ArmInvalidateDataCache(); ArmInvalidateDataCache();
@ -100,10 +101,6 @@ CEntryPoint (
// Test if Trustzone is supported on this platform // Test if Trustzone is supported on this platform
if (FixedPcdGetBool (PcdTrustzoneSupport)) { if (FixedPcdGetBool (PcdTrustzoneSupport)) {
// Ensure the Monitor Stack Base & Size have been set
ASSERT(PcdGet32(PcdCPUCoresSecMonStackBase) != 0);
ASSERT(PcdGet32(PcdCPUCoreSecMonStackSize) != 0);
if (ArmIsMpCore()) { if (ArmIsMpCore()) {
// Setup SMP in Non Secure world // Setup SMP in Non Secure world
ArmCpuSetupSmpNonSecure (GET_CORE_ID(MpId)); ArmCpuSetupSmpNonSecure (GET_CORE_ID(MpId));
@ -121,7 +118,11 @@ CEntryPoint (
// Status Register as the the current one (CPSR). // Status Register as the the current one (CPSR).
copy_cpsr_into_spsr (); copy_cpsr_into_spsr ();
NonTrustedWorldTransition (MpId); // Call the Platform specific function to execute additional actions if required
JumpAddress = PcdGet32 (PcdFvBaseAddress);
ArmPlatformSecExtraAction (MpId, &JumpAddress);
NonTrustedWorldTransition (MpId, JumpAddress);
} }
ASSERT (0); // We must never return from the above function ASSERT (0); // We must never return from the above function
} }
@ -131,6 +132,8 @@ TrustedWorldInitialization (
IN UINTN MpId IN UINTN MpId
) )
{ {
UINTN JumpAddress;
//-------------------- Monitor Mode --------------------- //-------------------- Monitor Mode ---------------------
// Set up Monitor World (Vector Table, etc) // Set up Monitor World (Vector Table, etc)
@ -155,25 +158,25 @@ TrustedWorldInitialization (
// Transfer the interrupt to Non-secure World // Transfer the interrupt to Non-secure World
ArmGicSetupNonSecure (PcdGet32(PcdGicDistributorBase), PcdGet32(PcdGicInterruptInterfaceBase)); ArmGicSetupNonSecure (PcdGet32(PcdGicDistributorBase), PcdGet32(PcdGicInterruptInterfaceBase));
// Call the Platform specific fucntion to execute additional actions if required
JumpAddress = PcdGet32 (PcdFvBaseAddress);
ArmPlatformSecExtraAction (MpId, &JumpAddress);
// Write to CP15 Non-secure Access Control Register // Write to CP15 Non-secure Access Control Register
ArmWriteNsacr (PcdGet32 (PcdArmNsacr)); ArmWriteNsacr (PcdGet32 (PcdArmNsacr));
// CP15 Secure Configuration Register // CP15 Secure Configuration Register
ArmWriteScr (PcdGet32 (PcdArmScr)); ArmWriteScr (PcdGet32 (PcdArmScr));
NonTrustedWorldTransition (MpId); NonTrustedWorldTransition (MpId, JumpAddress);
} }
VOID VOID
NonTrustedWorldTransition ( NonTrustedWorldTransition (
IN UINTN MpId IN UINTN MpId,
IN UINTN JumpAddress
) )
{ {
UINTN JumpAddress;
JumpAddress = PcdGet32 (PcdFvBaseAddress);
ArmPlatformSecExtraAction (MpId, &JumpAddress);
// If PcdArmNonSecModeTransition is defined then set this specific mode to CPSR before the transition // If PcdArmNonSecModeTransition is defined then set this specific mode to CPSR before the transition
// By not set, the mode for Non Secure World is SVC // By not set, the mode for Non Secure World is SVC
if (PcdGet32 (PcdArmNonSecModeTransition) != 0) { if (PcdGet32 (PcdArmNonSecModeTransition) != 0) {

3
ArmPlatformPkg/Sec/SecInternal.h
View File

@ -33,7 +33,8 @@ TrustedWorldInitialization (
VOID VOID
NonTrustedWorldTransition ( NonTrustedWorldTransition (
IN UINTN MpId IN UINTN MpId,
IN UINTN JumpAddress
); );
VOID VOID