Revision: 18994
http://sourceforge.net/p/edk2/code/18994
Author: abiesheuvel
Date: 2015-11-27 17:07:31 +0000 (Fri, 27 Nov 2015)
Log Message:
-----------
ArmPlatformPkg/PrePeiCore: remove global variable allocation from lowlevel init
Now that we dropped all ArmPlatformGlobalVariableLib dependencies,
there is no longer a need to allocate and clear out the global
variable region in the PrePeiCore init code. So remove it.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <[email protected]>
Reviewed-by: Leif Lindholm <[email protected]>
Modified Paths:
--------------
trunk/edk2/ArmPlatformPkg/PrePeiCore/AArch64/PrePeiCoreEntryPoint.S
trunk/edk2/ArmPlatformPkg/PrePeiCore/Arm/PrePeiCoreEntryPoint.S
trunk/edk2/ArmPlatformPkg/PrePeiCore/Arm/PrePeiCoreEntryPoint.asm
trunk/edk2/ArmPlatformPkg/PrePeiCore/PrePeiCore.c
trunk/edk2/ArmPlatformPkg/PrePeiCore/PrePeiCore.h
trunk/edk2/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
trunk/edk2/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
Modified: trunk/edk2/ArmPlatformPkg/PrePeiCore/AArch64/PrePeiCoreEntryPoint.S
===================================================================
--- trunk/edk2/ArmPlatformPkg/PrePeiCore/AArch64/PrePeiCoreEntryPoint.S
2015-11-27 17:07:17 UTC (rev 18993)
+++ trunk/edk2/ArmPlatformPkg/PrePeiCore/AArch64/PrePeiCoreEntryPoint.S
2015-11-27 17:07:31 UTC (rev 18994)
@@ -101,10 +101,5 @@
blr x3
_SetupPrimaryCoreStack:
- // x1 contains the top of the primary stack
- LoadConstantToReg (FixedPcdGet32(PcdPeiGlobalVariableSize), x2)
-
- // The reserved space for global variable must be 16-bytes aligned for
pushing
- // 128-bit variable on the stack
- SetPrimaryStack (x1, x2, x3, x4)
+ mov sp, x1
b _PrepareArguments
Modified: trunk/edk2/ArmPlatformPkg/PrePeiCore/Arm/PrePeiCoreEntryPoint.S
===================================================================
--- trunk/edk2/ArmPlatformPkg/PrePeiCore/Arm/PrePeiCoreEntryPoint.S
2015-11-27 17:07:17 UTC (rev 18993)
+++ trunk/edk2/ArmPlatformPkg/PrePeiCore/Arm/PrePeiCoreEntryPoint.S
2015-11-27 17:07:31 UTC (rev 18994)
@@ -82,12 +82,7 @@
blx r3
_SetupPrimaryCoreStack:
- // r1 contains the top of the primary stack
- LoadConstantToReg (FixedPcdGet32(PcdPeiGlobalVariableSize), r2)
-
- // The reserved space for global variable must be 8-bytes aligned for pushing
- // 64-bit variable on the stack
- SetPrimaryStack (r1, r2, r3)
+ mov sp, r1
b _PrepareArguments
_NeverReturn:
Modified: trunk/edk2/ArmPlatformPkg/PrePeiCore/Arm/PrePeiCoreEntryPoint.asm
===================================================================
--- trunk/edk2/ArmPlatformPkg/PrePeiCore/Arm/PrePeiCoreEntryPoint.asm
2015-11-27 17:07:17 UTC (rev 18993)
+++ trunk/edk2/ArmPlatformPkg/PrePeiCore/Arm/PrePeiCoreEntryPoint.asm
2015-11-27 17:07:31 UTC (rev 18994)
@@ -84,12 +84,7 @@
blx r3
_SetupPrimaryCoreStack
- // r1 contains the top of the primary stack
- LoadConstantToReg (FixedPcdGet32(PcdPeiGlobalVariableSize), r2)
-
- // The reserved space for global variable must be 8-bytes aligned for pushing
- // 64-bit variable on the stack
- SetPrimaryStack (r1, r2, r3)
+ mov sp, r1
b _PrepareArguments
_NeverReturn
Modified: trunk/edk2/ArmPlatformPkg/PrePeiCore/PrePeiCore.c
===================================================================
--- trunk/edk2/ArmPlatformPkg/PrePeiCore/PrePeiCore.c 2015-11-27 17:07:17 UTC
(rev 18993)
+++ trunk/edk2/ArmPlatformPkg/PrePeiCore/PrePeiCore.c 2015-11-27 17:07:31 UTC
(rev 18994)
@@ -17,23 +17,15 @@
#include <Library/DebugAgentLib.h>
#include <Library/ArmLib.h>
-#include <Ppi/ArmGlobalVariable.h>
-
#include "PrePeiCore.h"
CONST EFI_PEI_TEMPORARY_RAM_SUPPORT_PPI mTemporaryRamSupportPpi = {
PrePeiCoreTemporaryRamSupport };
-CONST ARM_GLOBAL_VARIABLE_PPI mGlobalVariablePpi = {
PrePeiCoreGetGlobalVariableMemory };
CONST EFI_PEI_PPI_DESCRIPTOR gCommonPpiTable[] = {
{
EFI_PEI_PPI_DESCRIPTOR_PPI,
&gEfiTemporaryRamSupportPpiGuid,
(VOID *) &mTemporaryRamSupportPpi
- },
- {
- EFI_PEI_PPI_DESCRIPTOR_PPI,
- &gArmGlobalVariablePpiGuid,
- (VOID *) &mGlobalVariablePpi
}
};
@@ -146,18 +138,3 @@
return EFI_SUCCESS;
}
-
-EFI_STATUS
-PrePeiCoreGetGlobalVariableMemory (
- OUT EFI_PHYSICAL_ADDRESS *GlobalVariableBase
- )
-{
- ASSERT (GlobalVariableBase != NULL);
-
- *GlobalVariableBase = (UINTN)PcdGet64 (PcdCPUCoresStackBase) +
- (UINTN)PcdGet32 (PcdCPUCorePrimaryStackSize) -
- (UINTN)PcdGet32 (PcdPeiGlobalVariableSize);
-
- return EFI_SUCCESS;
-}
-
Modified: trunk/edk2/ArmPlatformPkg/PrePeiCore/PrePeiCore.h
===================================================================
--- trunk/edk2/ArmPlatformPkg/PrePeiCore/PrePeiCore.h 2015-11-27 17:07:17 UTC
(rev 18993)
+++ trunk/edk2/ArmPlatformPkg/PrePeiCore/PrePeiCore.h 2015-11-27 17:07:31 UTC
(rev 18994)
@@ -40,11 +40,6 @@
IN UINTN CopySize
);
-EFI_STATUS
-PrePeiCoreGetGlobalVariableMemory (
- OUT EFI_PHYSICAL_ADDRESS *GlobalVariableBase
- );
-
VOID
SecSwitchStack (
INTN StackDelta
Modified: trunk/edk2/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
===================================================================
--- trunk/edk2/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf 2015-11-27
17:07:17 UTC (rev 18993)
+++ trunk/edk2/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf 2015-11-27
17:07:31 UTC (rev 18994)
@@ -59,7 +59,6 @@
[Ppis]
gEfiTemporaryRamSupportPpiGuid
- gArmGlobalVariablePpiGuid
gArmMpCoreInfoPpiGuid
[FeaturePcd]
@@ -73,8 +72,6 @@
gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize
gArmPlatformTokenSpaceGuid.PcdCPUCoreSecondaryStackSize
- gArmPlatformTokenSpaceGuid.PcdPeiGlobalVariableSize
-
gArmTokenSpaceGuid.PcdGicDistributorBase
gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase
gArmTokenSpaceGuid.PcdGicSgiIntId
Modified: trunk/edk2/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
===================================================================
--- trunk/edk2/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf 2015-11-27
17:07:17 UTC (rev 18993)
+++ trunk/edk2/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf 2015-11-27
17:07:31 UTC (rev 18994)
@@ -58,7 +58,6 @@
[Ppis]
gEfiTemporaryRamSupportPpiGuid
- gArmGlobalVariablePpiGuid
[FeaturePcd]
gArmPlatformTokenSpaceGuid.PcdSendSgiToBringUpSecondaryCores
@@ -70,5 +69,3 @@
gArmPlatformTokenSpaceGuid.PcdCPUCoresStackBase
gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize
gArmPlatformTokenSpaceGuid.PcdCPUCoreSecondaryStackSize
-
- gArmPlatformTokenSpaceGuid.PcdPeiGlobalVariableSize
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
