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>

2 files changed, 5 insertions, 5 deletions

diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
index 7a7673035d..54c98272ac 100644
--- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
+++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
@@ -149,7 +149,7 @@ CpuInitDataInitialize (
   CpuFeaturesData = GetCpuFeaturesData ();

   CpuFeaturesData->InitOrder = AllocateZeroPool (sizeof (CPU_FEATURES_INIT_ORDER) * NumberOfCpus);

   ASSERT (CpuFeaturesData->InitOrder != NULL);

-  CpuFeaturesData->BitMaskSize = PcdGetSize (PcdCpuFeaturesSupport);

+  CpuFeaturesData->BitMaskSize = (UINT32) PcdGetSize (PcdCpuFeaturesSupport);

 

   //

   // Collect CPU Features information

diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c
index 338f1a495c..dd6a82be7a 100644
--- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c
+++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c
@@ -29,7 +29,7 @@ IsCpuFeatureMatch (
   IN UINT8               *SecondFeatureMask

   )

 {

-  UINT32                 BitMaskSize;

+  UINTN                 BitMaskSize;

 

   BitMaskSize = PcdGetSize (PcdCpuFeaturesSupport);

   if (CompareMem (FirstFeatureMask, SecondFeatureMask, BitMaskSize) == 0) {

@@ -51,7 +51,7 @@ DumpCpuFeatureMask (
 {

   UINTN                  Index;

   UINT8                  *Data8;

-  UINT32                 BitMaskSize;

+  UINTN                  BitMaskSize;

 

   BitMaskSize = PcdGetSize (PcdCpuFeaturesSupport);

   Data8       = (UINT8 *) FeatureMask;

@@ -258,7 +258,7 @@ RegisterCpuFeatureWorker (
   CPU_FEATURES_DATA          *CpuFeaturesData;

   CPU_FEATURES_ENTRY         *CpuFeatureEntry;

   LIST_ENTRY                 *Entry;

-  UINT32                     BitMaskSize;

+  UINTN                      BitMaskSize;

   BOOLEAN                    FeatureExist;

 

   BitMaskSize     = PcdGetSize (PcdCpuFeaturesSupport);

@@ -267,7 +267,7 @@ RegisterCpuFeatureWorker (
     InitializeListHead (&CpuFeaturesData->FeatureList);

     InitializeSpinLock (&CpuFeaturesData->MsrLock);

     InitializeSpinLock (&CpuFeaturesData->MemoryMappedLock);

-    CpuFeaturesData->BitMaskSize = BitMaskSize;

+    CpuFeaturesData->BitMaskSize = (UINT32) BitMaskSize;

   }

   ASSERT (CpuFeaturesData->BitMaskSize == BitMaskSize);