sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ArmPkg/ArmSmcPsciResetSystemLib: remove EnterS3WithImmediateWake ()

Browse Source 
EnterS3WithImmediateWake () no longer has any callers, so remove it
from ResetSystemLib. Note that this means the hack to support warm
reboot by jumping to the SEC entry point with the MMU and caches off
is also no longer used, and can be removed as well, along with the PCD
PcdArmReenterPeiForCapsuleWarmReboot that was introduced for this
purpose.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
This commit is contained in:
Ard Biesheuvel
2020-01-06 18:16:14 +01:00
committed by mergify[bot]
parent 4cca792399
commit e3756ba90a
7 changed files with 0 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.c
View File

@@ -10,13 +10,10 @@
#include <PiDxe.h>
#include <Library/ArmMmuLib.h>
#include <Library/ArmSmcLib.h>
#include <Library/BaseLib.h>
#include <Library/DebugLib.h>
#include <Library/ResetSystemLib.h>
#include <Library/UefiBootServicesTableLib.h>
#include <Library/UefiRuntimeLib.h>
#include <IndustryStandard/ArmStdSmc.h>
@@ -76,79 +73,6 @@ ResetShutdown (
ArmCallSmc (&ArmSmcArgs);
}
VOID DisableMmuAndReenterPei (VOID);
/**
This function causes the system to enter S3 and then wake up immediately.
If this function returns, it means that the system does not support S3 feature.
**/
VOID
EFIAPI
EnterS3WithImmediateWake (
VOID
)
{
EFI_PHYSICAL_ADDRESS Alloc;
EFI_MEMORY_DESCRIPTOR *MemMap;
UINTN MemMapSize;
UINTN MapKey, DescriptorSize;
UINT32 DescriptorVersion;
EFI_STATUS Status;
if (FeaturePcdGet (PcdArmReenterPeiForCapsuleWarmReboot) &&
!EfiAtRuntime ()) {
//
// At boot time, we are the only core running, so we can implement the
// immediate wake (which is used by capsule update) by disabling the MMU
// and interrupts, and jumping to the PEI entry point.
//
//
// Obtain the size of the memory map
//
MemMapSize = 0;
MemMap = NULL;
Status = gBS->GetMemoryMap (&MemMapSize, MemMap, &MapKey, &DescriptorSize,
&DescriptorVersion);
ASSERT (Status == EFI_BUFFER_TOO_SMALL);
//
// Add some slack to the allocation to cater for changes in the memory
// map if ExitBootServices () fails the first time around.
//
MemMapSize += SIZE_4KB;
Status = gBS->AllocatePages (AllocateAnyPages, EfiBootServicesData,
EFI_SIZE_TO_PAGES (MemMapSize), &Alloc);
ASSERT_EFI_ERROR (Status);
MemMap = (EFI_MEMORY_DESCRIPTOR *)(UINTN)Alloc;
Status = gBS->GetMemoryMap (&MemMapSize, MemMap, &MapKey, &DescriptorSize,
&DescriptorVersion);
ASSERT_EFI_ERROR (Status);
Status = gBS->ExitBootServices (gImageHandle, MapKey);
if (EFI_ERROR (Status)) {
//
// ExitBootServices () may fail the first time around if an event fired
// right after the call to GetMemoryMap() which allocated or freed memory.
// Since that first call to ExitBootServices () will disarm the timer,
// this is guaranteed not to happen again, so one additional attempt
// should suffice.
//
Status = gBS->GetMemoryMap (&MemMapSize, MemMap, &MapKey, &DescriptorSize,
&DescriptorVersion);
ASSERT_EFI_ERROR (Status);
Status = gBS->ExitBootServices (gImageHandle, MapKey);
ASSERT_EFI_ERROR (Status);
}
DisableMmuAndReenterPei ();
}
}
/**
This function causes a systemwide reset. The exact type of the reset is
defined by the EFI_GUID that follows the Null-terminated Unicode string passed