Work around fix to bypass to register GUID on S3 resume.

DxeIpl does not shadow itself on S3 resume.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3995 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdePkg/Library/PeiDxeExtractGuidedSectionLib/PeiDxeExtractGuidedSectionLib.c b/MdePkg/Library/PeiDxeExtractGuidedSectionLib/PeiDxeExtractGuidedSectionLib.c
index 5de312aa92c96bea364d8c20607b7f65b8597c48..33c582b371536971e0412602c51b919a44e005c3 100644 (file)
--- a/MdePkg/Library/PeiDxeExtractGuidedSectionLib/PeiDxeExtractGuidedSectionLib.c
+++ b/MdePkg/Library/PeiDxeExtractGuidedSectionLib/PeiDxeExtractGuidedSectionLib.c
@@ -26,6 +26,7 @@ Abstract:
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/ExtractGuidedSectionLib.h>\r
+#include <Library/HobLib.h>\r
 \r
 STATIC GUID                 *mExtractHandlerGuidTable;\r
 STATIC UINT32               mNumberOfExtractHandler;\r
@@ -109,6 +110,13 @@ ExtractGuidedSectionRegisterHandlers (
   IN        EXTRACT_GUIDED_SECTION_DECODE_HANDLER    DecodeHandler\r
   )\r
 {\r
+  if (GetBootModeHob () == BOOT_ON_S3_RESUME) {\r
+    //\r
+    // (Work around fix to bypass registeration on S3 resume.)\r
+    // S3 resume does not shadow DxeIpl.\r
+    //\r
+    return RETURN_SUCCESS;\r
+  }\r
   //\r
   // Check input paramter.\r
   //\r

diff --git a/MdePkg/Library/PeiDxeExtractGuidedSectionLib/PeiDxeExtractGuidedSectionLib.inf b/MdePkg/Library/PeiDxeExtractGuidedSectionLib/PeiDxeExtractGuidedSectionLib.inf
index 0316107219c95ef63f7ec515b49fd0e407eb4d51..7cb040c5253ce1253f61f2acad1794d88aca505e 100644 (file)
--- a/MdePkg/Library/PeiDxeExtractGuidedSectionLib/PeiDxeExtractGuidedSectionLib.inf
+++ b/MdePkg/Library/PeiDxeExtractGuidedSectionLib/PeiDxeExtractGuidedSectionLib.inf
@@ -43,6 +43,7 @@
   MemoryAllocationLib\r
   BaseMemoryLib\r
   DebugLib\r
+  HobLib\r
 \r
 [FixedPcd.common]\r
   gEfiMdePkgTokenSpaceGuid.PcdMaximumGuidedExtractHandler \r