UefiCpuPkg CpuCommFeaturesLib: Fix ASSERT if LMCE is supported

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

diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeaturesLib.c b/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeaturesLib.c
index b88b7d1e6d008813ed73c5f188edfd68c3e03151..9ddc6ce9d4764cfc785b8f7297e5ed2cd06e8e96 100644 (file)
--- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeaturesLib.c
+++ b/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeaturesLib.c
@@ -3,13 +3,7 @@
   Architectures Software Developer's Manual.\r
 \r
   Copyright (c) 2017, 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
-  http://opensource.org/licenses/bsd-license.php\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -217,6 +211,29 @@ CpuCommonFeaturesLibConstructor (
                );\r
     ASSERT_EFI_ERROR (Status);\r
   }\r
+  if (IsCpuFeatureSupported (CPU_FEATURE_LMCE)) {\r
+    Status = RegisterCpuFeature (\r
+               "LMCE",\r
+               FeatureControlGetConfigData,\r
+               LmceSupport,\r
+               LmceInitialize,\r
+               CPU_FEATURE_LMCE,\r
+               CPU_FEATURE_LOCK_FEATURE_CONTROL_REGISTER | CPU_FEATURE_BEFORE,\r
+               CPU_FEATURE_END\r
+               );\r
+    ASSERT_EFI_ERROR (Status);\r
+  }\r
+  if (IsCpuFeatureSupported (CPU_FEATURE_PROC_TRACE)) {\r
+    Status = RegisterCpuFeature (\r
+               "Proc Trace",\r
+               ProcTraceGetConfigData,\r
+               ProcTraceSupport,\r
+               ProcTraceInitialize,\r
+               CPU_FEATURE_PROC_TRACE,\r
+               CPU_FEATURE_END\r
+               );\r
+    ASSERT_EFI_ERROR (Status);\r
+  }\r
 \r
   return RETURN_SUCCESS;\r
 }\r