UefiCpuPkg/PiSmmCpuDxeSmm: Allocate buffer for each CPU semaphores

[mirror_edk2.git] / UefiCpuPkg / PiSmmCpuDxeSmm / SmmProfile.c

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c
index ec4ec9b067c5c6ace339731d7ba31d3299ab7fef..f9cea55d9dcf6a781880fdbc45444992174b8399 100644 (file)
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c
@@ -1,7 +1,7 @@
 /** @file\r
 Enable SMM profile.\r
 \r
-Copyright (c) 2012 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2012 - 2016, 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
@@ -342,7 +342,6 @@ InitProtectedMemRange (
   UINTN                            NumberOfSpliteRange;\r
   EFI_GCD_MEMORY_SPACE_DESCRIPTOR  *MemorySpaceMap;\r
   UINTN                            TotalSize;\r
-  EFI_STATUS                       Status;\r
   EFI_PHYSICAL_ADDRESS             ProtectBaseAddress;\r
   EFI_PHYSICAL_ADDRESS             ProtectEndAddress;\r
   EFI_PHYSICAL_ADDRESS             Top2MBAlignedAddress;\r
@@ -358,10 +357,10 @@ InitProtectedMemRange (
   //\r
   // Get MMIO ranges from GCD and add them into protected memory ranges.\r
   //\r
-  Status = gDS->GetMemorySpaceMap (\r
-                &NumberOfDescriptors,\r
-                &MemorySpaceMap\r
-                );\r
+  gDS->GetMemorySpaceMap (\r
+       &NumberOfDescriptors,\r
+       &MemorySpaceMap\r
+       );\r
   for (Index = 0; Index < NumberOfDescriptors; Index++) {\r
     if (MemorySpaceMap[Index].GcdMemoryType == EfiGcdMemoryTypeMemoryMappedIo) {\r
       NumberOfMmioDescriptors++;\r
@@ -776,18 +775,16 @@ InitSmmProfileCallBack (
   IN EFI_HANDLE      Handle\r
   )\r
 {\r
-  EFI_STATUS         Status;\r
-\r
   //\r
   // Save to variable so that SMM profile data can be found.\r
   //\r
-  Status = gRT->SetVariable (\r
-                  SMM_PROFILE_NAME,\r
-                  &gEfiCallerIdGuid,\r
-                  EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,\r
-                  sizeof(mSmmProfileBase),\r
-                  &mSmmProfileBase\r
-                  );\r
+  gRT->SetVariable (\r
+         SMM_PROFILE_NAME,\r
+         &gEfiCallerIdGuid,\r
+         EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,\r
+         sizeof(mSmmProfileBase),\r
+         &mSmmProfileBase\r
+         );\r
 \r
   //\r
   // Get Software SMI from FADT\r
@@ -928,14 +925,18 @@ InitSmmProfileInternal (
 /**\r
   Check if XD feature is supported by a processor.\r
 \r
+  @param[in,out] Buffer  The pointer to private data buffer.\r
+\r
 **/\r
 VOID\r
+EFIAPI\r
 CheckFeatureSupported (\r
-  VOID\r
+  IN OUT VOID   *Buffer\r
   )\r
 {\r
-  UINT32                 RegEax;\r
-  UINT32                 RegEdx;\r
+  UINT32                         RegEax;\r
+  UINT32                         RegEdx;\r
+  MSR_IA32_MISC_ENABLE_REGISTER  MiscEnableMsr;\r
 \r
   if (mXdSupported) {\r
     AsmCpuid (CPUID_EXTENDED_FUNCTION, &RegEax, NULL, NULL, NULL);\r
@@ -966,10 +967,10 @@ CheckFeatureSupported (
       //    BTINT bits in the MSR_DEBUGCTLA MSR.\r
       // 2. The IA32_DS_AREA MSR can be programmed to point to the DS save area.\r
       //\r
-      if ((AsmMsrBitFieldRead64 (MSR_IA32_MISC_ENABLE, 11, 11) == 0) &&\r
-          (AsmMsrBitFieldRead64 (MSR_IA32_MISC_ENABLE, 12, 12) == 0)) {\r
+      MiscEnableMsr.Uint64 = AsmReadMsr64 (MSR_IA32_MISC_ENABLE);\r
+      if (MiscEnableMsr.Bits.BTS == 1) {\r
         //\r
-        // BTS facilities is supported.\r
+        // BTS facilities is not supported if MSR_IA32_MISC_ENABLE.BTS bit is set.\r
         //\r
         mBtsSupported = FALSE;\r
       }\r
@@ -1001,7 +1002,7 @@ CheckProcessorFeature (
   //\r
   // Check if XD and BTS are supported on all processors.\r
   //\r
-  CheckFeatureSupported ();\r
+  CheckFeatureSupported (NULL);\r
 \r
   //\r
   //Check on other processors if BSP supports this\r
@@ -1009,7 +1010,7 @@ CheckProcessorFeature (
   if (mXdSupported || mBtsSupported) {\r
     MpServices->StartupAllAPs (\r
                   MpServices,\r
-                  (EFI_AP_PROCEDURE) CheckFeatureSupported,\r
+                  CheckFeatureSupported,\r
                   TRUE,\r
                   NULL,\r
                   0,\r
@@ -1072,8 +1073,6 @@ ActivateLBR (
   if ((DebugCtl & MSR_DEBUG_CTL_LBR) != 0) {\r
     return ;\r
   }\r
-  AsmWriteMsr64 (MSR_LER_FROM_LIP, 0);\r
-  AsmWriteMsr64 (MSR_LER_TO_LIP, 0);\r
   DebugCtl |= MSR_DEBUG_CTL_LBR;\r
   AsmWriteMsr64 (MSR_DEBUG_CTL, DebugCtl);\r
 }\r
@@ -1308,7 +1307,6 @@ SmmProfilePFHandler (
   SMM_PROFILE_ENTRY     *SmmProfileEntry;\r
   UINT64                SmiCommand;\r
   EFI_STATUS            Status;\r
-  UINTN                 SwSmiCpuIndex;\r
   UINT8                 SoftSmiValue;\r
   EFI_SMM_SAVE_STATE_IO_INFO    IoInfo;\r
 \r
@@ -1351,10 +1349,6 @@ SmmProfilePFHandler (
       }\r
     }\r
 \r
-    //\r
-    // Try to find which CPU trigger SWSMI\r
-    //\r
-    SwSmiCpuIndex = 0;\r
     //\r
     // Indicate it is not software SMI\r
     //\r
@@ -1365,10 +1359,6 @@ SmmProfilePFHandler (
         continue;\r
       }\r
       if (IoInfo.IoPort == mSmiCommandPort) {\r
-        //\r
-        // Great! Find it.\r
-        //\r
-        SwSmiCpuIndex = Index;\r
         //\r
         // A software SMI triggered by SMI command port has been found, get SmiCommand from SMI command port.\r
         //\r