From 51b96e4b4cb6d68093f7c7004d4716152ad3ac79 Mon Sep 17 00:00:00 2001 From: "Lou, Yun" Date: Tue, 2 Feb 2021 08:41:29 +0800 Subject: [PATCH] UefiCpuPkg/CpuCacheInfoLib: Add MpService dependency REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3190 Add MpService dependency to enforce the executability of CpuCacheInfoLib. Signed-off-by: Jason Lou Reviewed-by: Ray Ni Cc: Eric Dong Cc: Laszlo Ersek Cc: Rahul Kumar --- UefiCpuPkg/Include/Library/CpuCacheInfoLib.h | 2 -- UefiCpuPkg/Library/CpuCacheInfoLib/CpuCacheInfoLib.c | 7 +------ UefiCpuPkg/Library/CpuCacheInfoLib/DxeCpuCacheInfoLib.inf | 2 +- UefiCpuPkg/Library/CpuCacheInfoLib/PeiCpuCacheInfoLib.inf | 2 +- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/UefiCpuPkg/Include/Library/CpuCacheInfoLib.h b/UefiCpuPkg/Include/Library/CpuCacheInfoLib.h index a23b8b12b5..a7f29b1887 100644 --- a/UefiCpuPkg/Include/Library/CpuCacheInfoLib.h +++ b/UefiCpuPkg/Include/Library/CpuCacheInfoLib.h @@ -59,8 +59,6 @@ typedef struct { @retval EFI_INVALID_PARAMETER CpuCacheInfo is NULL while CpuCacheInfoCount contains the value greater than zero. @retval EFI_UNSUPPORTED Processor does not support CPUID_CACHE_PARAMS Leaf. - @retval EFI_NOT_FOUND EDKII_PEI_MP_SERVICES2_PPI or EFI_MP_SERVICES_PROTOCOL interface - is not found. @retval EFI_OUT_OF_RESOURCES Required resources could not be allocated. @retval EFI_BUFFER_TOO_SMALL CpuCacheInfoCount is too small to hold the response CpuCacheInfo array. CpuCacheInfoCount has been updated with the length needed diff --git a/UefiCpuPkg/Library/CpuCacheInfoLib/CpuCacheInfoLib.c b/UefiCpuPkg/Library/CpuCacheInfoLib/CpuCacheInfoLib.c index d1f9830c91..d46fb04258 100644 --- a/UefiCpuPkg/Library/CpuCacheInfoLib/CpuCacheInfoLib.c +++ b/UefiCpuPkg/Library/CpuCacheInfoLib/CpuCacheInfoLib.c @@ -346,8 +346,6 @@ CpuCacheInfoCollectCpuCacheInfoData ( @retval EFI_INVALID_PARAMETER CpuCacheInfo is NULL while CpuCacheInfoCount contains the value greater than zero. @retval EFI_UNSUPPORTED Processor does not support CPUID_CACHE_PARAMS Leaf. - @retval EFI_NOT_FOUND EDKII_PEI_MP_SERVICES2_PPI or EFI_MP_SERVICES_PROTOCOL interface - is not found. @retval EFI_OUT_OF_RESOURCES Required resources could not be allocated. @retval EFI_BUFFER_TOO_SMALL CpuCacheInfoCount is too small to hold the response CpuCacheInfo array. CpuCacheInfoCount has been updated with the length needed @@ -384,10 +382,7 @@ GetCpuCacheInfo ( // // Initialize COLLECT_CPUID_CACHE_DATA_CONTEXT.MpServices. // - Status = CpuCacheInfoGetMpServices (&Context.MpServices); - if (EFI_ERROR(Status)) { - return Status; - } + CpuCacheInfoGetMpServices (&Context.MpServices); NumberOfProcessors = CpuCacheInfoGetNumberOfProcessors (Context.MpServices); diff --git a/UefiCpuPkg/Library/CpuCacheInfoLib/DxeCpuCacheInfoLib.inf b/UefiCpuPkg/Library/CpuCacheInfoLib/DxeCpuCacheInfoLib.inf index 1fd45380b8..c481080e49 100644 --- a/UefiCpuPkg/Library/CpuCacheInfoLib/DxeCpuCacheInfoLib.inf +++ b/UefiCpuPkg/Library/CpuCacheInfoLib/DxeCpuCacheInfoLib.inf @@ -40,4 +40,4 @@ [Pcd] [Depex] - TRUE + gEfiMpServiceProtocolGuid diff --git a/UefiCpuPkg/Library/CpuCacheInfoLib/PeiCpuCacheInfoLib.inf b/UefiCpuPkg/Library/CpuCacheInfoLib/PeiCpuCacheInfoLib.inf index c8aa33c95a..0c73015cac 100644 --- a/UefiCpuPkg/Library/CpuCacheInfoLib/PeiCpuCacheInfoLib.inf +++ b/UefiCpuPkg/Library/CpuCacheInfoLib/PeiCpuCacheInfoLib.inf @@ -40,4 +40,4 @@ [Pcd] [Depex] - TRUE + gEdkiiPeiMpServices2PpiGuid -- 2.39.2