Changeset 108794 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c

Timestamp:

Mar 31, 2025 11:31:09 AM (2 weeks ago)

Author:

vboxsync

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

168237

Message:

Devices/EFI/FirmwareNew: Merge edk2-stable202502 from the vendor branch and make it build for the important platforms, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c (modified) (5 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c

@@ -2 +2 @@
 Implementation of SMM CPU Services Protocol.
 
-Copyright (c) 2011 - 2023, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2011 - 2024, Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#include "PiSmmCpuDxeSmm.h"
+#include "PiSmmCpuCommon.h"
 
 //
@@ -99 +99 @@
 
   if ((gSmmCpuPrivate->Operation[ProcessorNumber] != SmmCpuNone) ||
-      (gSmst->CurrentlyExecutingCpu == ProcessorNumber))
+      (gMmst->CurrentlyExecutingCpu == ProcessorNumber))
   {
     return EFI_UNSUPPORTED;
@@ -377 +377 @@
   EFI_STATUS  Status;
 
-  Status = gSmst->SmmInstallProtocolInterface (
+  Status = gMmst->MmInstallProtocolInterface (
                     &Handle,
                     &gEfiSmmCpuServiceProtocolGuid,
@@ -388 +388 @@
   }
 
-  Status = gSmst->SmmInstallProtocolInterface (
+  Status = gMmst->MmInstallProtocolInterface (
                     &Handle,
                     &gEdkiiSmmCpuRendezvousProtocolGuid,
@@ -432 +432 @@
   }
 
-  if ((mSmmMpSyncData->EffectiveSyncMode != SmmCpuSyncModeTradition) && !SmmCpuFeaturesNeedConfigureMtrrs ()) {
+  if ((mSmmMpSyncData->EffectiveSyncMode != MmCpuSyncModeTradition) && !SmmCpuFeaturesNeedConfigureMtrrs ()) {
     //
     // There are some APs outside SMM, Wait for all avaiable APs to arrive.