From: Song, BinX <binx.song@intel.com>
Date: Fri, 12 Jan 2018 02:19:00 +0000 (+0800)
Subject: UefiCpuPkg: Enhance feature dependency check
X-Git-Tag: edk2-stable201903~2616
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=57d1afc88950401a322e8679bbf89ec57ba8e992;hp=228e4f47066307a593c16ad2f611f4219bdb5f28;ds=sidebyside

UefiCpuPkg: Enhance feature dependency check

Enhance MCA feature dependency check base on SDM pseudocode example 15-1.

Cc: Eric Dong <eric.dong@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Bell Song <binx.song@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
---

diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/MachineCheck.c b/UefiCpuPkg/Library/CpuCommonFeaturesLib/MachineCheck.c
index b012c6926e..58dc45aeda 100644
--- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/MachineCheck.c
+++ b/UefiCpuPkg/Library/CpuCommonFeaturesLib/MachineCheck.c
@@ -105,6 +105,9 @@ McaSupport (
   IN VOID                              *ConfigData  OPTIONAL
   )
 {
+  if (!MceSupport (ProcessorNumber, CpuInfo, ConfigData)) {
+    return FALSE;
+  }
   return (CpuInfo->CpuIdVersionInfoEdx.Bits.MCA == 1);
 }