MdeModulePkg: Add Reset2 ppi support in PEI CORE.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

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

4 files changed, 78 insertions, 3 deletions

diff --git a/MdeModulePkg/Core/Pei/PeiMain.h b/MdeModulePkg/Core/Pei/PeiMain.h
index 8c7cfe4cac..24983201d0 100644
--- a/MdeModulePkg/Core/Pei/PeiMain.h
+++ b/MdeModulePkg/Core/Pei/PeiMain.h
@@ -1,7 +1,7 @@
 /** @file

   Definition of Pei Core Structures and Services

   

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

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

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -20,6 +20,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Ppi/MemoryDiscovered.h>

 #include <Ppi/StatusCode.h>

 #include <Ppi/Reset.h>

+#include <Ppi/Reset2.h>

 #include <Ppi/FirmwareVolume.h>

 #include <Ppi/FirmwareVolumeInfo.h>

 #include <Ppi/FirmwareVolumeInfo2.h>

@@ -964,6 +965,30 @@ PeiResetSystem (
   );

 

 /**

+  Resets the entire platform.

+

+  @param[in] ResetType      The type of reset to perform.

+  @param[in] ResetStatus    The status code for the reset.

+  @param[in] DataSize       The size, in bytes, of WatchdogData.

+  @param[in] ResetData      For a ResetType of EfiResetCold, EfiResetWarm, or EfiResetShutdown

+                            the data buffer starts with a Null-terminated string, optionally

+                            followed by additional binary data. The string is a description

+                            that the caller may use to further indicate the reason for the

+                            system reset. ResetData is only valid if ResetStatus is something

+                            other than EFI_SUCCESS unless the ResetType is EfiResetPlatformSpecific

+                            where a minimum amount of ResetData is always required.

+

+**/

+VOID

+EFIAPI

+PeiResetSystem2 (

+  IN EFI_RESET_TYPE     ResetType,

+  IN EFI_STATUS         ResetStatus,

+  IN UINTN              DataSize,

+  IN VOID               *ResetData OPTIONAL

+  );

+

+/**

 

   Initialize PeiCore Fv List.

 

diff --git a/MdeModulePkg/Core/Pei/PeiMain.inf b/MdeModulePkg/Core/Pei/PeiMain.inf
index 342e344559..0acac47c1f 100644
--- a/MdeModulePkg/Core/Pei/PeiMain.inf
+++ b/MdeModulePkg/Core/Pei/PeiMain.inf
@@ -6,7 +6,7 @@
 # 2) Dispatch PEIM from discovered FV.

 # 3) Handoff control to DxeIpl to load DXE core and enter DXE phase.

 #

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

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

 #

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -100,6 +100,7 @@
   gEfiPeiSecurity2PpiGuid                       ## NOTIFY

   gEfiTemporaryRamSupportPpiGuid                ## SOMETIMES_CONSUMES

   gEfiTemporaryRamDonePpiGuid                   ## SOMETIMES_CONSUMES

+  gEfiPeiReset2PpiGuid                          ## SOMETIMES_CONSUMES

 

 [Pcd]  

   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxFvSupported                   ## CONSUMES

diff --git a/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c b/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
index d019141c6e..05e0d0fda4 100644
--- a/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
+++ b/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
@@ -63,7 +63,8 @@ EFI_PEI_SERVICES  gPs = {
   PeiFfsGetVolumeInfo,

   PeiRegisterForShadow,

   PeiFfsFindSectionData3,

-  PeiFfsGetFileInfo2

+  PeiFfsGetFileInfo2,

+  PeiResetSystem2

 };

 

 /**

diff --git a/MdeModulePkg/Core/Pei/Reset/Reset.c b/MdeModulePkg/Core/Pei/Reset/Reset.c
index 793244b391..2e9ac8215b 100644
--- a/MdeModulePkg/Core/Pei/Reset/Reset.c
+++ b/MdeModulePkg/Core/Pei/Reset/Reset.c
@@ -58,3 +58,51 @@ PeiResetSystem (
   return  EFI_NOT_AVAILABLE_YET;

 }

 

+/**

+  Resets the entire platform.

+

+  @param[in] ResetType      The type of reset to perform.

+  @param[in] ResetStatus    The status code for the reset.

+  @param[in] DataSize       The size, in bytes, of WatchdogData.

+  @param[in] ResetData      For a ResetType of EfiResetCold, EfiResetWarm, or EfiResetShutdown

+                            the data buffer starts with a Null-terminated string, optionally

+                            followed by additional binary data. The string is a description

+                            that the caller may use to further indicate the reason for the

+                            system reset. ResetData is only valid if ResetStatus is something

+                            other than EFI_SUCCESS unless the ResetType is EfiResetPlatformSpecific

+                            where a minimum amount of ResetData is always required.

+

+**/

+VOID

+EFIAPI

+PeiResetSystem2 (

+  IN EFI_RESET_TYPE     ResetType,

+  IN EFI_STATUS         ResetStatus,

+  IN UINTN              DataSize,

+  IN VOID               *ResetData OPTIONAL

+  )

+{

+  EFI_STATUS            Status;

+  EFI_PEI_RESET2_PPI    *Reset2Ppi;

+

+  Status = PeiServicesLocatePpi (

+             &gEfiPeiReset2PpiGuid,

+             0,

+             NULL,

+             (VOID **)&Reset2Ppi

+             );

+

+  if (!EFI_ERROR (Status)) {

+    Reset2Ppi->ResetSystem (ResetType, ResetStatus, DataSize, ResetData);

+    return;

+  }

+

+  //

+  // Report Status Code that Reset2 PPI is not available.

+  //

+  REPORT_STATUS_CODE (

+    EFI_ERROR_CODE | EFI_ERROR_MINOR,

+    (EFI_SOFTWARE_PEI_CORE | EFI_SW_PS_EC_RESET_NOT_AVAILABLE)

+    );

+}

+