From 7327e605d2e8ede19ce15d3aa64d7c004e7cffa8 Mon Sep 17 00:00:00 2001 From: Ray Ni Date: Mon, 12 Apr 2021 16:44:21 +0800 Subject: IntelSiliconPkg/ShadowMicrocode: Fix build failure The commit 7e4c6f982a0accd5aa86337b46d20199db989aeb updated ShadowMicrocode module to consume MicrocodeLib. But the change caused the build failure. The patch fixed the build failure and the functionality was verified in real platform. Signed-off-by: Ray Ni Reviewed-by: Sai Chaganty --- .../Intel/IntelSiliconPkg/Feature/ShadowMicrocode/ShadowMicrocodePei.c | 3 +-- Silicon/Intel/IntelSiliconPkg/IntelSiliconPkg.dsc | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Silicon/Intel/IntelSiliconPkg/Feature/ShadowMicrocode/ShadowMicrocodePei.c b/Silicon/Intel/IntelSiliconPkg/Feature/ShadowMicrocode/ShadowMicrocodePei.c index 4e4b69a0..7f4a3f8f 100644 --- a/Silicon/Intel/IntelSiliconPkg/Feature/ShadowMicrocode/ShadowMicrocodePei.c +++ b/Silicon/Intel/IntelSiliconPkg/Feature/ShadowMicrocode/ShadowMicrocodePei.c @@ -291,7 +291,6 @@ ShadowMicrocode ( UINTN MaxPatchNumber; CPU_MICROCODE_HEADER *MicrocodeEntryPoint; UINTN PatchCount; - UINTN DataSize; UINTN TotalSize; UINTN TotalLoadSize; @@ -342,7 +341,7 @@ ShadowMicrocode ( if (FitEntry[Index].Type == FIT_TYPE_01_MICROCODE) { MicrocodeEntryPoint = (CPU_MICROCODE_HEADER *) (UINTN) FitEntry[Index].Address; TotalSize = GetMicrocodeLength (MicrocodeEntryPoint); - if (IsValidMicrocode (MicrocodeEntryPoint, TotalSize, MicrocodeCpuId, CpuIdCount, FALSE)) { + if (IsValidMicrocode (MicrocodeEntryPoint, TotalSize, 0, MicrocodeCpuId, CpuIdCount, FALSE)) { PatchInfoBuffer[PatchCount].Address = (UINTN) MicrocodeEntryPoint; PatchInfoBuffer[PatchCount].Size = TotalSize; TotalLoadSize += TotalSize; diff --git a/Silicon/Intel/IntelSiliconPkg/IntelSiliconPkg.dsc b/Silicon/Intel/IntelSiliconPkg/IntelSiliconPkg.dsc index edc79c9b..5e0de7e1 100644 --- a/Silicon/Intel/IntelSiliconPkg/IntelSiliconPkg.dsc +++ b/Silicon/Intel/IntelSiliconPkg/IntelSiliconPkg.dsc @@ -39,6 +39,7 @@ MicrocodeFlashAccessLib|IntelSiliconPkg/Feature/Capsule/Library/MicrocodeFlashAccessLibNull/MicrocodeFlashAccessLibNull.inf PeiGetVtdPmrAlignmentLib|IntelSiliconPkg/Library/PeiGetVtdPmrAlignmentLib/PeiGetVtdPmrAlignmentLib.inf TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf + MicrocodeLib|UefiCpuPkg/Library/MicrocodeLib/MicrocodeLib.inf [LibraryClasses.common.PEIM] PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf -- cgit v1.2.3