UefiCpuPkg/PiSmmCpuDxeSmm: Clean up CheckFeatureSupported()

Removed EFIAPI and parameter from CheckFeatureSupported() and removed
CheckProcessorFeature() totally.

Cc: Michael Kinney <michael.d.kinney@intel.com>
Cc: Feng Tian <feng.tian@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jeff Fan <jeff.fan@intel.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>
Reviewed-by: Michael Kinney <michael.d.kinney@intel.com>
Regression-tested-by: Laszlo Ersek <lersek@redhat.com>

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c
index 50059e4241e434e722a3ce0039b47e81632a1a11..dbe63ee9d2a0ea93ec689ec449b832313d70f431 100644 (file)
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c
@@ -359,7 +359,7 @@ SmmInitHandler (
         //\r
         // Check XD and BTS features on each processor on normal boot\r
         //\r
-        CheckFeatureSupported (NULL);\r
+        CheckFeatureSupported ();\r
       }\r
 \r
       if (mIsBsp) {\r

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c
index d315194dfc713e2b60e1af03672391da003e88c0..329574ebb24ebcc155b2d6ceee8f35710b37504c 100644 (file)
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c
@@ -925,13 +925,10 @@ 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
-  IN OUT VOID   *Buffer\r
+  VOID\r
   )\r
 {\r
   UINT32                         RegEax;\r
@@ -978,48 +975,6 @@ CheckFeatureSupported (
   }\r
 }\r
 \r
-/**\r
-  Check if XD and BTS features are supported by all processors.\r
-\r
-**/\r
-VOID\r
-CheckProcessorFeature (\r
-  VOID\r
-  )\r
-{\r
-  EFI_STATUS                        Status;\r
-  EFI_MP_SERVICES_PROTOCOL          *MpServices;\r
-\r
-  Status = gBS->LocateProtocol (&gEfiMpServiceProtocolGuid, NULL, (VOID **)&MpServices);\r
-  ASSERT_EFI_ERROR (Status);\r
-\r
-  //\r
-  // First detect if XD and BTS are supported\r
-  //\r
-  mXdSupported  = TRUE;\r
-  mBtsSupported = TRUE;\r
-\r
-  //\r
-  // Check if XD and BTS are supported on all processors.\r
-  //\r
-  CheckFeatureSupported (NULL);\r
-\r
-  //\r
-  //Check on other processors if BSP supports this\r
-  //\r
-  if (mXdSupported || mBtsSupported) {\r
-    MpServices->StartupAllAPs (\r
-                  MpServices,\r
-                  CheckFeatureSupported,\r
-                  TRUE,\r
-                  NULL,\r
-                  0,\r
-                  NULL,\r
-                  NULL\r
-                  );\r
-  }\r
-}\r
-\r
 /**\r
   Enable XD feature.\r
 \r

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.h b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.h
index 328d2b975821e512538025e2cf1e27d3315741f6..13ff675ba29cbd3d0f591aaecb5a2731d713236a 100644 (file)
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.h
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.h
@@ -90,13 +90,10 @@ PageFaultIdtHandlerSmmProfile (
 /**\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
-  IN OUT VOID   *Buffer\r
+  VOID\r
   );\r
 \r
 /**\r
@@ -117,15 +114,6 @@ InitPaging (
   VOID\r
   );\r
 \r
-/**\r
-  Check if XD and BTS features are supported by all processors.\r
-\r
-**/\r
-VOID\r
-CheckProcessorFeature (\r
-  VOID\r
-  );\r
-\r
 extern BOOLEAN    mXdSupported;\r
 extern BOOLEAN    mXdEnabled;\r
 \r