UefiCpuPkg: Update RegisterCpuFeaturesLib to consume PcdGetSize with UINTN

PcdGetSize() returns UINTN data type. The consumer code should use UINTN data
to get its size.

This issue is found when PcdCpuFeaturesSupport is configured as patchable.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Jeff Fan <jeff.fan@intel.com>

diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
index 7a7673035dfaecd3d594f6d09c69f8b5c9fc3282..54c98272acd841f2b6972d2e6edb4e4ec64b72f6 100644 (file)
--- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
+++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
@@ -149,7 +149,7 @@ CpuInitDataInitialize (
   CpuFeaturesData = GetCpuFeaturesData ();\r
   CpuFeaturesData->InitOrder = AllocateZeroPool (sizeof (CPU_FEATURES_INIT_ORDER) * NumberOfCpus);\r
   ASSERT (CpuFeaturesData->InitOrder != NULL);\r
-  CpuFeaturesData->BitMaskSize = PcdGetSize (PcdCpuFeaturesSupport);\r
+  CpuFeaturesData->BitMaskSize = (UINT32) PcdGetSize (PcdCpuFeaturesSupport);\r
 \r
   //\r
   // Collect CPU Features information\r

diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c
index 338f1a495cf4895f6ac638fe941b77923a80f27d..dd6a82be7a5a1c2a2cf1c2e1b0475c496adcc8e6 100644 (file)
--- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c
+++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c
@@ -29,7 +29,7 @@ IsCpuFeatureMatch (
   IN UINT8               *SecondFeatureMask\r
   )\r
 {\r
-  UINT32                 BitMaskSize;\r
+  UINTN                 BitMaskSize;\r
 \r
   BitMaskSize = PcdGetSize (PcdCpuFeaturesSupport);\r
   if (CompareMem (FirstFeatureMask, SecondFeatureMask, BitMaskSize) == 0) {\r
@@ -51,7 +51,7 @@ DumpCpuFeatureMask (
 {\r
   UINTN                  Index;\r
   UINT8                  *Data8;\r
-  UINT32                 BitMaskSize;\r
+  UINTN                  BitMaskSize;\r
 \r
   BitMaskSize = PcdGetSize (PcdCpuFeaturesSupport);\r
   Data8       = (UINT8 *) FeatureMask;\r
@@ -258,7 +258,7 @@ RegisterCpuFeatureWorker (
   CPU_FEATURES_DATA          *CpuFeaturesData;\r
   CPU_FEATURES_ENTRY         *CpuFeatureEntry;\r
   LIST_ENTRY                 *Entry;\r
-  UINT32                     BitMaskSize;\r
+  UINTN                      BitMaskSize;\r
   BOOLEAN                    FeatureExist;\r
 \r
   BitMaskSize     = PcdGetSize (PcdCpuFeaturesSupport);\r
@@ -267,7 +267,7 @@ RegisterCpuFeatureWorker (
     InitializeListHead (&CpuFeaturesData->FeatureList);\r
     InitializeSpinLock (&CpuFeaturesData->MsrLock);\r
     InitializeSpinLock (&CpuFeaturesData->MemoryMappedLock);\r
-    CpuFeaturesData->BitMaskSize = BitMaskSize;\r
+    CpuFeaturesData->BitMaskSize = (UINT32) BitMaskSize;\r
   }\r
   ASSERT (CpuFeaturesData->BitMaskSize == BitMaskSize);\r
 \r