[PATCH v1 1/1] UefiCpuPkg/CpuCacheInfoLib: Add more dependency of CpuCacheInfoLib

[PATCH v1 1/1] UefiCpuPkg/CpuCacheInfoLib: Add more dependency of CpuCacheInfoLib

[Jason Lou]

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3190

Add more dependency to enforce the executability of CpuCacheInfoLib.

Signed-off-by: Jason Lou <yun.lou@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>
---
 UefiCpuPkg/Library/CpuCacheInfoLib/CpuCacheInfoLib.c      | 7 +------
 UefiCpuPkg/Include/Library/CpuCacheInfoLib.h              | 2 --
 UefiCpuPkg/Library/CpuCacheInfoLib/DxeCpuCacheInfoLib.inf | 2 +-
 UefiCpuPkg/Library/CpuCacheInfoLib/PeiCpuCacheInfoLib.inf | 2 +-
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/UefiCpuPkg/Library/CpuCacheInfoLib/CpuCacheInfoLib.c b/UefiCpuPkg/Library/CpuCacheInfoLib/CpuCacheInfoLib.c
index d1f9830c91e7..d46fb0425851 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/Include/Library/CpuCacheInfoLib.h b/UefiCpuPkg/Include/Library/CpuCacheInfoLib.h
index a23b8b12b5ee..a7f29b188775 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/DxeCpuCacheInfoLib.inf b/UefiCpuPkg/Library/CpuCacheInfoLib/DxeCpuCacheInfoLib.inf
index 1fd45380b871..c481080e49d8 100644
--- a/UefiCpuPkg/Library/CpuCacheInfoLib/DxeCpuCacheInfoLib.inf
+++ b/UefiCpuPkg/Library/CpuCacheInfoLib/DxeCpuCacheInfoLib.inf
@@ -40,4 +40,4 @@ [Protocols]
 [Pcd]
 
 [Depex]
-  TRUE
+  gEfiMpServiceProtocolGuid
diff --git a/UefiCpuPkg/Library/CpuCacheInfoLib/PeiCpuCacheInfoLib.inf b/UefiCpuPkg/Library/CpuCacheInfoLib/PeiCpuCacheInfoLib.inf
index c8aa33c95a8f..0c73015cac8b 100644
--- a/UefiCpuPkg/Library/CpuCacheInfoLib/PeiCpuCacheInfoLib.inf
+++ b/UefiCpuPkg/Library/CpuCacheInfoLib/PeiCpuCacheInfoLib.inf
@@ -40,4 +40,4 @@ [Ppis]
 [Pcd]
 
 [Depex]
-  TRUE
+  gEdkiiPeiMpServices2PpiGuid
-- 
2.28.0.windows.1

Re: [PATCH v1 1/1] UefiCpuPkg/CpuCacheInfoLib: Add more dependency of CpuCacheInfoLib

[Ni, Ray]

> -  Status = CpuCacheInfoGetMpServices (&Context.MpServices);
> 
> -  if (EFI_ERROR(Status)) {
> 
> -    return Status;
> 
> -  }
> 
> +  CpuCacheInfoGetMpServices (&Context.MpServices);

Why not replace the if-check with an assertion as below?
+ ASSERT_EFI_ERROR (Status);

Re: [edk2-devel] [PATCH v1 1/1] UefiCpuPkg/CpuCacheInfoLib: Add more dependency of CpuCacheInfoLib

[Jason Lou]

[-- Attachment #1: Type: text/plain, Size: 71 bytes --]

There is already the assertion in function CpuCacheInfoGetMpServices.

[-- Attachment #2: Type: text/html, Size: 120 bytes --]

Re: [edk2-devel] [PATCH v1 1/1] UefiCpuPkg/CpuCacheInfoLib: Add more dependency of CpuCacheInfoLib

[Ni, Ray]

[-- Attachment #1: Type: text/plain, Size: 468 bytes --]

I see.
How about changing the commit title to “UefiCpuPkg/CpuCacheInfoLib: Add MpService dependency”?


From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Jason Lou
Sent: Monday, February 1, 2021 8:36 PM
To: Ni; Ni, Ray <ray.ni@intel.com>; devel@edk2.groups.io
Subject: Re: [edk2-devel] [PATCH v1 1/1] UefiCpuPkg/CpuCacheInfoLib: Add more dependency of CpuCacheInfoLib

There is already the assertion in function CpuCacheInfoGetMpServices.


[-- Attachment #2: Type: text/html, Size: 2772 bytes --]

Re: [edk2-devel] [PATCH v1 1/1] UefiCpuPkg/CpuCacheInfoLib: Add more dependency of CpuCacheInfoLib

[Jason Lou]

[-- Attachment #1: Type: text/plain, Size: 38 bytes --]

Yes, good idea, I will update later.

[-- Attachment #2: Type: text/html, Size: 38 bytes --]