Sync all bug fixes between EDK1.04 and EDK1.06 into EdkCompatibilityPkg.

[mirror_edk2.git] / EdkCompatibilityPkg / Foundation / Library / RuntimeDxe / EfiRuntimeLib / Ia32 / RuntimeLib.c

diff --git a/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/Ia32/RuntimeLib.c b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/Ia32/RuntimeLib.c
index 9807b45035bbc890ccd0099f655405dc0f6c217f..29cdeb967a2173a172f11f754322f1f7ea8bd0fc 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/Ia32/RuntimeLib.c
+++ b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/Ia32/RuntimeLib.c
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
@@ -21,9 +21,11 @@ Abstract:
 \r
 #include "Tiano.h"\r
 #include "EfiRuntimeLib.h"\r
+#include "PeiHob.h"\r
 #include EFI_PROTOCOL_DEFINITION (CpuIo)\r
 #include EFI_PROTOCOL_DEFINITION (FirmwareVolumeBlock)\r
 #include EFI_GUID_DEFINITION (StatusCodeCallerId)\r
+#include EFI_GUID_DEFINITION (Hob)\r
 #include EFI_ARCH_PROTOCOL_DEFINITION (StatusCode)\r
 \r
 //\r
@@ -43,7 +45,81 @@ BOOLEAN                     mEfiAtRuntime = FALSE;
 FVB_ENTRY                   *mFvbEntry;\r
 \r
 #if (EFI_SPECIFICATION_VERSION >= 0x00020000)\r
-static EFI_STATUS_CODE_PROTOCOL  *gStatusCode = NULL;\r
+\r
+EFI_REPORT_STATUS_CODE      gReportStatusCode         = NULL;\r
+EFI_EVENT                   gEfiStatusCodeNotifyEvent = NULL;\r
+\r
+VOID\r
+EFIAPI\r
+OnStatusCodeInstall (\r
+  IN EFI_EVENT        Event,\r
+  IN VOID             *Context\r
+  )\r
+{\r
+  EFI_STATUS                Status;\r
+  EFI_STATUS_CODE_PROTOCOL  *StatusCode;\r
+\r
+  Status = gBS->LocateProtocol (&gEfiStatusCodeRuntimeProtocolGuid, NULL, (VOID **) &StatusCode);\r
+  if (!EFI_ERROR (Status)) {\r
+    gReportStatusCode = StatusCode->ReportStatusCode;\r
+  }\r
+}\r
+\r
+EFI_STATUS\r
+GetPeiProtocol (\r
+  IN EFI_GUID  *ProtocolGuid,\r
+  IN VOID      **Interface\r
+  )\r
+/*++\r
+\r
+Routine Description:\r
+\r
+  Searches for a Protocol Interface passed from PEI through a HOB\r
+\r
+Arguments:\r
+\r
+  ProtocolGuid - The Protocol GUID to search for in the HOB List\r
+\r
+  Interface    - A pointer to the interface for the Protocol GUID\r
+\r
+Returns:\r
+\r
+  EFI_SUCCESS   - The Protocol GUID was found and its interface is returned in Interface\r
+\r
+  EFI_NOT_FOUND - The Protocol GUID was not found in the HOB List\r
+\r
+--*/\r
+{\r
+  EFI_STATUS            Status;\r
+  EFI_PEI_HOB_POINTERS  GuidHob;\r
+\r
+  //\r
+  // Get Hob list\r
+  //\r
+  Status = EfiLibGetSystemConfigurationTable (&gEfiHobListGuid, (VOID **) &GuidHob.Raw);\r
+  if (EFI_ERROR (Status)) {\r
+    return Status;\r
+  }\r
+\r
+  for (Status = EFI_NOT_FOUND; EFI_ERROR (Status);) {\r
+    if (END_OF_HOB_LIST (GuidHob)) {\r
+      Status = EFI_NOT_FOUND;\r
+      break;\r
+    }\r
+\r
+    if (GET_HOB_TYPE (GuidHob) == EFI_HOB_TYPE_GUID_EXTENSION) {\r
+      if (EfiCompareGuid (ProtocolGuid, &GuidHob.Guid->Name)) {\r
+        Status     = EFI_SUCCESS;\r
+        *Interface = (VOID *) *(UINTN *) ((UINT8 *) (&GuidHob.Guid->Name) + sizeof (EFI_GUID));\r
+      }\r
+    }\r
+\r
+    GuidHob.Raw = GET_NEXT_HOB (GuidHob);\r
+  }\r
+\r
+  return Status;\r
+}\r
+\r
 #endif\r
 \r
 EFI_STATUS\r
@@ -214,9 +290,8 @@ Returns:
   //\r
   EfiConvertInternalPointer ((VOID **) &gCpuIo);\r
 #if (EFI_SPECIFICATION_VERSION >= 0x00020000)\r
-  if (gStatusCode != NULL) {\r
-    EfiConvertInternalPointer ((VOID **) &gStatusCode->ReportStatusCode);\r
-    EfiConvertInternalPointer ((VOID **) &gStatusCode);\r
+  if (gReportStatusCode != NULL) {\r
+    EfiConvertInternalPointer ((VOID **) &gReportStatusCode);\r
   }\r
 #endif\r
   EfiConvertInternalPointer ((VOID **) &mRT);\r
@@ -256,6 +331,9 @@ Returns:
 --*/\r
 {\r
   EFI_STATUS  Status;\r
+#if (EFI_SPECIFICATION_VERSION >= 0x00020000)\r
+  VOID *Registration;\r
+#endif\r
 \r
   if (mRuntimeLibInitialized) {\r
     return EFI_ALREADY_STARTED;\r
@@ -275,10 +353,26 @@ Returns:
   ASSERT_EFI_ERROR (Status);\r
 \r
 #if (EFI_SPECIFICATION_VERSION >= 0x00020000)\r
-  Status = gBS->LocateProtocol (&gEfiStatusCodeRuntimeProtocolGuid, NULL, (VOID **)&gStatusCode);\r
-  if (EFI_ERROR (Status)) {\r
-    gStatusCode = NULL;\r
-  }\r
+  //\r
+  // Register EFI_STATUS_CODE_PROTOCOL notify function\r
+  //\r
+  Status = gBS->CreateEvent (\r
+                  EFI_EVENT_NOTIFY_SIGNAL,\r
+                  EFI_TPL_CALLBACK,\r
+                  OnStatusCodeInstall,\r
+                  NULL,\r
+                  &gEfiStatusCodeNotifyEvent\r
+                  );\r
+  ASSERT_EFI_ERROR (Status);\r
+\r
+  Status = gBS->RegisterProtocolNotify (\r
+                  &gEfiStatusCodeRuntimeProtocolGuid,\r
+                  gEfiStatusCodeNotifyEvent,\r
+                  &Registration\r
+                  );\r
+  ASSERT_EFI_ERROR (Status);\r
+\r
+  gBS->SignalEvent (gEfiStatusCodeNotifyEvent);\r
 #endif\r
 \r
   Status = gBS->LocateProtocol (&gEfiCpuIoProtocolGuid, NULL, (VOID **) &gCpuIo);\r
@@ -363,6 +457,16 @@ Returns:
     ASSERT_EFI_ERROR (Status);\r
   }\r
 \r
+#if (EFI_SPECIFICATION_VERSION >= 0x00020000)\r
+  //\r
+  // Close EfiStatusCodeRuntimeProtocol notify function\r
+  //\r
+  if (gEfiStatusCodeNotifyEvent != NULL) {\r
+    Status = gBS->CloseEvent (gEfiStatusCodeNotifyEvent);\r
+    ASSERT_EFI_ERROR (Status);\r
+  }\r
+#endif\r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -390,6 +494,9 @@ Returns:
 --*/\r
 {\r
   EFI_STATUS  Status;\r
+#if (EFI_SPECIFICATION_VERSION >= 0x00020000)\r
+  VOID *Registration;\r
+#endif\r
 \r
   if (mRuntimeLibInitialized) {\r
     return EFI_ALREADY_STARTED;\r
@@ -406,10 +513,26 @@ Returns:
   ASSERT (mRT != NULL);\r
 \r
 #if (EFI_SPECIFICATION_VERSION >= 0x00020000)\r
-  Status = gBS->LocateProtocol (&gEfiStatusCodeRuntimeProtocolGuid, NULL, (VOID **)&gStatusCode);\r
-  if (EFI_ERROR (Status)) {\r
-    gStatusCode = NULL;\r
-  }\r
+  //\r
+  // Register EFI_STATUS_CODE_PROTOCOL notify function\r
+  //\r
+  Status = gBS->CreateEvent (\r
+                  EFI_EVENT_NOTIFY_SIGNAL,\r
+                  EFI_TPL_CALLBACK,\r
+                  OnStatusCodeInstall,\r
+                  NULL,\r
+                  &gEfiStatusCodeNotifyEvent\r
+                  );\r
+  ASSERT_EFI_ERROR (Status);\r
+\r
+  Status = gBS->RegisterProtocolNotify (\r
+                  &gEfiStatusCodeRuntimeProtocolGuid,\r
+                  gEfiStatusCodeNotifyEvent,\r
+                  &Registration\r
+                  );\r
+  ASSERT_EFI_ERROR (Status);\r
+\r
+  gBS->SignalEvent (gEfiStatusCodeNotifyEvent);\r
 #endif\r
 \r
   Status  = gBS->LocateProtocol (&gEfiCpuIoProtocolGuid, NULL, (VOID **) &gCpuIo);\r
@@ -761,8 +884,8 @@ EfiReportStatusCode (
   IN EFI_STATUS_CODE_TYPE     CodeType,\r
   IN EFI_STATUS_CODE_VALUE    Value,\r
   IN UINT32                   Instance,\r
-  IN EFI_GUID                 * CallerId,\r
-  IN EFI_STATUS_CODE_DATA     * Data OPTIONAL\r
+  IN EFI_GUID                 *CallerId OPTIONAL,\r
+  IN EFI_STATUS_CODE_DATA     *Data     OPTIONAL  \r
   )\r
 /*++\r
 \r
@@ -788,19 +911,30 @@ Returns:
 \r
 --*/\r
 {\r
-  EFI_STATUS  Status;\r
+  EFI_STATUS               Status;\r
 \r
-#if (EFI_SPECIFICATION_VERSION >= 0x00020000) \r
-  if (gStatusCode == NULL) {\r
+#if (EFI_SPECIFICATION_VERSION >= 0x00020000)\r
+  if (gReportStatusCode == NULL) {\r
+    //\r
+    // Because we've installed the protocol notification on EfiStatusCodeRuntimeProtocol,\r
+    //   running here indicates that the StatusCode driver has not started yet.\r
+    //\r
     if (EfiAtRuntime ()) {\r
+      //\r
+      // Running here only when StatusCode driver never starts.\r
+      //\r
       return EFI_UNSUPPORTED;\r
     }\r
-    Status = gBS->LocateProtocol (&gEfiStatusCodeRuntimeProtocolGuid, NULL, (VOID **)&gStatusCode);\r
-    if (EFI_ERROR (Status) || gStatusCode == NULL) {\r
+\r
+    //\r
+    // Try to get the PEI version of ReportStatusCode.\r
+    //\r
+    Status = GetPeiProtocol (&gEfiStatusCodeRuntimeProtocolGuid, (VOID **) &gReportStatusCode);\r
+    if (EFI_ERROR (Status)) {\r
       return EFI_UNSUPPORTED;\r
     }\r
   }\r
-  Status = gStatusCode->ReportStatusCode (CodeType, Value, Instance, CallerId, Data);\r
+  Status = gReportStatusCode (CodeType, Value, Instance, CallerId, Data);\r
 #else\r
   if (mRT == NULL) {\r
     return EFI_UNSUPPORTED;\r