UefiCpuPkg/SecCore: Abstract worker function GetBistFromHob()

Abstract one worker function to get CPU BIST from the GUIDed-HOB. Add
SecPlatformInformationBist() and SecPlatformInformation2Bist() to invoke
GetBistFromHob(). Add in/out for parameter in function header.

Cc: Michael Kinney <michael.d.kinney@intel.com>
Cc: Feng Tian <feng.tian@intel.com>
Cc: Giri P Mudusuru <giri.p.mudusuru@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jeff Fan <jeff.fan@intel.com>
Reviewed-by: Feng Tian <feng.tian@Intel.com>

diff --git a/UefiCpuPkg/SecCore/SecBist.c b/UefiCpuPkg/SecCore/SecBist.c
index cba445dca038ad27018ca36209268491a7c8e80d..10bebbca743559c538e39abbe1586b16253afbd5 100644 (file)
--- a/UefiCpuPkg/SecCore/SecBist.c
+++ b/UefiCpuPkg/SecCore/SecBist.c
@@ -15,30 +15,26 @@
 #include "SecMain.h"\r
 \r
 /**\r
-  Implementation of the PlatformInformation2 service in EFI_SEC_PLATFORM_INFORMATION2_PPI.\r
+  Worker function to parse CPU BIST information from Guided HOB.\r
 \r
-  @param  PeiServices                The pointer to the PEI Services Table.\r
-  @param  StructureSize              The pointer to the variable describing size of the input buffer.\r
-  @param  PlatformInformationRecord2 The pointer to the EFI_SEC_PLATFORM_INFORMATION_RECORD2.\r
+  @param[out] StructureSize     Pointer to the variable describing size of the input buffer.\r
+  @param[out] StructureBuffer   Pointer to the buffer save CPU BIST information.\r
 \r
-  @retval EFI_SUCCESS                The data was successfully returned.\r
-  @retval EFI_BUFFER_TOO_SMALL       The buffer was too small. The current buffer size needed to\r
-                                     hold the record is returned in StructureSize.\r
+  @retval EFI_SUCCESS           The data was successfully returned.\r
+  @retval EFI_BUFFER_TOO_SMALL  The buffer was too small.\r
 \r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
-SecPlatformInformation2 (\r
-  IN CONST EFI_PEI_SERVICES                   **PeiServices,\r
-  IN OUT UINT64                               *StructureSize,\r
-     OUT EFI_SEC_PLATFORM_INFORMATION_RECORD2 *PlatformInformationRecord2\r
+GetBistFromHob (\r
+  IN OUT UINT64           *StructureSize,\r
+  IN OUT VOID             *StructureBuffer\r
   )\r
 {\r
   EFI_HOB_GUID_TYPE       *GuidHob;\r
   VOID                    *DataInHob;\r
   UINTN                   DataSize;\r
 \r
-  GuidHob = GetFirstGuidHob (&gEfiSecPlatformInformation2PpiGuid);\r
+  GuidHob = GetFirstGuidHob (&gEfiCallerIdGuid);\r
   if (GuidHob == NULL) {\r
     *StructureSize = 0;\r
     return EFI_SUCCESS;\r
@@ -56,20 +52,65 @@ SecPlatformInformation2 (
   }\r
 \r
   *StructureSize = (UINT64) DataSize;\r
-  CopyMem (PlatformInformationRecord2, DataInHob, DataSize);\r
+  CopyMem (StructureBuffer, DataInHob, DataSize);\r
   return EFI_SUCCESS;\r
 }\r
 \r
+/**\r
+  Implementation of the PlatformInformation service in EFI_SEC_PLATFORM_INFORMATION_PPI.\r
+\r
+  @param[in]  PeiServices                Pointer to the PEI Services Table.\r
+  @param[out] StructureSize              Pointer to the variable describing size of the input buffer.\r
+  @param[out  PlatformInformationRecord  Pointer to the EFI_SEC_PLATFORM_INFORMATION_RECORD.\r
+\r
+  @retval EFI_SUCCESS                    The data was successfully returned.\r
+  @retval EFI_BUFFER_TOO_SMALL           The buffer was too small.\r
+\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+SecPlatformInformationBist (\r
+  IN CONST EFI_PEI_SERVICES                  **PeiServices,\r
+  IN OUT UINT64                              *StructureSize,\r
+     OUT EFI_SEC_PLATFORM_INFORMATION_RECORD *PlatformInformationRecord\r
+  )\r
+{\r
+  return GetBistFromHob (StructureSize, PlatformInformationRecord);\r
+}\r
+\r
+/**\r
+  Implementation of the PlatformInformation2 service in EFI_SEC_PLATFORM_INFORMATION2_PPI.\r
+\r
+  @param[in]  PeiServices                The pointer to the PEI Services Table.\r
+  @param[out] StructureSize              The pointer to the variable describing size of the input buffer.\r
+  @param[out] PlatformInformationRecord2 The pointer to the EFI_SEC_PLATFORM_INFORMATION_RECORD2.\r
+\r
+  @retval EFI_SUCCESS                    The data was successfully returned.\r
+  @retval EFI_BUFFER_TOO_SMALL           The buffer was too small. The current buffer size needed to\r
+                                         hold the record is returned in StructureSize.\r
+\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+SecPlatformInformation2Bist (\r
+  IN CONST EFI_PEI_SERVICES                   **PeiServices,\r
+  IN OUT UINT64                               *StructureSize,\r
+     OUT EFI_SEC_PLATFORM_INFORMATION_RECORD2 *PlatformInformationRecord2\r
+  )\r
+{\r
+  return GetBistFromHob (StructureSize, PlatformInformationRecord2);\r
+}\r
+\r
 /**\r
   Worker function to get CPUs' BIST by calling SecPlatformInformationPpi\r
   or SecPlatformInformation2Ppi.\r
 \r
-  @param  PeiServices         Pointer to PEI Services Table\r
-  @param  Guid                PPI Guid\r
-  @param  PpiDescriptor       Return a pointer to instance of the\r
-                              EFI_PEI_PPI_DESCRIPTOR\r
-  @param  BistInformationData Pointer to BIST information data\r
-  @param  BistInformationSize Return the size in bytes of BIST information\r
+  @param[in]  PeiServices         Pointer to PEI Services Table\r
+  @param[in]  Guid                PPI Guid\r
+  @param[out] PpiDescriptor       Return a pointer to instance of the\r
+                                  EFI_PEI_PPI_DESCRIPTOR\r
+  @param[out] BistInformationData Pointer to BIST information data\r
+  @param[out] BistInformationSize Return the size in bytes of BIST information\r
 \r
   @retval EFI_SUCCESS         Retrieve of the BIST data successfully\r
   @retval EFI_NOT_FOUND       No sec platform information(2) ppi export\r