X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=UefiCpuPkg%2FSecCore%2FSecBist.c;h=a9d36acadb0d652a85732b5b92315b60bdcfb2f6;hb=d5256ba932edd345fc1ca36bffa4dc3e5867c6aa;hp=10bebbca743559c538e39abbe1586b16253afbd5;hpb=d157de8b5603fb24feed6ec7b46be8677083c25a;p=mirror_edk2.git

diff --git a/UefiCpuPkg/SecCore/SecBist.c b/UefiCpuPkg/SecCore/SecBist.c
index 10bebbca74..a9d36acadb 100644
--- a/UefiCpuPkg/SecCore/SecBist.c
+++ b/UefiCpuPkg/SecCore/SecBist.c
@@ -14,11 +14,31 @@
 
 #include "SecMain.h"
 
+EFI_SEC_PLATFORM_INFORMATION_PPI mSecPlatformInformation = {
+  SecPlatformInformationBist
+};
+
+EFI_PEI_PPI_DESCRIPTOR mPeiSecPlatformInformation = {
+  (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),
+  &gEfiSecPlatformInformationPpiGuid,
+  &mSecPlatformInformation
+};
+
+EFI_SEC_PLATFORM_INFORMATION2_PPI mSecPlatformInformation2 = {
+  SecPlatformInformation2Bist
+};
+
+EFI_PEI_PPI_DESCRIPTOR mPeiSecPlatformInformation2 = {
+  (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),
+  &gEfiSecPlatformInformation2PpiGuid,
+  &mSecPlatformInformation2
+};
+
 /**
   Worker function to parse CPU BIST information from Guided HOB.
 
-  @param[out] StructureSize     Pointer to the variable describing size of the input buffer.
-  @param[out] StructureBuffer   Pointer to the buffer save CPU BIST information.
+  @param[in, out] StructureSize     Pointer to the variable describing size of the input buffer.
+  @param[in, out] StructureBuffer   Pointer to the buffer save CPU BIST information.
 
   @retval EFI_SUCCESS           The data was successfully returned.
   @retval EFI_BUFFER_TOO_SMALL  The buffer was too small.
@@ -59,9 +79,9 @@ GetBistFromHob (
 /**
   Implementation of the PlatformInformation service in EFI_SEC_PLATFORM_INFORMATION_PPI.
 
-  @param[in]  PeiServices                Pointer to the PEI Services Table.
-  @param[out] StructureSize              Pointer to the variable describing size of the input buffer.
-  @param[out  PlatformInformationRecord  Pointer to the EFI_SEC_PLATFORM_INFORMATION_RECORD.
+  @param[in]      PeiServices                Pointer to the PEI Services Table.
+  @param[in, out] StructureSize              Pointer to the variable describing size of the input buffer.
+  @param[out]     PlatformInformationRecord  Pointer to the EFI_SEC_PLATFORM_INFORMATION_RECORD.
 
   @retval EFI_SUCCESS                    The data was successfully returned.
   @retval EFI_BUFFER_TOO_SMALL           The buffer was too small.
@@ -81,9 +101,9 @@ SecPlatformInformationBist (
 /**
   Implementation of the PlatformInformation2 service in EFI_SEC_PLATFORM_INFORMATION2_PPI.
 
-  @param[in]  PeiServices                The pointer to the PEI Services Table.
-  @param[out] StructureSize              The pointer to the variable describing size of the input buffer.
-  @param[out] PlatformInformationRecord2 The pointer to the EFI_SEC_PLATFORM_INFORMATION_RECORD2.
+  @param[in]      PeiServices                The pointer to the PEI Services Table.
+  @param[in, out] StructureSize              The pointer to the variable describing size of the input buffer.
+  @param[out]     PlatformInformationRecord2 The pointer to the EFI_SEC_PLATFORM_INFORMATION_RECORD2.
 
   @retval EFI_SUCCESS                    The data was successfully returned.
   @retval EFI_BUFFER_TOO_SMALL           The buffer was too small. The current buffer size needed to
@@ -179,3 +199,72 @@ GetBistInfoFromPpi (
 
   return EFI_DEVICE_ERROR;
 }
+
+/**
+  Get CPUs' BIST by calling SecPlatformInformationPpi/SecPlatformInformation2Ppi.
+
+**/
+VOID
+RepublishSecPlatformInformationPpi (
+  VOID
+  )
+{
+  EFI_STATUS                            Status;
+  CONST EFI_PEI_SERVICES                **PeiServices;
+  UINT64                                BistInformationSize;
+  VOID                                  *BistInformationData;
+  EFI_PEI_PPI_DESCRIPTOR                *SecInformationDescriptor;
+
+  PeiServices = GetPeiServicesTablePointer ();
+  Status = GetBistInfoFromPpi (
+             PeiServices,
+             &gEfiSecPlatformInformation2PpiGuid,
+             &SecInformationDescriptor,
+             &BistInformationData,
+             &BistInformationSize
+             );
+  if (Status == EFI_SUCCESS) {
+    BuildGuidDataHob (
+      &gEfiCallerIdGuid,
+      BistInformationData,
+      (UINTN) BistInformationSize
+      );
+    //
+    // The old SecPlatformInformation2 data is on temporary memory.
+    // After memory discovered, we should never get it from temporary memory,
+    // or the data will be crashed. So, we reinstall SecPlatformInformation2 PPI here.
+    //
+    Status = PeiServicesReInstallPpi (
+               SecInformationDescriptor,
+               &mPeiSecPlatformInformation2
+               );
+  } if (Status == EFI_NOT_FOUND) {
+    Status = GetBistInfoFromPpi (
+               PeiServices,
+               &gEfiSecPlatformInformationPpiGuid,
+               &SecInformationDescriptor,
+               &BistInformationData,
+               &BistInformationSize
+               );
+    if (Status == EFI_SUCCESS) {
+      BuildGuidDataHob (
+        &gEfiCallerIdGuid,
+        BistInformationData,
+        (UINTN) BistInformationSize
+        );
+      //
+      // The old SecPlatformInformation data is on temporary memory.
+      // After memory discovered, we should never get it from temporary memory,
+      // or the data will be crashed. So, we reinstall SecPlatformInformation PPI here.
+      //
+      Status = PeiServicesReInstallPpi (
+                 SecInformationDescriptor,
+                 &mPeiSecPlatformInformation
+                 );
+    } else if (Status == EFI_NOT_FOUND) {
+      return;
+    }
+  }
+
+  ASSERT_EFI_ERROR(Status);
+}