OvmfPkg/Microvm: no smm

Microvm has no SMM support.

Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3599
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Jiewen Yao <Jiewen.yao@intel.com>

2 files changed, 1 insertions, 115 deletions

diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc
index 97a8d90d74..b8260e032b 100644
--- a/OvmfPkg/Microvm/MicrovmX64.dsc
+++ b/OvmfPkg/Microvm/MicrovmX64.dsc
@@ -180,9 +180,7 @@
   VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf

   LoadLinuxLib|OvmfPkg/Library/LoadLinuxLib/LoadLinuxLib.inf

   MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/DxeMemEncryptSevLib.inf

-!if $(SMM_REQUIRE) == FALSE

   LockBoxLib|OvmfPkg/Library/LockBoxLib/LockBoxBaseLib.inf

-!endif

   CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf

   FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf

 

@@ -358,9 +356,6 @@
   PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf

   QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf

   VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf

-!if $(SMM_REQUIRE) == TRUE

-  MmUnblockMemoryLib|MdePkg/Library/MmUnblockMemoryLib/MmUnblockMemoryLibNull.inf

-!endif

 

 [LibraryClasses.common.UEFI_DRIVER]

   PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

@@ -395,11 +390,7 @@
   PlatformBmPrintScLib|OvmfPkg/Library/PlatformBmPrintScLib/PlatformBmPrintScLib.inf

   QemuBootOrderLib|OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf

   CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf

-!if $(SMM_REQUIRE) == TRUE

-  LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf

-!else

   LockBoxLib|OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf

-!endif

 !if $(SOURCE_DEBUG_ENABLE) == TRUE

   DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf

 !endif

@@ -480,17 +471,10 @@
 !ifdef $(CSM_ENABLE)

   gUefiOvmfPkgTokenSpaceGuid.PcdCsmEnable|TRUE

 !endif

-!if $(SMM_REQUIRE) == TRUE

-  gUefiOvmfPkgTokenSpaceGuid.PcdSmmSmramRequire|TRUE

-  gUefiCpuPkgTokenSpaceGuid.PcdCpuHotPlugSupport|TRUE

-  gEfiMdeModulePkgTokenSpaceGuid.PcdEnableVariableRuntimeCache|FALSE

-!endif

 

 [PcdsFixedAtBuild]

   gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1

-!if $(SMM_REQUIRE) == FALSE

   gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE

-!endif

   gEfiMdePkgTokenSpaceGuid.PcdMaximumGuidedExtractHandler|0x10

   gEfiMdePkgTokenSpaceGuid.PcdMaximumLinkedListLength|0

 !if ($(FD_SIZE_IN_KB) == 1024) || ($(FD_SIZE_IN_KB) == 2048)

@@ -579,10 +563,6 @@
 

   gEfiShellPkgTokenSpaceGuid.PcdShellFileOperationSize|0x20000

 

-!if $(SMM_REQUIRE) == TRUE

-  gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000

-!endif

-

   # IRQs 5, 9, 10, 11 are level-triggered

   gUefiOvmfPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0E20

 

@@ -600,11 +580,9 @@
   #   ($(SMM_REQUIRE) == FALSE)

   gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0

 

-!if $(SMM_REQUIRE) == FALSE

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0

-!endif

   gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|800

   gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|600

   gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable|FALSE

@@ -645,13 +623,6 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdGhcbSize|0

   gUefiCpuPkgTokenSpaceGuid.PcdSevEsIsEnabled|0

 

-!if $(SMM_REQUIRE) == TRUE

-  gUefiOvmfPkgTokenSpaceGuid.PcdQ35TsegMbytes|8

-  gUefiOvmfPkgTokenSpaceGuid.PcdQ35SmramAtDefaultSmbase|FALSE

-  gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmSyncMode|0x01

-  gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmApSyncTimeout|100000

-!endif

-

   gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00

 

 !if $(TPM_ENABLE) == TRUE

@@ -703,17 +674,7 @@
   MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf

 

   OvmfPkg/PlatformPei/PlatformPei.inf

-  UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf {

-    <LibraryClasses>

-!if $(SMM_REQUIRE) == TRUE

-      LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf

-!endif

-  }

-!if $(SMM_REQUIRE) == TRUE

-  MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf

-  MdeModulePkg/Universal/Variable/Pei/VariablePei.inf

-  OvmfPkg/SmmAccess/SmmAccessPei.inf

-!endif

+  UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf

   UefiCpuPkg/CpuMpPei/CpuMpPei.inf

 

 !if $(TPM_ENABLE) == TRUE

@@ -966,50 +927,6 @@
   OvmfPkg/AmdSevDxe/AmdSevDxe.inf

   OvmfPkg/IoMmuDxe/IoMmuDxe.inf

 

-!if $(SMM_REQUIRE) == TRUE

-  OvmfPkg/SmmAccess/SmmAccess2Dxe.inf

-  OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.inf

-  OvmfPkg/CpuS3DataDxe/CpuS3DataDxe.inf

-

-  #

-  # SMM Initial Program Load (a DXE_RUNTIME_DRIVER)

-  #

-  MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf

-

-  #

-  # SMM_CORE

-  #

-  MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf

-

-  #

-  # Privileged drivers (DXE_SMM_DRIVER modules)

-  #

-  OvmfPkg/CpuHotplugSmm/CpuHotplugSmm.inf

-  UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf

-  MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf {

-    <LibraryClasses>

-      LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.inf

-  }

-  UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf {

-    <LibraryClasses>

-      SmmCpuPlatformHookLib|OvmfPkg/Library/SmmCpuPlatformHookLibQemu/SmmCpuPlatformHookLibQemu.inf

-      SmmCpuFeaturesLib|OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf

-  }

-

-  #

-  # Variable driver stack (SMM)

-  #

-  OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesSmm.inf

-  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf

-  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf {

-    <LibraryClasses>

-      NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf

-      NULL|MdeModulePkg/Library/VarCheckPolicyLib/VarCheckPolicyLib.inf

-  }

-  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf

-

-!else

-

   #

   # Variable driver stack (non-SMM)

   #

@@ -1023,7 +940,6 @@
     <LibraryClasses>

       NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf

   }

-!endif

 

   #

   # TPM support

diff --git a/OvmfPkg/Microvm/MicrovmX64.fdf b/OvmfPkg/Microvm/MicrovmX64.fdf
index 5c1b85792e..de34abd51b 100644
--- a/OvmfPkg/Microvm/MicrovmX64.fdf
+++ b/OvmfPkg/Microvm/MicrovmX64.fdf
@@ -173,11 +173,6 @@ INF  MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
 INF  OvmfPkg/PlatformPei/PlatformPei.inf

 INF  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf

 INF  UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf

-!if $(SMM_REQUIRE) == TRUE

-INF  MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf

-INF  MdeModulePkg/Universal/Variable/Pei/VariablePei.inf

-INF  OvmfPkg/SmmAccess/SmmAccessPei.inf

-!endif

 INF  UefiCpuPkg/CpuMpPei/CpuMpPei.inf

 

 !if $(TPM_ENABLE) == TRUE

@@ -214,9 +209,6 @@ APRIORI DXE {
   INF  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf

   INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf

   INF  OvmfPkg/AmdSevDxe/AmdSevDxe.inf

-!if $(SMM_REQUIRE) == FALSE

-  INF  OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf

-!endif

 }

 

 #

@@ -353,27 +345,6 @@ INF  OvmfPkg/PlatformDxe/Platform.inf
 INF  OvmfPkg/AmdSevDxe/AmdSevDxe.inf

 INF  OvmfPkg/IoMmuDxe/IoMmuDxe.inf

 

-!if $(SMM_REQUIRE) == TRUE

-INF  OvmfPkg/SmmAccess/SmmAccess2Dxe.inf

-INF  OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.inf

-INF  OvmfPkg/CpuS3DataDxe/CpuS3DataDxe.inf

-INF  MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf

-INF  MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf

-INF  OvmfPkg/CpuHotplugSmm/CpuHotplugSmm.inf

-INF  UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf

-INF  MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf

-INF  UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf

-

-#

-# Variable driver stack (SMM)

-#

-INF  OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesSmm.inf

-INF  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf

-INF  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf

-INF  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf

-

-!else

-

 #

 # Variable driver stack (non-SMM)

 #

@@ -381,7 +352,6 @@ INF  OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf
 INF  OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.inf

 INF  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf

 INF  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf

-!endif

 

 #

 # TPM support