From: Eric Dong <eric.dong@intel.com>
Date: Thu, 21 Dec 2017 11:46:51 +0000 (+0800)
Subject: Revert "UefiCpuPkg: Check invalid RegisterCpuFeature parameter"
X-Git-Tag: edk2-stable201903~2722
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=8766d3a3e8150c48d8f2cf5764d48b792de74ee1

Revert "UefiCpuPkg: Check invalid RegisterCpuFeature parameter"

This reverts commit 5c59537c1092a1372913274636a8d766fdd97e61.

Current code already has function IsCpuFeatureSupported to do
the feature validation, not need this check logic anymore.

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/Include/Library/RegisterCpuFeaturesLib.h b/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h
index fc3ccda1ba..9331e49d13 100644
--- a/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h
+++ b/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h
@@ -71,11 +71,6 @@
 #define CPU_FEATURE_APIC_TPR_UPDATE_MESSAGE         (32+9)
 #define CPU_FEATURE_ENERGY_PERFORMANCE_BIAS         (32+10)
 #define CPU_FEATURE_PPIN                            (32+11)
-//
-// Currently, CPU_FEATURE_PROC_TRACE is the MAX feature we support.
-// If you define a feature bigger than it, please also replace it
-// in RegisterCpuFeatureLibIsFeatureValid function.
-//
 #define CPU_FEATURE_PROC_TRACE                      (32+12)
 
 #define CPU_FEATURE_BEFORE_ALL                      BIT27
diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c
index 6ec26e1e92..dd6a82be7a 100644
--- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c
+++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c
@@ -80,34 +80,6 @@ DumpCpuFeature (
   }
 }
 
-/**
-  Determines if the CPU feature is valid.
-
-  @param[in]  Feature        Pointer to CPU feature
-
-  @retval TRUE  The CPU feature is valid.
-  @retval FALSE The CPU feature is invalid.
-**/
-BOOLEAN
-RegisterCpuFeatureLibIsFeatureValid (
-  IN UINT32        Feature
-  )
-{
-  UINT32      Data;
-
-  Data = Feature;
-  Data &= ~(CPU_FEATURE_BEFORE | CPU_FEATURE_AFTER | CPU_FEATURE_BEFORE_ALL | CPU_FEATURE_AFTER_ALL);
-  //
-  // Currently, CPU_FEATURE_PROC_TRACE is the MAX feature we support.
-  // If you define a feature bigger than it, please replace it at below.
-  //
-  if (Data > CPU_FEATURE_PROC_TRACE) {
-    DEBUG ((DEBUG_ERROR, "Invalid CPU feature: 0x%x ", Feature));
-    return FALSE;
-  }
-  return TRUE;
-}
-
 /**
   Determines if the feature bit mask is in dependent CPU feature bit mask buffer.
 
@@ -472,7 +444,6 @@ RegisterCpuFeature (
 
   VA_START (Marker, InitializeFunc);
   Feature = VA_ARG (Marker, UINT32);
-  ASSERT (RegisterCpuFeatureLibIsFeatureValid(Feature));
   while (Feature != CPU_FEATURE_END) {
     ASSERT ((Feature & (CPU_FEATURE_BEFORE | CPU_FEATURE_AFTER))
                     != (CPU_FEATURE_BEFORE | CPU_FEATURE_AFTER));