From: oliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Mon, 26 Mar 2012 10:51:43 +0000 (+0000)
Subject: ArmPlatformPkg/Sec: Move ArmGicSetupNonSecure() prior to initialize platform-specific... 
X-Git-Tag: edk2-stable201903~13547
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=80dfbc1122b053aa603b329840dd2da5ea148969

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

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