[PATCH v2 1/1] IntelSiliconPkg/ShadowMicrocodePei: Fix return value in ShadowMicrocode.

[PATCH v2 1/1] IntelSiliconPkg/ShadowMicrocodePei: Fix return value in ShadowMicrocode.

[Aaron Li]

ShadowMicrocode should return EFI_NOT_FOUND when no valid Microcode found
in FIT table.

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3110

Signed-off-by: Aaron Li <aaron.li@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Rangasai V Chaganty <rangasai.v.chaganty@intel.com>
Cc: Siyuan Fu <siyuan.fu@intel.com>
---
 Silicon/Intel/IntelSiliconPkg/Feature/ShadowMicrocode/ShadowMicrocodePei.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Silicon/Intel/IntelSiliconPkg/Feature/ShadowMicrocode/ShadowMicrocodePei.c b/Silicon/Intel/IntelSiliconPkg/Feature/ShadowMicrocode/ShadowMicrocodePei.c
index 5c7ee6910c8e..1494397a8e36 100644
--- a/Silicon/Intel/IntelSiliconPkg/Feature/ShadowMicrocode/ShadowMicrocodePei.c
+++ b/Silicon/Intel/IntelSiliconPkg/Feature/ShadowMicrocode/ShadowMicrocodePei.c
@@ -377,6 +377,9 @@ IsValidFitTable (
                                    with microcode patches data in it.
 
   @retval EFI_SUCCESS              The microcode has been shadowed to memory.
+  @retval EFI_INVALID_PARAMETER    BufferSize or Buffer is NULL.
+  @retval EFI_INVALID_PARAMETER    CpuIdCount not equal to 0 and MicrocodeCpuId is NULL.
+  @retval EFI_NOT_FOUND            No valid microcode found.
   @retval EFI_OUT_OF_RESOURCES     The operation fails due to lack of resources.
 
 **/
@@ -390,6 +393,7 @@ ShadowMicrocode (
   OUT VOID                                  **Buffer
   )
 {
+  EFI_STATUS                        Status;
   UINT64                            FitPointer;
   FIRMWARE_INTERFACE_TABLE_ENTRY    *FitEntry;
   UINT32                            EntryNum;
@@ -460,10 +464,13 @@ ShadowMicrocode (
       ));
 
     ShadowMicrocodePatchWorker (PatchInfoBuffer, PatchCount, TotalLoadSize, BufferSize, Buffer);
+    Status = EFI_SUCCESS;
+  } else {
+    Status = EFI_NOT_FOUND;
   }
 
   FreePool (PatchInfoBuffer);
-  return EFI_SUCCESS;
+  return Status;
 }
 
 
-- 
2.29.2.windows.2

Re: [PATCH v2 1/1] IntelSiliconPkg/ShadowMicrocodePei: Fix return value in ShadowMicrocode.

[Ni, Ray]

Reviewed-by: Ray Ni <ray.ni@intel.com>

> -----Original Message-----
> From: Li, Aaron <aaron.li@intel.com>
> Sent: Wednesday, December 9, 2020 3:00 PM
> To: devel@edk2.groups.io
> Cc: Ni, Ray <ray.ni@intel.com>; Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>; Fu, Siyuan <siyuan.fu@intel.com>
> Subject: [PATCH v2 1/1] IntelSiliconPkg/ShadowMicrocodePei: Fix return value in ShadowMicrocode.
> 
> ShadowMicrocode should return EFI_NOT_FOUND when no valid Microcode found
> in FIT table.
> 
> BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3110
> 
> Signed-off-by: Aaron Li <aaron.li@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Rangasai V Chaganty <rangasai.v.chaganty@intel.com>
> Cc: Siyuan Fu <siyuan.fu@intel.com>
> ---
>  Silicon/Intel/IntelSiliconPkg/Feature/ShadowMicrocode/ShadowMicrocodePei.c | 9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/Silicon/Intel/IntelSiliconPkg/Feature/ShadowMicrocode/ShadowMicrocodePei.c
> b/Silicon/Intel/IntelSiliconPkg/Feature/ShadowMicrocode/ShadowMicrocodePei.c
> index 5c7ee6910c8e..1494397a8e36 100644
> --- a/Silicon/Intel/IntelSiliconPkg/Feature/ShadowMicrocode/ShadowMicrocodePei.c
> +++ b/Silicon/Intel/IntelSiliconPkg/Feature/ShadowMicrocode/ShadowMicrocodePei.c
> @@ -377,6 +377,9 @@ IsValidFitTable (
>                                     with microcode patches data in it.
> 
> 
> 
>    @retval EFI_SUCCESS              The microcode has been shadowed to memory.
> 
> +  @retval EFI_INVALID_PARAMETER    BufferSize or Buffer is NULL.
> 
> +  @retval EFI_INVALID_PARAMETER    CpuIdCount not equal to 0 and MicrocodeCpuId is NULL.
> 
> +  @retval EFI_NOT_FOUND            No valid microcode found.
> 
>    @retval EFI_OUT_OF_RESOURCES     The operation fails due to lack of resources.
> 
> 
> 
>  **/
> 
> @@ -390,6 +393,7 @@ ShadowMicrocode (
>    OUT VOID                                  **Buffer
> 
>    )
> 
>  {
> 
> +  EFI_STATUS                        Status;
> 
>    UINT64                            FitPointer;
> 
>    FIRMWARE_INTERFACE_TABLE_ENTRY    *FitEntry;
> 
>    UINT32                            EntryNum;
> 
> @@ -460,10 +464,13 @@ ShadowMicrocode (
>        ));
> 
> 
> 
>      ShadowMicrocodePatchWorker (PatchInfoBuffer, PatchCount, TotalLoadSize, BufferSize, Buffer);
> 
> +    Status = EFI_SUCCESS;
> 
> +  } else {
> 
> +    Status = EFI_NOT_FOUND;
> 
>    }
> 
> 
> 
>    FreePool (PatchInfoBuffer);
> 
> -  return EFI_SUCCESS;
> 
> +  return Status;
> 
>  }
> 
> 
> 
> 
> 
> --
> 2.29.2.windows.2