Changeset 99404 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg/PlatformPei/FeatureControl.c

Timestamp:

Apr 14, 2023 3:17:44 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

156854

Message:

Devices/EFI/FirmwareNew: Update to edk2-stable202302 and make it build, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• OvmfPkg/PlatformPei/FeatureControl.c (modified) (8 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg/PlatformPei/FeatureControl.c

@@ -9 +9 @@
 
 #include <Library/DebugLib.h>
+#include <Library/HobLib.h>
 #include <Library/PeiServicesLib.h>
 #include <Library/QemuFwCfgLib.h>
 #include <Ppi/MpServices.h>
 #include <Register/ArchitecturalMsr.h>
+#include <IndustryStandard/Tdx.h>
 
 #include "Platform.h"
-
-//
-// The value to be written to the Feature Control MSR, retrieved from fw_cfg.
-//
-STATIC UINT64 mFeatureControlValue;
 
 /**
@@ -35 +32 @@
 EFIAPI
 WriteFeatureControl (
-  IN OUT VOID *WorkSpace
+  IN OUT VOID  *WorkSpace
   )
 {
-  AsmWriteMsr64 (MSR_IA32_FEATURE_CONTROL, mFeatureControlValue);
+  EFI_HOB_PLATFORM_INFO  *PlatformInfoHob = WorkSpace;
+
+  if (TdIsEnabled ()) {
+    TdVmCall (
+      TDVMCALL_WRMSR,
+      (UINT64)MSR_IA32_FEATURE_CONTROL,
+      PlatformInfoHob->FeatureControlValue,
+      0,
+      0,
+      0
+      );
+  } else {
+    AsmWriteMsr64 (
+      MSR_IA32_FEATURE_CONTROL,
+      PlatformInfoHob->FeatureControlValue
+      );
+  }
 }
 
@@ -61 +74 @@
   )
 {
-  EFI_PEI_MP_SERVICES_PPI *MpServices;
-  EFI_STATUS              Status;
+  EFI_PEI_MP_SERVICES_PPI  *MpServices;
+  EFI_STATUS               Status;
+  EFI_HOB_PLATFORM_INFO    *PlatformInfoHob;
+  EFI_HOB_GUID_TYPE        *GuidHob;
+
+  GuidHob = GetFirstGuidHob (&gUefiOvmfPkgPlatformInfoGuid);
+  if (GuidHob == NULL) {
+    return EFI_UNSUPPORTED;
+  }
+
+  PlatformInfoHob = (EFI_HOB_PLATFORM_INFO *)GET_GUID_HOB_DATA (GuidHob);
 
   DEBUG ((DEBUG_VERBOSE, "%a: %a\n", gEfiCallerBaseName, __FUNCTION__));
@@ -70 +92 @@
   //
   MpServices = Ppi;
-  Status = MpServices->StartupAllAPs (
-                         (CONST EFI_PEI_SERVICES **)PeiServices,
-                         MpServices,
-                         WriteFeatureControl, // Procedure
-                         FALSE,               // SingleThread
-                         0,                   // TimeoutInMicroSeconds: inf.
-                         NULL                 // ProcedureArgument
-                         );
-  if (EFI_ERROR (Status) && Status != EFI_NOT_STARTED) {
+  Status     = MpServices->StartupAllAPs (
+                             (CONST EFI_PEI_SERVICES **)PeiServices,
+                             MpServices,
+                             WriteFeatureControl, // Procedure
+                             FALSE,               // SingleThread
+                             0,                   // TimeoutInMicroSeconds: inf.
+                             PlatformInfoHob      // ProcedureArgument
+                             );
+  if (EFI_ERROR (Status) && (Status != EFI_NOT_STARTED)) {
     DEBUG ((DEBUG_ERROR, "%a: StartupAllAps(): %r\n", __FUNCTION__, Status));
     return Status;
@@ -86 +108 @@
   // Now write the MSR on the BSP too.
   //
-  WriteFeatureControl (NULL);
+  WriteFeatureControl (PlatformInfoHob);
   return EFI_SUCCESS;
 }
@@ -94 +116 @@
 // EFI_PEI_MP_SERVICES_PPI becomes available.
 //
-STATIC CONST EFI_PEI_NOTIFY_DESCRIPTOR mMpServicesNotify = {
+STATIC CONST EFI_PEI_NOTIFY_DESCRIPTOR  mMpServicesNotify = {
   EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK | // Flags
   EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST,
@@ -103 +125 @@
 VOID
 InstallFeatureControlCallback (
-  VOID
+  IN OUT EFI_HOB_PLATFORM_INFO  *PlatformInfoHob
   )
 {
-  EFI_STATUS           Status;
-  FIRMWARE_CONFIG_ITEM FwCfgItem;
-  UINTN                FwCfgSize;
+  EFI_STATUS            Status;
+  FIRMWARE_CONFIG_ITEM  FwCfgItem;
+  UINTN                 FwCfgSize;
 
-  Status = QemuFwCfgFindFile ("etc/msr_feature_control", &FwCfgItem,
-             &FwCfgSize);
-  if (EFI_ERROR (Status) || FwCfgSize != sizeof mFeatureControlValue) {
+  Status = QemuFwCfgFindFile (
+             "etc/msr_feature_control",
+             &FwCfgItem,
+             &FwCfgSize
+             );
+  if (EFI_ERROR (Status) || (FwCfgSize != sizeof (PlatformInfoHob->FeatureControlValue))) {
     //
     // Nothing to do.
@@ -118 +143 @@
     return;
   }
+
   QemuFwCfgSelectItem (FwCfgItem);
-  QemuFwCfgReadBytes (sizeof mFeatureControlValue, &mFeatureControlValue);
+  QemuFwCfgReadBytes (
+    sizeof (PlatformInfoHob->FeatureControlValue),
+    &(PlatformInfoHob->FeatureControlValue)
+    );
 
   Status = PeiServicesNotifyPpi (&mMpServicesNotify);
   if (EFI_ERROR (Status)) {
-    DEBUG ((DEBUG_ERROR, "%a: failed to set up MP Services callback: %r\n",
-      __FUNCTION__, Status));
+    DEBUG ((
+      DEBUG_ERROR,
+      "%a: failed to set up MP Services callback: %r\n",
+      __FUNCTION__,
+      Status
+      ));
   }
 }