Revert "Capsule-on-Disk entire Patch

This reverts commit 0d4aa276d1f6e0cb9d71a7fb88b30c416ba6d5a3,
                    6470a43160183cd48cad8901c912a48811f18b13,
                    fd7286089542ee7a98cfea00be45ceb3561e0b20,
                    7837d1249807b4248079699097bc993254235d7a,
                    6b32af2e105f9b5454a55b581f2dc365c5eb6397,
                    8636f70b5a763ed1c03b292708f9c5543e531ea9,
                    f17935321a5b818a66e999632ef371b374b98f0c
due to incorrect review process.

Cc: Wei6 Xu <wei6.xu@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Signed-off-by: Zhang, Chao B <chao.b.zhang@intel.com>
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>

3 files changed, 11 insertions, 42 deletions

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h
index 90b5b5b211..063fefb414 100644
--- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h
@@ -2,7 +2,7 @@
   Master header file for DxeIpl PEIM. All source files in this module should

   include this file for common definitions.

 

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

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

 SPDX-License-Identifier: BSD-2-Clause-Patent

 

 **/

@@ -21,7 +21,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Ppi/LoadFile.h>

 #include <Ppi/S3Resume2.h>

 #include <Ppi/RecoveryModule.h>

-#include <Ppi/CapsuleOnDisk.h>

 #include <Ppi/VectorHandoffInfo.h>

 

 #include <Guid/MemoryTypeInformation.h>

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
index abc3217b01..62bb3f3077 100644
--- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
@@ -5,7 +5,7 @@
 #  PPI to discover and dispatch the DXE Foundation and components that are

 #  needed to run the DXE Foundation.

 #

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

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

 #  Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>

 #

 #  SPDX-License-Identifier: BSD-2-Clause-Patent

@@ -76,19 +76,17 @@
   ArmMmuLib

 

 [Ppis]

-  gEfiDxeIplPpiGuid                      ## PRODUCES

-  gEfiPeiDecompressPpiGuid               ## PRODUCES

-  gEfiEndOfPeiSignalPpiGuid              ## SOMETIMES_PRODUCES # Not produced on S3 boot path

-  gEfiPeiReadOnlyVariable2PpiGuid        ## SOMETIMES_CONSUMES

-  gEfiPeiLoadFilePpiGuid                 ## SOMETIMES_CONSUMES

-  gEfiPeiS3Resume2PpiGuid                ## SOMETIMES_CONSUMES # Consumed on S3 boot path

-  gEfiPeiRecoveryModulePpiGuid           ## SOMETIMES_CONSUMES # Consumed on recovery boot path

+  gEfiDxeIplPpiGuid                 ## PRODUCES

+  gEfiPeiDecompressPpiGuid          ## PRODUCES

+  gEfiEndOfPeiSignalPpiGuid         ## SOMETIMES_PRODUCES # Not produced on S3 boot path

+  gEfiPeiReadOnlyVariable2PpiGuid   ## SOMETIMES_CONSUMES

+  gEfiPeiLoadFilePpiGuid            ## SOMETIMES_CONSUMES

+  gEfiPeiS3Resume2PpiGuid           ## SOMETIMES_CONSUMES # Consumed on S3 boot path

+  gEfiPeiRecoveryModulePpiGuid      ## SOMETIMES_CONSUMES # Consumed on recovery boot path

   ## SOMETIMES_CONSUMES

   ## UNDEFINED # HOB

   gEfiVectorHandoffInfoPpiGuid

-  gEfiPeiMemoryDiscoveredPpiGuid         ## SOMETIMES_CONSUMES

-  gEdkiiPeiBootInCapsuleOnDiskModePpiGuid  ## SOMETIMES_CONSUMES

-  gEdkiiPeiCapsuleOnDiskPpiGuid            ## SOMETIMES_CONSUMES # Consumed on firmware update boot path

+  gEfiPeiMemoryDiscoveredPpiGuid    ## SOMETIMES_CONSUMES

 

 [Guids]

   ## SOMETIMES_CONSUMES ## Variable:L"MemoryTypeInformation"

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
index 859184e0d1..c6e5b83309 100644
--- a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
@@ -3,7 +3,7 @@
   Responsibility of this module is to load the DXE Core from a Firmware Volume.

 

 Copyright (c) 2016 HP Development Company, L.P.

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

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

 SPDX-License-Identifier: BSD-2-Clause-Patent

 

 **/

@@ -265,9 +265,7 @@ DxeLoadCore (
   UINTN                                     DataSize;

   EFI_PEI_S3_RESUME2_PPI                    *S3Resume;

   EFI_PEI_RECOVERY_MODULE_PPI               *PeiRecovery;

-  EFI_PEI_CAPSULE_ON_DISK_PPI               *PeiCapsuleOnDisk;

   EFI_MEMORY_TYPE_INFORMATION               MemoryData[EfiMaxMemoryType + 1];

-  VOID                                      *CapsuleOnDiskModePpi;

 

   //

   // if in S3 Resume, restore configure

@@ -332,32 +330,6 @@ DxeLoadCore (
     //

     // Now should have a HOB with the DXE core

     //

-  } else if (BootMode == BOOT_ON_FLASH_UPDATE) {

-    //

-    // If Capsule On Disk mode, call storage stack to read Capsule Relocation file

-    // IoMmmu is highly recommmended to enable before reading

-    //

-    Status = PeiServicesLocatePpi (

-               &gEdkiiPeiBootInCapsuleOnDiskModePpiGuid,

-               0,

-               NULL,

-               &CapsuleOnDiskModePpi

-               );

-    if (!EFI_ERROR(Status)) {

-      Status = PeiServicesLocatePpi (

-                 &gEdkiiPeiCapsuleOnDiskPpiGuid,

-                 0,

-                 NULL,

-                 (VOID **) &PeiCapsuleOnDisk

-                 );

-

-      //

-      // Whether failed, still goes to Firmware Update boot path. BDS will clear corresponding indicator and reboot later on

-      //

-      if (!EFI_ERROR (Status)) {

-        Status = PeiCapsuleOnDisk->LoadCapsuleOnDisk (PeiServices, PeiCapsuleOnDisk);

-      }

-    }

   }

 

   if (GetFirstGuidHob ((CONST EFI_GUID *)&gEfiMemoryTypeInformationGuid) == NULL) {