diff options
| author | oliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524> | 2012-03-26 10:51:43 +0000 |
|---|---|---|
| committer | oliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524> | 2012-03-26 10:51:43 +0000 |
| commit | 80dfbc1122b053aa603b329840dd2da5ea148969 (patch) | |
| tree | 47c798a5d8dd223517252a604b2482e11af41373 /ArmPlatformPkg | |
| parent | 59a2b365ea8797007f8aab0f9e89e2c040a83ae6 (diff) | |
| download | edk2-80dfbc1122b053aa603b329840dd2da5ea148969.tar.gz edk2-80dfbc1122b053aa603b329840dd2da5ea148969.tar.bz2 edk2-80dfbc1122b053aa603b329840dd2da5ea148969.zip | |
ArmPlatformPkg/Sec: Move ArmGicSetupNonSecure() prior to initialize platform-specific security bit
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13127 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'ArmPlatformPkg')
| -rw-r--r-- | ArmPlatformPkg/Sec/Sec.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ArmPlatformPkg/Sec/Sec.c b/ArmPlatformPkg/Sec/Sec.c index 97895532c5..6b478ac0b4 100644 --- a/ArmPlatformPkg/Sec/Sec.c +++ b/ArmPlatformPkg/Sec/Sec.c @@ -146,6 +146,10 @@ TrustedWorldInitialization ( // Setup the Trustzone Chipsets if (IS_PRIMARY_CORE(MpId)) { + // Transfer the interrupt to Non-secure World + ArmGicSetupNonSecure (PcdGet32(PcdGicDistributorBase), PcdGet32(PcdGicInterruptInterfaceBase)); + + // Initialize platform specific security policy ArmPlatformTrustzoneInit (); if (ArmIsMpCore()) { @@ -160,9 +164,6 @@ TrustedWorldInitialization ( ArmCpuSynchronizeWait (ARM_CPU_EVENT_SECURE_INIT); } - // Transfer the interrupt to Non-secure World - ArmGicSetupNonSecure (PcdGet32(PcdGicDistributorBase), PcdGet32(PcdGicInterruptInterfaceBase)); - // Call the Platform specific fucntion to execute additional actions if required JumpAddress = PcdGet32 (PcdFvBaseAddress); ArmPlatformSecExtraAction (MpId, &JumpAddress); |