UefiCpuPkg: Enhance feature dependency check

[mirror_edk2.git] / UefiCpuPkg / Library / CpuCommonFeaturesLib / X2Apic.c

diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/X2Apic.c b/UefiCpuPkg/Library/CpuCommonFeaturesLib/X2Apic.c
index 9c2ad9ad313e8a57260b1a10d3d0e9aa524b7275..b4a453c3525c4c9acf6b3af5ae665fb98c725610 100644 (file)
--- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/X2Apic.c
+++ b/UefiCpuPkg/Library/CpuCommonFeaturesLib/X2Apic.c
@@ -14,6 +14,28 @@
 \r
 #include "CpuCommonFeatures.h"\r
 \r
+/**\r
+  Prepares for the data used by CPU feature detection and initialization.\r
+\r
+  @param[in]  NumberOfProcessors  The number of CPUs in the platform.\r
+\r
+  @return  Pointer to a buffer of CPU related configuration data.\r
+\r
+  @note This service could be called by BSP only.\r
+**/\r
+VOID *\r
+EFIAPI\r
+X2ApicGetConfigData (\r
+  IN UINTN  NumberOfProcessors\r
+  )\r
+{\r
+  BOOLEAN                            *ConfigData;\r
+\r
+  ConfigData = AllocateZeroPool (sizeof (BOOLEAN) * NumberOfProcessors);\r
+  ASSERT (ConfigData != NULL);\r
+  return ConfigData;\r
+}\r
+\r
 /**\r
   Detects if X2Apci feature supported on current processor.\r
 \r
@@ -40,7 +62,16 @@ X2ApicSupport (
   IN VOID                              *ConfigData  OPTIONAL\r
   )\r
 {\r
-  return (GetApicMode () == LOCAL_APIC_MODE_X2APIC);\r
+  BOOLEAN                            *X2ApicEnabled;\r
+\r
+  ASSERT (ConfigData != NULL);\r
+  X2ApicEnabled = (BOOLEAN *) ConfigData;\r
+  //\r
+  // *ConfigData indicates if X2APIC enabled on current processor\r
+  //\r
+  X2ApicEnabled[ProcessorNumber] = (GetApicMode () == LOCAL_APIC_MODE_X2APIC) ? TRUE : FALSE;\r
+\r
+  return (CpuInfo->CpuIdVersionInfoEcx.Bits.x2APIC == 1);\r
 }\r
 \r
 /**\r
@@ -69,13 +100,34 @@ X2ApicInitialize (
   IN BOOLEAN                           State\r
   )\r
 {\r
-  PRE_SMM_CPU_REGISTER_TABLE_WRITE_FIELD (\r
-    ProcessorNumber,\r
-    Msr,\r
-    MSR_IA32_APIC_BASE,\r
-    MSR_IA32_APIC_BASE_REGISTER,\r
-    Bits.EXTD,\r
-    (State) ? 1 : 0\r
-    );\r
+  BOOLEAN                            *X2ApicEnabled;\r
+\r
+  ASSERT (ConfigData != NULL);\r
+  X2ApicEnabled = (BOOLEAN *) ConfigData;\r
+  if (X2ApicEnabled[ProcessorNumber]) {\r
+    PRE_SMM_CPU_REGISTER_TABLE_WRITE_FIELD (\r
+      ProcessorNumber,\r
+      Msr,\r
+      MSR_IA32_APIC_BASE,\r
+      MSR_IA32_APIC_BASE_REGISTER,\r
+      Bits.EXTD,\r
+      1\r
+      );\r
+  } else {\r
+    //\r
+    // Enable X2APIC mode only if X2APIC is not enabled,\r
+    // Needn't to disabe X2APIC mode again if X2APIC is not enabled\r
+    //\r
+    if (State) {\r
+      CPU_REGISTER_TABLE_WRITE_FIELD (\r
+        ProcessorNumber,\r
+        Msr,\r
+        MSR_IA32_APIC_BASE,\r
+        MSR_IA32_APIC_BASE_REGISTER,\r
+        Bits.EXTD,\r
+        1\r
+        );\r
+    }\r
+  }\r
   return RETURN_SUCCESS;\r
 }\r