Revert tree to r17801

Revert r17802 "BaseTools: AArch64: use explicit linker scripts"
Revert r17803 "ArmVirtPkg: build runtime drivers with 64 KB section alignment"
Revert r17804 "IntelFrameworkModulePkg: AcpiS3SaveDxe: prepare for End-of-Dxe callback"
Revert r17805 "IntelFrameworkModulePkg: AcpiS3SaveDxe: call S3Ready() at End-of-Dxe"
Revert r17806 "OvmfPkg: AcpiS3SaveDxe: prepare for End-of-Dxe callback"

Requested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17807 6f19259b-4bc3-4df7-8a09-765794883524

2 files changed, 0 insertions, 52 deletions

diff --git a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.c b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.c
index e0fa866535..6de1871f67 100644
--- a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.c
+++ b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.c
@@ -2,7 +2,6 @@
   This is an implementation of the ACPI S3 Save protocol.  This is defined in

   S3 boot path specification 0.9.

 

-Copyright (c) 2015, Red Hat, Inc.<BR>

 Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>

 

 This program and the accompanying materials

@@ -28,7 +27,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Guid/AcpiVariableCompatibility.h>

 #include <Guid/AcpiS3Context.h>

 #include <Guid/Acpi.h>

-#include <Guid/EventGroup.h>

 #include <Protocol/AcpiS3Save.h>

 #include <IndustryStandard/Acpi.h>

 

@@ -424,8 +422,6 @@ LegacyGetS3MemorySize (
   OUT UINTN                       *Size

   )

 {

-  ASSERT (FALSE);

-

   if (Size == NULL) {

     return EFI_INVALID_PARAMETER;

   }

@@ -473,8 +469,6 @@ S3Ready (
   }

   AlreadyEntered = TRUE;

 

-  ASSERT (LegacyMemoryAddress == NULL);

-

   AcpiS3Context = AllocateMemoryBelow4G (EfiReservedMemoryType, sizeof(*AcpiS3Context));

   ASSERT (AcpiS3Context != NULL);

   AcpiS3ContextBuffer = (EFI_PHYSICAL_ADDRESS)(UINTN)AcpiS3Context;

@@ -551,40 +545,6 @@ S3Ready (
 }

 

 /**

-  Callback function executed when the EndOfDxe event group is signaled.

-

-  @param[in] Event    Event whose notification function is being invoked.

-  @param[in] Context  The pointer to the notification function's context, which

-                      is implementation-dependent.

-**/

-VOID

-EFIAPI

-OnEndOfDxe (

-  IN EFI_EVENT Event,

-  IN VOID      *Context

-  )

-{

-  EFI_STATUS Status;

-

-  //

-  // Our S3Ready() function ignores both of its parameters, and always

-  // succeeds.

-  //

-  Status = S3Ready (

-             NULL, // This

-             NULL  // LegacyMemoryAddress

-             );

-  ASSERT_EFI_ERROR (Status);

-

-  //

-  // Close the event, deregistering the callback and freeing resources.

-  //

-  Status = gBS->CloseEvent (Event);

-  ASSERT_EFI_ERROR (Status);

-}

-

-

-/**

   The Driver Entry Point.

   

   The function is the driver Entry point which will produce AcpiS3SaveProtocol.

@@ -605,7 +565,6 @@ InstallAcpiS3Save (
   )

 {

   EFI_STATUS        Status;

-  EFI_EVENT         EndOfDxeEvent;

 

   if (!FeaturePcdGet(PcdPlatformCsmSupport)) {

     //

@@ -627,15 +586,5 @@ InstallAcpiS3Save (
                   &mS3Save

                   );

   ASSERT_EFI_ERROR (Status);

-

-  Status = gBS->CreateEventEx (

-                  EVT_NOTIFY_SIGNAL,

-                  TPL_CALLBACK,

-                  OnEndOfDxe,

-                  NULL, /* NotifyContext */

-                  &gEfiEndOfDxeEventGroupGuid,

-                  &EndOfDxeEvent

-                  );

-  ASSERT_EFI_ERROR (Status);

   return Status;

 }

diff --git a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf
index e5fb92e4c5..c5dec0546a 100644
--- a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf
+++ b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf
@@ -60,7 +60,6 @@
   ## SOMETIMES_CONSUMES ## Variable:L"AcpiGlobalVariable"

   ## SOMETIMES_PRODUCES ## Variable:L"AcpiGlobalVariable"

   gEfiAcpiVariableCompatiblityGuid

-  gEfiEndOfDxeEventGroupGuid                    ## CONSUMES  ## Event

 

 [Protocols]

   gEfiAcpiS3SaveProtocolGuid                    ## PRODUCES