Fixed one bug: gSmmCorePrivate->InSmm is not set to FALSE correctly before exiting

[mirror_edk2.git] / MdeModulePkg / Core / PiSmmCore / PiSmmCore.c

diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.c b/MdeModulePkg/Core/PiSmmCore/PiSmmCore.c
index 75337f6b1c67112bce2257dcc0babd893115840c..c1b3563d013d277be9e7dd36446171ef7947818b 100644 (file)
--- a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.c
+++ b/MdeModulePkg/Core/PiSmmCore/PiSmmCore.c
@@ -1,7 +1,7 @@
 /** @file\r
   SMM Core Main Entry Point\r
 \r
-  Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>\r
   This program and the accompanying materials are licensed and made available \r
   under the terms and conditions of the BSD License which accompanies this \r
   distribution.  The full text of the license may be found at        \r
@@ -76,7 +76,7 @@ BOOLEAN  mInLegacyBoot = FALSE;
 //\r
 SMM_CORE_SMI_HANDLERS  mSmmCoreSmiHandlers[] = {\r
   { SmmDriverDispatchHandler, &gEfiEventDxeDispatchGuid,          NULL, TRUE  },\r
-  { SmmReadyToLockHandler,    &gEfiDxeSmmReadyToLockProtocolGuid, NULL, FALSE }, \r
+  { SmmReadyToLockHandler,    &gEfiDxeSmmReadyToLockProtocolGuid, NULL, TRUE }, \r
   { SmmLegacyBootHandler,     &gEfiEventLegacyBootGuid,           NULL, FALSE },\r
   { NULL,                     NULL,                               NULL, FALSE }\r
 };\r
@@ -245,63 +245,78 @@ SmmEntryPoint (
 {\r
   EFI_STATUS                  Status;\r
   EFI_SMM_COMMUNICATE_HEADER  *CommunicateHeader;\r
+  BOOLEAN                     InLegacyBoot;\r
+\r
+  PERF_START (NULL, "SMM", NULL, 0) ;\r
 \r
   //\r
   // Update SMST using the context\r
   //\r
   CopyMem (&gSmmCoreSmst.SmmStartupThisAp, SmmEntryContext, sizeof (EFI_SMM_ENTRY_CONTEXT));\r
 \r
+  //\r
+  // Call platform hook before Smm Dispatch\r
+  //\r
+  PlatformHookBeforeSmmDispatch ();\r
+\r
   //\r
   // If a legacy boot has occured, then make sure gSmmCorePrivate is not accessed\r
   //\r
-  if (mInLegacyBoot) {\r
+  InLegacyBoot = mInLegacyBoot;\r
+  if (!InLegacyBoot) {\r
+    //\r
+    // Mark the InSmm flag as TRUE, it will be used by SmmBase2 protocol\r
     //\r
-    // Asynchronous SMI\r
+    gSmmCorePrivate->InSmm = TRUE;\r
+\r
+    //\r
+    // Check to see if this is a Synchronous SMI sent through the SMM Communication \r
+    // Protocol or an Asynchronous SMI\r
     //\r
-    SmiManage (NULL, NULL, NULL, NULL);\r
-    return;\r
+    if (gSmmCorePrivate->CommunicationBuffer != NULL) {\r
+      //\r
+      // Synchronous SMI for SMM Core or request from Communicate protocol\r
+      //\r
+      CommunicateHeader = (EFI_SMM_COMMUNICATE_HEADER *)gSmmCorePrivate->CommunicationBuffer;\r
+      gSmmCorePrivate->BufferSize -= OFFSET_OF (EFI_SMM_COMMUNICATE_HEADER, Data);\r
+      Status = SmiManage (\r
+                 &CommunicateHeader->HeaderGuid, \r
+                 NULL, \r
+                 CommunicateHeader->Data, \r
+                 &gSmmCorePrivate->BufferSize\r
+                 );\r
+\r
+      //\r
+      // Update CommunicationBuffer, BufferSize and ReturnStatus\r
+      // Communicate service finished, reset the pointer to CommBuffer to NULL\r
+      //\r
+      gSmmCorePrivate->BufferSize += OFFSET_OF (EFI_SMM_COMMUNICATE_HEADER, Data);\r
+      gSmmCorePrivate->CommunicationBuffer = NULL;\r
+      gSmmCorePrivate->ReturnStatus = (Status == EFI_SUCCESS) ? EFI_SUCCESS : EFI_NOT_FOUND;\r
+    }\r
   }\r
 \r
   //\r
-  // Mark the InSmm flag as TRUE, it will be used by SmmBase2 protocol\r
+  // Process Asynchronous SMI sources\r
   //\r
-  gSmmCorePrivate->InSmm = TRUE;\r
-\r
+  SmiManage (NULL, NULL, NULL, NULL);\r
+  \r
   //\r
-  // Check to see if this is a Synchronous SMI sent through the SMM Communication \r
-  // Protocol or an Asynchronous SMI\r
+  // Call platform hook after Smm Dispatch\r
   //\r
-  if (gSmmCorePrivate->CommunicationBuffer != NULL) {\r
-    //\r
-    // Synchronous SMI for SMM Core or request from Communicate protocol\r
-    //\r
-    CommunicateHeader = (EFI_SMM_COMMUNICATE_HEADER *)gSmmCorePrivate->CommunicationBuffer;\r
-    gSmmCorePrivate->BufferSize -= OFFSET_OF (EFI_SMM_COMMUNICATE_HEADER, Data);\r
-    Status = SmiManage (\r
-               &CommunicateHeader->HeaderGuid, \r
-               NULL, \r
-               CommunicateHeader->Data, \r
-               &gSmmCorePrivate->BufferSize\r
-               );\r
+  PlatformHookAfterSmmDispatch ();\r
 \r
+  //\r
+  // If a legacy boot has occured, then make sure gSmmCorePrivate is not accessed\r
+  //\r
+  if (!InLegacyBoot) {\r
     //\r
-    // Update CommunicationBuffer, BufferSize and ReturnStatus\r
-    // Communicate service finished, reset the pointer to CommBuffer to NULL\r
-    //\r
-    gSmmCorePrivate->BufferSize += OFFSET_OF (EFI_SMM_COMMUNICATE_HEADER, Data);\r
-    gSmmCorePrivate->CommunicationBuffer = NULL;\r
-    gSmmCorePrivate->ReturnStatus = (Status == EFI_WARN_INTERRUPT_SOURCE_QUIESCED) ? EFI_SUCCESS : EFI_NOT_FOUND;\r
-  } else {\r
-    //\r
-    // Asynchronous SMI\r
+    // Clear the InSmm flag as we are going to leave SMM\r
     //\r
-    SmiManage (NULL, NULL, NULL, NULL);\r
+    gSmmCorePrivate->InSmm = FALSE;\r
   }\r
 \r
-  //\r
-  // Clear the InSmm flag as we are going to leave SMM\r
-  //\r
-  gSmmCorePrivate->InSmm = FALSE;\r
+  PERF_END (NULL, "SMM", NULL, 0) ;\r
 }\r
 \r
 /**\r