/** @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
#include "PrePi.h"\r
#include "LzmaDecompress.h"\r
\r
-#define IS_XIP() (((UINT32)FixedPcdGet32 (PcdFdBaseAddress) > (UINT32)(FixedPcdGet32 (PcdSystemMemoryBase) + FixedPcdGet32 (PcdSystemMemorySize))) || \\r
- ((FixedPcdGet32 (PcdFdBaseAddress) + FixedPcdGet32 (PcdFdSize)) < FixedPcdGet32 (PcdSystemMemoryBase)))\r
+#define IS_XIP() (((UINT32)FixedPcdGet32 (PcdFdBaseAddress) > (UINT32)(FixedPcdGet64 (PcdSystemMemoryBase) + FixedPcdGet32 (PcdSystemMemorySize))) || \\r
+ ((FixedPcdGet32 (PcdFdBaseAddress) + FixedPcdGet32 (PcdFdSize)) < FixedPcdGet64 (PcdSystemMemoryBase)))\r
\r
// Not used when PrePi in run in XIP mode\r
UINTN mGlobalVariableBase = 0;\r
UINTN StacksSize;\r
\r
// If ensure the FD is either part of the System Memory or totally outside of the System Memory (XIP)\r
- ASSERT (IS_XIP() || \r
- ((FixedPcdGet32 (PcdFdBaseAddress) >= FixedPcdGet32 (PcdSystemMemoryBase)) &&\r
- ((UINT32)(FixedPcdGet32 (PcdFdBaseAddress) + FixedPcdGet32 (PcdFdSize)) <= (UINT32)(FixedPcdGet32 (PcdSystemMemoryBase) + FixedPcdGet32 (PcdSystemMemorySize)))));\r
+ ASSERT (IS_XIP() ||\r
+ ((FixedPcdGet32 (PcdFdBaseAddress) >= FixedPcdGet64 (PcdSystemMemoryBase)) &&\r
+ ((UINT32)(FixedPcdGet32 (PcdFdBaseAddress) + FixedPcdGet32 (PcdFdSize)) <= (UINT32)(FixedPcdGet64 (PcdSystemMemoryBase) + FixedPcdGet64 (PcdSystemMemorySize)))));\r
\r
- // Enable program flow prediction, if supported.\r
- ArmEnableBranchPrediction ();\r
-\r
- if (FixedPcdGet32(PcdVFPEnabled)) {\r
- ArmEnableVFP();\r
- }\r
+ // Initialize the architecture specific bits\r
+ ArchInitialize ();\r
\r
// Initialize the Serial Port\r
SerialPortInitialize ();\r
// Initialize the Debug Agent for Source Level Debugging\r
InitializeDebugAgent (DEBUG_AGENT_INIT_POSTMEM_SEC, NULL, NULL);\r
SaveAndSetDebugTimerInterrupt (TRUE);\r
- \r
+\r
// Declare the PI/UEFI memory region\r
HobList = HobConstructor (\r
(VOID*)UefiMemoryBase,\r
\r
// Create the Stacks HOB (reserve the memory for all stacks)\r
if (ArmIsMpCore ()) {\r
- StacksSize = PcdGet32 (PcdCPUCorePrimaryStackSize) + (FixedPcdGet32(PcdClusterCount) * 4 * FixedPcdGet32(PcdCPUCoreSecondaryStackSize));\r
+ StacksSize = PcdGet32 (PcdCPUCorePrimaryStackSize) +\r
+ ((FixedPcdGet32 (PcdCoreCount) - 1) * FixedPcdGet32 (PcdCPUCoreSecondaryStackSize));\r
} else {\r
StacksSize = PcdGet32 (PcdCPUCorePrimaryStackSize);\r
}\r
)\r
{\r
UINT64 StartTimeStamp;\r
- \r
+\r
ASSERT(!ArmIsMpCore() || (PcdGet32 (PcdCoreCount) > 1));\r
\r
// Initialize the platform specific controllers\r
ArmPlatformInitialize (MpId);\r
\r
- if (IS_PRIMARY_CORE(MpId) && PerformanceMeasurementEnabled ()) {\r
+ if (ArmPlatformIsPrimaryCore (MpId) && PerformanceMeasurementEnabled ()) {\r
// Initialize the Timer Library to setup the Timer HW controller\r
TimerConstructor ();\r
// We cannot call yet the PerformanceLib because the HOB List has not been initialized\r
StartTimeStamp = 0;\r
}\r
\r
- // Clean Data cache\r
- ArmCleanInvalidateDataCache ();\r
-\r
+ // Data Cache enabled on Primary core when MMU is enabled.\r
+ ArmDisableDataCache ();\r
+ // Invalidate Data cache\r
+ ArmInvalidateDataCache ();\r
// Invalidate instruction cache\r
ArmInvalidateInstructionCache ();\r
-\r
- //TODO:Drain Write Buffer\r
-\r
- // Enable Instruction & Data caches\r
- ArmEnableDataCache ();\r
+ // Enable Instruction Caches on all cores.\r
ArmEnableInstructionCache ();\r
\r
// Define the Global Variable region when we are not running in XIP\r
if (!IS_XIP()) {\r
- if (IS_PRIMARY_CORE(MpId)) {\r
+ if (ArmPlatformIsPrimaryCore (MpId)) {\r
mGlobalVariableBase = GlobalVariableBase;\r
if (ArmIsMpCore()) {\r
// Signal the Global Variable Region is defined (event: ARM_CPU_EVENT_DEFAULT)\r
ArmCallWFE ();\r
}\r
}\r
- \r
+\r
// If not primary Jump to Secondary Main\r
- if (IS_PRIMARY_CORE(MpId)) {\r
+ if (ArmPlatformIsPrimaryCore (MpId)) {\r
// Goto primary Main.\r
PrimaryMain (UefiMemoryBase, StacksBase, GlobalVariableBase, StartTimeStamp);\r
} else {\r