UefiCpuPkg/CpuDxe: Enable protection for newly added page table

[mirror_edk2.git] / UefiCpuPkg / SecCore / SecBist.c

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