Re: [PATCH V2] UefiCpuPkg RegisterCpuFeaturesLib: Match data type and format specifier


Zeng, Star
 

Hi Liming,

This is a minor change and has been reviewed by Laszlo and Eric.
It will be better if it can be caught by 202002 stable tag.
You or Eric may help submit it.


Thanks,
Star

-----Original Message-----
From: Dong, Eric <eric.dong@...>
Sent: Wednesday, February 5, 2020 10:43 AM
To: devel@edk2.groups.io; Zeng, Star <star.zeng@...>
Cc: Ni, Ray <ray.ni@...>; Laszlo Ersek <lersek@...>
Subject: RE: [edk2-devel] [PATCH V2] UefiCpuPkg RegisterCpuFeaturesLib:
Match data type and format specifier

Reviewed-by: Eric Dong <eric.dong@...>

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Zeng,
Star
Sent: Tuesday, February 4, 2020 3:02 PM
To: devel@edk2.groups.io
Cc: Zeng, Star <star.zeng@...>; Dong, Eric <eric.dong@...>; Ni,
Ray <ray.ni@...>; Laszlo Ersek <lersek@...>
Subject: [edk2-devel] [PATCH V2] UefiCpuPkg RegisterCpuFeaturesLib:
Match data type and format specifier

Match data type and format specifier for printing.
1. Type cast ProcessorNumber and FeatureIndex to UINT32
as %d only expects a UINT32.
2. Use %08x instead of %08lx for CacheControl to print Index
as it is UINT32 type.
3. Use %016lx instead of %08lx for MemoryMapped to print
(Index | LShiftU64 (HighIndex, 32)) as it is UINT64 type.

Cc: Eric Dong <eric.dong@...>
Cc: Ray Ni <ray.ni@...>
Cc: Laszlo Ersek <lersek@...>
Signed-off-by: Star Zeng <star.zeng@...>
---
.../CpuFeaturesInitialize.c | 24 +++++++++----------
1 file changed, 12 insertions(+), 12 deletions(-)

diff --git
a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
index 0a4fcff033a3..fc96fb4372cf 100644
--- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
+++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
@@ -430,8 +430,8 @@ DumpRegisterTableOnProcessor (
DEBUG ((
DebugPrintErrorLevel,
"Processor: %04d: Index %04d, MSR : %08x, Bit Start: %02d, Bit
Length: %02d, Value: %016lx\r\n",
- ProcessorNumber,
- FeatureIndex,
+ (UINT32) ProcessorNumber,
+ (UINT32) FeatureIndex,
RegisterTableEntry->Index,
RegisterTableEntry->ValidBitStart,
RegisterTableEntry->ValidBitLength,
@@ -442,8 +442,8 @@ DumpRegisterTableOnProcessor (
DEBUG ((
DebugPrintErrorLevel,
"Processor: %04d: Index %04d, CR : %08x, Bit Start: %02d, Bit
Length: %02d, Value: %016lx\r\n",
- ProcessorNumber,
- FeatureIndex,
+ (UINT32) ProcessorNumber,
+ (UINT32) FeatureIndex,
RegisterTableEntry->Index,
RegisterTableEntry->ValidBitStart,
RegisterTableEntry->ValidBitLength,
@@ -453,9 +453,9 @@ DumpRegisterTableOnProcessor (
case MemoryMapped:
DEBUG ((
DebugPrintErrorLevel,
- "Processor: %04d: Index %04d, MMIO : %08lx, Bit Start: %02d, Bit
Length: %02d, Value: %016lx\r\n",
- ProcessorNumber,
- FeatureIndex,
+ "Processor: %04d: Index %04d, MMIO : %016lx, Bit Start: %02d,
Bit Length: %02d, Value: %016lx\r\n",
+ (UINT32) ProcessorNumber,
+ (UINT32) FeatureIndex,
RegisterTableEntry->Index | LShiftU64
(RegisterTableEntry->HighIndex, 32),
RegisterTableEntry->ValidBitStart,
RegisterTableEntry->ValidBitLength,
@@ -465,9 +465,9 @@ DumpRegisterTableOnProcessor (
case CacheControl:
DEBUG ((
DebugPrintErrorLevel,
- "Processor: %04d: Index %04d, CACHE: %08lx, Bit Start: %02d, Bit
Length: %02d, Value: %016lx\r\n",
- ProcessorNumber,
- FeatureIndex,
+ "Processor: %04d: Index %04d, CACHE: %08x, Bit Start: %02d, Bit
Length: %02d, Value: %016lx\r\n",
+ (UINT32) ProcessorNumber,
+ (UINT32) FeatureIndex,
RegisterTableEntry->Index,
RegisterTableEntry->ValidBitStart,
RegisterTableEntry->ValidBitLength,
@@ -478,8 +478,8 @@ DumpRegisterTableOnProcessor (
DEBUG ((
DebugPrintErrorLevel,
"Processor: %04d: Index %04d, SEMAP: %s\r\n",
- ProcessorNumber,
- FeatureIndex,
+ (UINT32) ProcessorNumber,
+ (UINT32) FeatureIndex,
mDependTypeStr[MIN ((UINT32)RegisterTableEntry->Value,
InvalidDepType)]
));
break;
--
2.21.0.windows.1


Join devel@edk2.groups.io to automatically receive all group messages.