Reviewed-by: Ray Ni thanks, ray ________________________________ From: Gerd Hoffmann Sent: Wednesday, March 22, 2023 3:02:43 PM To: devel@edk2.groups.io Cc: Kinney, Michael D ; Aktas, Erdem ; James Bottomley ; Gao, Liming ; Marvin Häuser ; Pawel Polawski ; Michael Roth ; Tom Lendacky ; Gerd Hoffmann ; Yao, Jiewen ; Wang, Jian J ; Ard Biesheuvel ; Justen, Jordan L ; Wu, Hao A ; Liu, Zhiguang ; Ni, Ray ; Xu, Min M ; Oliver Steffen Subject: [PATCH v2 6/6] UefiCpuPkg/MtrrLib: use new IS_POW2() macro. Drop MtrrLibIsPowerOfTwo function, use the new IS_POW2() macro instead. The ASSERT() removed (inside MtrrLibIsPowerOfTwo) is superfluous, another ASSERT() a few lines up in MtrrLibCalculateMtrrs() already guarantees that Length can not be zero at this point. Signed-off-by: Gerd Hoffmann --- UefiCpuPkg/Library/MtrrLib/MtrrLib.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c b/UefiCpuPkg/Library/MtrrLib/MtrrLib.c index e5c862c83d61..dd0b668d7782 100644 --- a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c +++ b/UefiCpuPkg/Library/MtrrLib/MtrrLib.c @@ -1253,21 +1253,6 @@ MtrrLibLowestType ( return (MTRR_MEMORY_CACHE_TYPE)Type; } -/** - Return TRUE when the Operand is exactly power of 2. - - @retval TRUE Operand is exactly power of 2. - @retval FALSE Operand is not power of 2. -**/ -BOOLEAN -MtrrLibIsPowerOfTwo ( - IN UINT64 Operand - ) -{ - ASSERT (Operand != 0); - return (BOOLEAN)((Operand & (Operand - 1)) == 0); -} - /** Calculate the subtractive path from vertex Start to Stop. @@ -1638,7 +1623,7 @@ MtrrLibCalculateMtrrs ( break; } - if ((Weight[M (Start, Stop)] == MAX_WEIGHT) && MtrrLibIsPowerOfTwo (Length)) { + if ((Weight[M (Start, Stop)] == MAX_WEIGHT) && IS_POW2 (Length)) { if (MtrrLibGetNumberOfTypes ( Ranges, RangeCount, -- 2.39.2