*\r
**/\r
\r
-#include <PiPei.h>\r
-#include <Ppi/TemporaryRamSupport.h>\r
-#include <Library/DebugLib.h>\r
-#include <Library/PcdLib.h>\r
-#include <Library/IoLib.h>\r
#include <Library/BaseLib.h>\r
-#include <Library/BaseMemoryLib.h>\r
+#include <Library/DebugAgentLib.h>\r
+#include <Library/PrintLib.h>\r
#include <Library/ArmLib.h>\r
-#include <Chipset/ArmV7.h>\r
+#include <Library/SerialPortLib.h>\r
\r
-EFI_STATUS\r
-EFIAPI\r
-SecTemporaryRamSupport (\r
- IN CONST EFI_PEI_SERVICES **PeiServices,\r
- IN EFI_PHYSICAL_ADDRESS TemporaryMemoryBase,\r
- IN EFI_PHYSICAL_ADDRESS PermanentMemoryBase,\r
- IN UINTN CopySize\r
- );\r
+#include <Ppi/ArmGlobalVariable.h>\r
+#include <Chipset/ArmV7.h>\r
\r
-VOID\r
-SecSwitchStack (\r
- INTN StackDelta\r
- );\r
+#include "PrePeiCore.h"\r
\r
-TEMPORARY_RAM_SUPPORT_PPI mSecTemporaryRamSupportPpi = {SecTemporaryRamSupport};\r
+EFI_PEI_TEMPORARY_RAM_SUPPORT_PPI mSecTemporaryRamSupportPpi = {SecTemporaryRamSupport};\r
+ARM_GLOBAL_VARIABLE_PPI mGlobalVariablePpi = { PrePeiCoreGetGlobalVariableMemory };\r
\r
-EFI_PEI_PPI_DESCRIPTOR gSecPpiTable[] = {\r
+EFI_PEI_PPI_DESCRIPTOR gCommonPpiTable[] = {\r
{\r
- EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST,\r
+ EFI_PEI_PPI_DESCRIPTOR_PPI,\r
&gEfiTemporaryRamSupportPpiGuid,\r
&mSecTemporaryRamSupportPpi\r
+ },\r
+ {\r
+ EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST,\r
+ &gArmGlobalVariablePpiGuid,\r
+ &mGlobalVariablePpi\r
}\r
};\r
\r
-// Vector Table for Pei Phase\r
-VOID PeiVectorTable (VOID);\r
-\r
-\r
VOID\r
CEntryPoint (\r
- IN UINTN CoreId,\r
+ IN UINTN MpId,\r
IN EFI_PEI_CORE_ENTRY_POINT PeiCoreEntryPoint\r
)\r
{\r
ArmInvalidateInstructionCache();\r
\r
// Enable Instruction & Data caches\r
- ArmEnableDataCache();\r
- ArmEnableInstructionCache();\r
+ ArmEnableDataCache ();\r
+ ArmEnableInstructionCache ();\r
\r
//\r
// Note: Doesn't have to Enable CPU interface in non-secure world,\r
//Note: The MMU will be enabled by MemoryPeim. Only the primary core will have the MMU on.\r
\r
//If not primary Jump to Secondary Main\r
- if(0 == CoreId) {\r
- //Goto primary Main.\r
- primary_main(PeiCoreEntryPoint);\r
+ if (IS_PRIMARY_CORE(MpId)) {\r
+ // Initialize the Debug Agent for Source Level Debugging\r
+ InitializeDebugAgent (DEBUG_AGENT_INIT_POSTMEM_SEC, NULL, NULL);\r
+ SaveAndSetDebugTimerInterrupt (TRUE);\r
+\r
+ // Goto primary Main.\r
+ PrimaryMain (PeiCoreEntryPoint);\r
} else {\r
- secondary_main(CoreId);\r
+ SecondaryMain (MpId);\r
}\r
\r
// PEI Core should always load and never return\r
{\r
//\r
// Migrate the whole temporary memory to permenent memory.\r
- // \r
+ //\r
CopyMem (\r
(VOID*)(UINTN)PermanentMemoryBase, \r
(VOID*)(UINTN)TemporaryMemoryBase, \r
\r
SecSwitchStack((UINTN)(PermanentMemoryBase - TemporaryMemoryBase));\r
\r
+EFI_STATUS\r
+PrePeiCoreGetGlobalVariableMemory (\r
+ OUT EFI_PHYSICAL_ADDRESS *GlobalVariableBase\r
+ )\r
+{\r
+ ASSERT (GlobalVariableBase != NULL);\r
+\r
+ *GlobalVariableBase = (UINTN)PcdGet32 (PcdCPUCoresStackBase) +\r
+ (UINTN)PcdGet32 (PcdCPUCorePrimaryStackSize) -\r
+ (UINTN)PcdGet32 (PcdPeiGlobalVariableSize);\r
+\r
return EFI_SUCCESS;\r
}\r
\r