MdeModulePkg/PiSmmCore: Add SmiHandlerProfile support.

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

diff --git a/MdeModulePkg/Core/PiSmmCore/Smi.c b/MdeModulePkg/Core/PiSmmCore/Smi.c
index 816d0f51936042bbf1c98b0b72ca3c8169e40a75..ad483a1877ce129d71d3440a73bfb75841a32727 100644 (file)
--- a/MdeModulePkg/Core/PiSmmCore/Smi.c
+++ b/MdeModulePkg/Core/PiSmmCore/Smi.c
@@ -1,7 +1,7 @@
 /** @file\r
   SMI management.\r
 \r
-  Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2009 - 2017, 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
@@ -14,32 +14,15 @@
 \r
 #include "PiSmmCore.h"\r
 \r
-//\r
-// SMM_HANDLER - used for each SMM handler\r
-//\r
-\r
-#define SMI_ENTRY_SIGNATURE  SIGNATURE_32('s','m','i','e')\r
-\r
- typedef struct {\r
-  UINTN       Signature;\r
-  LIST_ENTRY  AllEntries;  // All entries\r
-\r
-  EFI_GUID    HandlerType; // Type of interrupt\r
-  LIST_ENTRY  SmiHandlers; // All handlers\r
-} SMI_ENTRY;\r
-\r
-#define SMI_HANDLER_SIGNATURE  SIGNATURE_32('s','m','i','h')\r
-\r
- typedef struct {\r
-  UINTN                         Signature;\r
-  LIST_ENTRY                    Link;        // Link on SMI_ENTRY.SmiHandlers\r
-  EFI_SMM_HANDLER_ENTRY_POINT2  Handler;     // The smm handler's entry point\r
-  SMI_ENTRY                     *SmiEntry;\r
-} SMI_HANDLER;\r
-\r
-LIST_ENTRY  mRootSmiHandlerList = INITIALIZE_LIST_HEAD_VARIABLE (mRootSmiHandlerList);\r
 LIST_ENTRY  mSmiEntryList       = INITIALIZE_LIST_HEAD_VARIABLE (mSmiEntryList);\r
 \r
+SMI_ENTRY   mRootSmiEntry = {\r
+  SMI_ENTRY_SIGNATURE,\r
+  INITIALIZE_LIST_HEAD_VARIABLE (mRootSmiEntry.AllEntries),\r
+  {0},\r
+  INITIALIZE_LIST_HEAD_VARIABLE (mRootSmiEntry.SmiHandlers),\r
+};\r
+\r
 /**\r
   Finds the SMI entry for the requested handler type.\r
 \r
@@ -137,8 +120,7 @@ SmiManage (
     //\r
     // Root SMI handler\r
     //\r
-\r
-    Head = &mRootSmiHandlerList;\r
+    SmiEntry = &mRootSmiEntry;\r
   } else {\r
     //\r
     // Non-root SMI handler\r
@@ -150,9 +132,8 @@ SmiManage (
       //\r
       return Status;\r
     }\r
-\r
-    Head = &SmiEntry->SmiHandlers;\r
   }\r
+  Head = &SmiEntry->SmiHandlers;\r
 \r
   for (Link = Head->ForwardLink; Link != Head; Link = Link->ForwardLink) {\r
     SmiHandler = CR (Link, SMI_HANDLER, Link, SMI_HANDLER_SIGNATURE);\r
@@ -252,13 +233,13 @@ SmiHandlerRegister (
 \r
   SmiHandler->Signature = SMI_HANDLER_SIGNATURE;\r
   SmiHandler->Handler = Handler;\r
+  SmiHandler->CallerAddr = (UINTN)RETURN_ADDRESS (0);\r
 \r
   if (HandlerType == NULL) {\r
     //\r
     // This is root SMI handler\r
     //\r
-    SmiEntry = NULL;\r
-    List = &mRootSmiHandlerList;\r
+    SmiEntry = &mRootSmiEntry;\r
   } else {\r
     //\r
     // None root SMI handler\r
@@ -267,9 +248,8 @@ SmiHandlerRegister (
     if (SmiEntry == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
-\r
-    List = &SmiEntry->SmiHandlers;\r
   }\r
+  List = &SmiEntry->SmiHandlers;\r
 \r
   SmiHandler->SmiEntry = SmiEntry;\r
   InsertTailList (List, &SmiHandler->Link);\r