summaryrefslogtreecommitdiffstats
path: root/UefiCpuPkg
diff options
context:
space:
mode:
authorEric Dong <eric.dong@intel.com>2017-12-21 19:46:51 +0800
committerEric Dong <eric.dong@intel.com>2017-12-27 15:31:33 +0800
commit8766d3a3e8150c48d8f2cf5764d48b792de74ee1 (patch)
treebe0ae4ccb8be70aef4dc464fa5b0a9a5c0aaeeed /UefiCpuPkg
parent726c501c2c9a1ef103fab7846e2d1a34506715d8 (diff)
downloadedk2-8766d3a3e8150c48d8f2cf5764d48b792de74ee1.tar.gz
edk2-8766d3a3e8150c48d8f2cf5764d48b792de74ee1.tar.bz2
edk2-8766d3a3e8150c48d8f2cf5764d48b792de74ee1.zip
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>
Diffstat (limited to 'UefiCpuPkg')
-rw-r--r--UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h5
-rw-r--r--UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c29
2 files changed, 0 insertions, 34 deletions
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
@@ -81,34 +81,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.
@param[in] FeatureMask Pointer to CPU feature bit mask
@@ -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));