Use SmmStatusCode protocol in EfiInitializeSmmDriverLib() funciton.

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

diff --git a/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/Ia32/RuntimeLib.c b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/Ia32/RuntimeLib.c
index 83820a3bbabc66b36a85c51221a17b7be5e318a0..3e973e09092fcae58a1162a3ef87ab8edd33eec3 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/Ia32/RuntimeLib.c
+++ b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/Ia32/RuntimeLib.c
@@ -27,6 +27,8 @@ Abstract:
 #include EFI_GUID_DEFINITION (StatusCodeCallerId)\r
 #include EFI_GUID_DEFINITION (Hob)\r
 #include EFI_ARCH_PROTOCOL_DEFINITION (StatusCode)\r
+#include EFI_PROTOCOL_DEFINITION (SmmStatusCode)\r
+#include EFI_PROTOCOL_DEFINITION (SmmBase)\r
 \r
 //\r
 // Driver Lib Module Globals\r
@@ -36,6 +38,7 @@ static EFI_EVENT            mRuntimeNotifyEvent     = NULL;
 static EFI_EVENT            mEfiVirtualNotifyEvent  = NULL;\r
 static BOOLEAN              mRuntimeLibInitialized  = FALSE;\r
 static BOOLEAN              mEfiGoneVirtual         = FALSE;\r
+static BOOLEAN              mInSmm                  = FALSE;\r
 \r
 //\r
 // Runtime Global, but you should use the Lib functions\r
@@ -43,6 +46,7 @@ static BOOLEAN              mEfiGoneVirtual         = FALSE;
 EFI_CPU_IO_PROTOCOL         *gCpuIo;\r
 BOOLEAN                     mEfiAtRuntime = FALSE;\r
 FVB_ENTRY                   *mFvbEntry;\r
+EFI_SMM_STATUS_CODE_PROTOCOL  *gSmmStatusCodeProtocol = NULL;\r
 \r
 #if (EFI_SPECIFICATION_VERSION >= 0x00020000)\r
 \r
@@ -493,10 +497,8 @@ Returns:
 \r
 --*/\r
 {\r
-  EFI_STATUS  Status;\r
-#if (EFI_SPECIFICATION_VERSION >= 0x00020000)\r
-  VOID *Registration;\r
-#endif\r
+  EFI_STATUS               Status;\r
+  EFI_SMM_BASE_PROTOCOL    *SmmBase;\r
 \r
   if (mRuntimeLibInitialized) {\r
     return EFI_ALREADY_STARTED;\r
@@ -512,28 +514,21 @@ Returns:
   mRT = SystemTable->RuntimeServices;\r
   ASSERT (mRT != NULL);\r
 \r
-#if (EFI_SPECIFICATION_VERSION >= 0x00020000)\r
   //\r
-  // Register EFI_STATUS_CODE_PROTOCOL notify function\r
+  // Check whether it is in SMM mode.\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
+  Status  = gBS->LocateProtocol (&gEfiSmmBaseProtocolGuid, NULL, &SmmBase);\r
+  if (!EFI_ERROR (Status)) {\r
+    SmmBase->InSmm (SmmBase, &mInSmm);\r
+  }\r
 \r
-  gBS->SignalEvent (gEfiStatusCodeNotifyEvent);\r
-#endif\r
+  //\r
+  // Directly locate SmmStatusCode protocol\r
+  //\r
+  Status = gBS->LocateProtocol (&gEfiSmmStatusCodeProtocolGuid, NULL, &gSmmStatusCodeProtocol);\r
+  if (EFI_ERROR (Status)) {\r
+    gSmmStatusCodeProtocol = NULL;\r
+  }\r
 \r
   Status  = gBS->LocateProtocol (&gEfiCpuIoProtocolGuid, NULL, (VOID **) &gCpuIo);\r
   if (EFI_ERROR (Status)) {\r
@@ -912,6 +907,14 @@ Returns:
 --*/\r
 {\r
   EFI_STATUS               Status;\r
+  \r
+  if (mInSmm) {\r
+    if (gSmmStatusCodeProtocol == NULL) {\r
+      return EFI_UNSUPPORTED;\r
+    }\r
+    Status = gSmmStatusCodeProtocol->ReportStatusCode (gSmmStatusCodeProtocol, CodeType, Value, Instance, CallerId, Data);\r
+    return Status;\r
+  }\r
 \r
 #if (EFI_SPECIFICATION_VERSION >= 0x00020000)\r
   if (gReportStatusCode == NULL) {\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/X64/RuntimeLib.c b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/X64/RuntimeLib.c
index a81bd0fb0f7ff781889f96112e7087f7e240c220..4dfca7c853c9bc3136b09f2c8cfea922afee7001 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/X64/RuntimeLib.c
+++ b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/X64/RuntimeLib.c
@@ -27,6 +27,8 @@ Abstract:
 #include EFI_GUID_DEFINITION (StatusCodeCallerId)\r
 #include EFI_GUID_DEFINITION (Hob)\r
 #include EFI_ARCH_PROTOCOL_DEFINITION (StatusCode)\r
+#include EFI_PROTOCOL_DEFINITION (SmmStatusCode)\r
+#include EFI_PROTOCOL_DEFINITION (SmmBase)\r
 \r
 //\r
 // Driver Lib Module Globals\r
@@ -36,6 +38,7 @@ static EFI_EVENT            mRuntimeNotifyEvent     = NULL;
 static EFI_EVENT            mEfiVirtualNotifyEvent  = NULL;\r
 static BOOLEAN              mRuntimeLibInitialized  = FALSE;\r
 static BOOLEAN              mEfiGoneVirtual         = FALSE;\r
+static BOOLEAN              mInSmm                  = FALSE;\r
 \r
 //\r
 // Runtime Global, but you should use the Lib functions\r
@@ -43,6 +46,7 @@ static BOOLEAN              mEfiGoneVirtual         = FALSE;
 EFI_CPU_IO_PROTOCOL         *gCpuIo;\r
 BOOLEAN                     mEfiAtRuntime = FALSE;\r
 FVB_ENTRY                   *mFvbEntry;\r
+EFI_SMM_STATUS_CODE_PROTOCOL  *gSmmStatusCodeProtocol = NULL;\r
 \r
 #if (EFI_SPECIFICATION_VERSION >= 0x00020000)\r
 \r
@@ -493,10 +497,8 @@ Returns:
 \r
 --*/\r
 {\r
-  EFI_STATUS  Status;\r
-#if (EFI_SPECIFICATION_VERSION >= 0x00020000)\r
-  VOID *Registration;\r
-#endif\r
+  EFI_STATUS               Status;\r
+  EFI_SMM_BASE_PROTOCOL    *SmmBase;\r
 \r
   if (mRuntimeLibInitialized) {\r
     return EFI_ALREADY_STARTED;\r
@@ -512,28 +514,21 @@ Returns:
   mRT = SystemTable->RuntimeServices;\r
   ASSERT (mRT != NULL);\r
 \r
-#if (EFI_SPECIFICATION_VERSION >= 0x00020000)\r
   //\r
-  // Register EFI_STATUS_CODE_PROTOCOL notify function\r
+  // Check whether it is in SMM mode.\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
+  Status  = gBS->LocateProtocol (&gEfiSmmBaseProtocolGuid, NULL, &SmmBase);\r
+  if (!EFI_ERROR (Status)) {\r
+    SmmBase->InSmm (SmmBase, &mInSmm);\r
+  }\r
 \r
-  gBS->SignalEvent (gEfiStatusCodeNotifyEvent);\r
-#endif\r
+  //\r
+  // Directly locate SmmStatusCode protocol\r
+  //\r
+  Status = gBS->LocateProtocol (&gEfiSmmStatusCodeProtocolGuid, NULL, &gSmmStatusCodeProtocol);\r
+  if (EFI_ERROR (Status)) {\r
+    gSmmStatusCodeProtocol = NULL;\r
+  }\r
 \r
   Status  = gBS->LocateProtocol (&gEfiCpuIoProtocolGuid, NULL, (VOID **) &gCpuIo);\r
   if (EFI_ERROR (Status)) {\r
@@ -912,6 +907,14 @@ Returns:
 --*/\r
 {\r
   EFI_STATUS               Status;\r
+  \r
+  if (mInSmm) {\r
+    if (gSmmStatusCodeProtocol == NULL) {\r
+      return EFI_UNSUPPORTED;\r
+    }\r
+    Status = gSmmStatusCodeProtocol->ReportStatusCode (gSmmStatusCodeProtocol, CodeType, Value, Instance, CallerId, Data);\r
+    return Status;\r
+  }\r
 \r
 #if (EFI_SPECIFICATION_VERSION >= 0x00020000)\r
   if (gReportStatusCode == NULL) {\r