ArmPlatformPkg: Rectify file modes

[mirror_edk2.git] / ArmPlatformPkg / Library / DebugSecExtraActionLib / DebugSecExtraActionLib.c

diff --git a/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.c b/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.c
old mode 100755 (executable)
new mode 100644 (file)
index f42f518..a452e38
--- a/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.c
+++ b/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.c
@@ -1,6 +1,6 @@
 /** @file\r
 *\r
-*  Copyright (c) 2011-2012, ARM Limited. All rights reserved.\r
+*  Copyright (c) 2011-2014, ARM Limited. All rights reserved.\r
 *\r
 *  This program and the accompanying materials\r
 *  are licensed and made available under the terms and conditions of the BSD License\r
@@ -30,24 +30,25 @@ NonSecureWaitForFirmware (
   VOID\r
   )\r
 {\r
-  VOID (*secondary_start)(VOID);\r
-  UINTN Interrupt;\r
+  VOID (*SecondaryStart)(VOID);\r
+  UINTN AcknowledgeInterrupt;\r
+  UINTN InterruptId;\r
 \r
   // The secondary cores will execute the firmware once wake from WFI.\r
-  secondary_start = (VOID (*)())PcdGet32(PcdFvBaseAddress);\r
+  SecondaryStart = (VOID (*)())(UINTN)PcdGet64 (PcdFvBaseAddress);\r
 \r
-  ArmCallWFI();\r
+  ArmCallWFI ();\r
 \r
   // Acknowledge the interrupt and send End of Interrupt signal.\r
-  Interrupt = ArmGicAcknowledgeInterrupt (PcdGet32 (PcdGicInterruptInterfaceBase));\r
+  AcknowledgeInterrupt = ArmGicAcknowledgeInterrupt (PcdGet32 (PcdGicInterruptInterfaceBase), &InterruptId);\r
   // Check if it is a valid interrupt ID\r
-  if ((Interrupt & ARM_GIC_ICCIAR_ACKINTID) < ArmGicGetMaxNumInterrupts (PcdGet32 (PcdGicDistributorBase))) {\r
+  if (InterruptId < ArmGicGetMaxNumInterrupts (PcdGet32 (PcdGicDistributorBase))) {\r
     // Got a valid SGI number hence signal End of Interrupt\r
-    ArmGicEndOfInterrupt (PcdGet32 (PcdGicInterruptInterfaceBase), Interrupt);\r
+    ArmGicEndOfInterrupt (PcdGet32 (PcdGicInterruptInterfaceBase), AcknowledgeInterrupt);\r
   }\r
 \r
   // Jump to secondary core entry point.\r
-  secondary_start ();\r
+  SecondaryStart ();\r
 \r
   // PEI Core should always load and never return\r
   ASSERT (FALSE);\r
@@ -68,6 +69,7 @@ ArmPlatformSecExtraAction (
 {\r
   CHAR8           Buffer[100];\r
   UINTN           CharCount;\r
+  UINTN*          StartAddress;\r
 \r
   if (FeaturePcdGet (PcdStandalone) == FALSE) {\r
 \r
@@ -76,7 +78,7 @@ ArmPlatformSecExtraAction (
     //\r
 \r
     if (ArmPlatformIsPrimaryCore (MpId)) {\r
-      UINTN*   StartAddress = (UINTN*)PcdGet32(PcdFvBaseAddress);\r
+      StartAddress = (UINTN*)(UINTN)PcdGet64 (PcdFvBaseAddress);\r
 \r
       // Patch the DRAM to make an infinite loop at the start address\r
       *StartAddress = 0xEAFFFFFE; // opcode for while(1)\r
@@ -84,7 +86,7 @@ ArmPlatformSecExtraAction (
       CharCount = AsciiSPrint (Buffer,sizeof (Buffer),"Waiting for firmware at 0x%08X ...\n\r",StartAddress);\r
       SerialPortWrite ((UINT8 *) Buffer, CharCount);\r
 \r
-      *JumpAddress = PcdGet32(PcdFvBaseAddress);\r
+      *JumpAddress = PcdGet64 (PcdFvBaseAddress);\r
     } else {\r
       // When the primary core is stopped by the hardware debugger to copy the firmware\r
       // into DRAM. The secondary cores are still running. As soon as the first bytes of\r
@@ -103,10 +105,10 @@ ArmPlatformSecExtraAction (
 \r
     if (ArmPlatformIsPrimaryCore (MpId)) {\r
       // Signal the secondary cores they can jump to PEI phase\r
-      ArmGicSendSgiTo (PcdGet32(PcdGicDistributorBase), ARM_GIC_ICDSGIR_FILTER_EVERYONEELSE, 0x0E, PcdGet32 (PcdGicSgiIntId));\r
+      ArmGicSendSgiTo (PcdGet32 (PcdGicDistributorBase), ARM_GIC_ICDSGIR_FILTER_EVERYONEELSE, 0x0E, PcdGet32 (PcdGicSgiIntId));\r
 \r
       // To enter into Non Secure state, we need to make a return from exception\r
-      *JumpAddress = PcdGet32(PcdFvBaseAddress);\r
+      *JumpAddress = PcdGet64 (PcdFvBaseAddress);\r
     } else {\r
       // We wait for the primary core to finish to initialize the System Memory. Otherwise the secondary\r
       // cores would make crash the system by setting their stacks in DRAM before the primary core has not\r
@@ -114,6 +116,6 @@ ArmPlatformSecExtraAction (
       *JumpAddress = (UINTN)NonSecureWaitForFirmware;\r
     }\r
   } else {\r
-    *JumpAddress = PcdGet32(PcdFvBaseAddress);\r
+    *JumpAddress = PcdGet64 (PcdFvBaseAddress);\r
   }\r
 }\r