Q35: Remove NO_SMM support. (#1323)

## Description
Drop support for NO_SMM builds of Q35.

The NO_SMM builds of Q35 increase pipeline build time and are not widely
used.
Remove the pipeline build, and remove the associated code added to
support this configuraiton.


- [ ] Impacts functionality?
- [ ] Impacts security?
- [X] Breaking change?
- [ ] Includes tests?
- [ ] Includes documentation?

## How This Was Tested
Local compile an boot to OS.

## Integration Instructions
No integration necessary.

Author: apop5

.azurepipelines/Platform-Build-GCC5.yml

@@ -116,20 +116,6 @@ jobs:
           **/*/*TestApp.efi
         BuildArtifactsOther: "**/unit_test_results/*"
 
-      QemuQ35_NO_SMM_RELEASE:
-        BuildPackage: QemuQ35Pkg
-        BuildFile: "Platforms/QemuQ35Pkg/PlatformBuild.py"
-        BuildFlags: "BLD_*_SMM_ENABLED=FALSE"
-        BuildTarget: "RELEASE"
-        BuildExtraTag: "NO_SMM"
-        BuildExtraStep:
-          - script: echo No extra steps provided
-        Run: true
-        RunFlags: "SHUTDOWN_AFTER_RUN=TRUE QEMU_HEADLESS=TRUE BLD_*_QEMU_CORE_NUM=2 BLD_*_SMM_ENABLED=FALSE"
-        BuildArtifactsBinary: |
-          **/QEMUQ35_*.fd
-        BuildArtifactsOther: ""
-
       QemuSbsa_DEBUG:
         BuildPackage: QemuSbsaPkg
         BuildFile: "Platforms/QemuSbsaPkg/PlatformBuild.py"

.azurepipelines/Platform-Build-VS.yml

@@ -113,20 +113,6 @@ jobs:
           **/*/*TestApp.efi
         BuildArtifactsOther: "**/unit_test_results/*"
 
-      QemuQ35_NO_SMM_RELEASE:
-        BuildPackage: QemuQ35Pkg
-        BuildFile: "Platforms/QemuQ35Pkg/PlatformBuild.py"
-        BuildFlags: "BLD_*_SMM_ENABLED=FALSE"
-        BuildTarget: "RELEASE"
-        BuildExtraTag: "NO_SMM"
-        BuildExtraStep:
-          - script: echo No extra steps provided
-        Run: true
-        RunFlags: "SHUTDOWN_AFTER_RUN=TRUE QEMU_HEADLESS=TRUE BLD_*_QEMU_CORE_NUM=2 BLD_*_SMM_ENABLED=FALSE"
-        BuildArtifactsBinary: |
-          **/QEMUQ35_*.fd
-        BuildArtifactsOther: ""
-
       QemuQ35_CODE_COVERAGE:
         BuildPackage: QemuQ35Pkg
         BuildFile: "Platforms/QemuQ35Pkg/Test/PlatformTest.py"

DfciDutFiles/BuildDfci.py

@@ -18,7 +18,6 @@
     args = " BLD_*_GUI_FRONT_PAGE=TRUE"
     args += " BLD_*_NETWORK_ALLOW_HTTP_CONNECTIONS=TRUE"
     args += " BLD_*_QEMU_CORE_NUM=4"
-    args += " BLD_*_SMM_ENABLED=TRUE"
     args += " --clean"
 
     cmd = platformbuild + args

DfciDutFiles/RunDfci.py

@@ -60,7 +60,6 @@
         args += " ALT_BOOT_ENABLE=TRUE"
 
     args += " BLD_*_QEMU_CORE_NUM=4"
-    args += " BLD_*_SMM_ENABLED=TRUE"
 
     cmd = platformbuild + args
     os.system(cmd)

Platforms/QemuQ35Pkg/PlatformBuild.py

@@ -311,9 +311,6 @@ def SetPlatformEnv(self):
         # Note: This has no impact if CodeQL is not active/enabled.
         self.env.SetValue("STUART_CODEQL_AUDIT_ONLY", "true", "Platform Defined")
 
-        # Enabled all of the SMM modules
-        self.env.SetValue("BLD_*_SMM_ENABLED", "TRUE", "Default")
-
         if self.Helper.generate_secureboot_pcds(self) != 0:
             logging.error("Failed to generate include PCDs")
             return -1

Platforms/QemuQ35Pkg/Plugins/QemuRunner/QemuRunner.py

@@ -74,11 +74,6 @@ def Runner(env):
         # Turn off S3 support
         args += " -global ICH9-LPC.disable_s3=1"
 
-        if env.GetBuildValue("SMM_ENABLED") is None or env.GetBuildValue("SMM_ENABLED").lower() == "true":
-            smm_enabled = "on"
-        else:
-            smm_enabled = "off"
-
         accel = ""
         if env.GetValue("QEMU_ACCEL") is not None:
             if env.GetValue("QEMU_ACCEL").lower() == "kvm":
@@ -88,7 +83,7 @@ def Runner(env):
             elif env.GetValue("QEMU_ACCEL").lower() == "whpx":
                 accel = ",accel=whpx"
 
-        args += " -machine q35,smm=" + smm_enabled + accel
+        args += " -machine q35,smm=on" + accel
         path_to_os = env.GetValue("PATH_TO_OS")
         if path_to_os is not None:
             # Potentially dealing with big daddy, give it more juice...
@@ -125,8 +120,7 @@ def Runner(env):
 
         if env.GetBuildValue ("QEMU_CORE_NUM") is not None:
             args += " -smp " + env.GetBuildValue ("QEMU_CORE_NUM")
-        if smm_enabled == "on":
-            args += " -global driver=cfi.pflash01,property=secure,value=on"
+        args += " -global driver=cfi.pflash01,property=secure,value=on"
 
         code_fd = os.path.join(OutputPath_FV, "QEMUQ35_CODE.fd")
         args += " -drive if=pflash,format=raw,unit=0,file=" + \

Platforms/QemuQ35Pkg/QemuQ35Pkg.fdf

@@ -237,10 +237,8 @@ INF  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
 INF  MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf
 INF  MdeModulePkg/Universal/Variable/Pei/VariablePei.inf
 
-!if $(SMM_ENABLED) == TRUE
 INF  QemuQ35Pkg/SmmAccess/SmmAccessPei.inf
 INF  MmSupervisorPkg/Drivers/MmCommunicationBuffer/MmCommunicationBufferPei.inf
-!endif
 
 INF  UefiCpuPkg/CpuMpPei/CpuMpPei.inf
 
@@ -438,7 +436,6 @@ INF  QemuQ35Pkg/QemuVideoDxe/QemuVideoDxe.inf
 INF  QemuQ35Pkg/QemuRamfbDxe/QemuRamfbDxe.inf
 INF  QemuQ35Pkg/IoMmuDxe/IoMmuDxe.inf
 
-!if $(SMM_ENABLED) == TRUE
 INF  QemuQ35Pkg/SmmControl2Dxe/SmmControl2Dxe.inf
 INF  QemuQ35Pkg/SmmAccess/SmmAccess2Dxe.inf
 !if $(PEI_MM_IPL_ENABLED) == TRUE
@@ -452,20 +449,14 @@ INF  QemuQ35Pkg/SmmAccess/SmmAccess2Dxe.inf
 !endif
 INF  MmSupervisorPkg/Core/MmSupervisorCore.inf
 INF  UefiCpuPkg/CpuIo2Smm/CpuIo2StandaloneMm.inf
-!endif
 
 #
 # Variable driver stack (SMM)
 #
-!if $(SMM_ENABLED) == TRUE
 INF  QemuQ35Pkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesStandaloneMm.inf
 INF  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteStandaloneMm.inf
 INF  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableStandaloneMm.inf
 INF  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf
-!else
-INF  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
-INF  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
-!endif
 
 #
 # TPM support
@@ -495,13 +486,11 @@ INF  MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSta
 INF  MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceStandaloneMm.inf
 INF  MsCorePkg/MuVarPolicyFoundationDxe/MuVarPolicyFoundationDxe.inf
 INF MsCorePkg/LoadOptionVariablePolicyDxe/LoadOptionVariablePolicyDxe.inf
-!if $(SMM_ENABLED) == TRUE
 INF  MmSupervisorPkg/Drivers/MmSupervisorRing3Broker/MmSupervisorRing3Broker.inf
 INF  MmSupervisorPkg/Drivers/StandaloneMmUnblockMem/StandaloneMmUnblockMem.inf
 !if $(PERF_TRACE_ENABLE) == TRUE
 INF  MmSupervisorPkg/Drivers/MmSupervisorRing3Performance/MmSupervisorRing3Performance.inf
 !endif
-!endif
 # INF RuleOverride = DRIVER_ACPITABLE SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.inf
 # COMMENTED OUT DUE TO LACK OF TPM
 # INF  SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf
@@ -512,18 +501,12 @@ INF  MsGraphicsPkg/PrintScreenLogger/PrintScreenLogger.inf
 INF  SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.inf
 INF  MsCorePkg/AcpiRGRT/AcpiRgrt.inf
 
-!if $(SMM_ENABLED) == TRUE
   !include $(SHARED_CRYPTO_PATH)/Driver/Bin/CryptoDriver.DXE.inc.fdf
   !include $(SHARED_CRYPTO_PATH)/Driver/Bin/CryptoDriver.STANDALONEMM_MMSUPV.inc.fdf
-!else
-  !include $(SHARED_CRYPTO_PATH)/Driver/Bin/CryptoDriver.RUNTIMEDXE.inc.fdf
-!endif
 
 !if $(BUILD_UNIT_TESTS) == TRUE
   # INF UefiTestingPkg/FunctionalSystemTests/SmmPagingProtectionsTest/Smm/SmmPagingProtectionsTestStandaloneMm.inf # NOT YET SUPPORTED
-!if $(SMM_ENABLED) == TRUE
   INF  MmSupervisorPkg/Test/MmPagingAuditTest/UEFI/MmPagingAuditApp.inf
-!endif
   # INF  UefiTestingPkg/AuditTests/PagingAudit/UEFI/DxePagingAuditDriver.inf
 !endif
 
@@ -564,9 +547,7 @@ FILE FREEFORM = PCD(gZeroTouchPkgTokenSpaceGuid.PcdZeroTouchCertificateFile) {
   INF MsGraphicsPkg/OnScreenKeyboardDxe/OnScreenKeyboardDxe.inf
   INF MsGraphicsPkg/SimpleWindowManagerDxe/SimpleWindowManagerDxe.inf
   INF AdvLoggerPkg/Application/AdvancedLogDumper/AdvancedLogDumper.inf
-!if $(SMM_ENABLED) == TRUE
   INF MmSupervisorPkg/Drivers/MmSupervisorErrorReport/MmSupervisorErrorReport.inf
-!endif
   FILE APPLICATION=PCD(gPcBdsPkgTokenSpaceGuid.PcdShellFile) {
     SECTION PE32=$(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/X64/Shell.efi
     SECTION UI= "EdkShell"

Platforms/QemuQ35Pkg/QemuQ35PkgCommon.dsc.inc

@@ -47,12 +47,10 @@
 
   PEI_CRYPTO_SERVICES = TINY_SHA
   DXE_CRYPTO_SERVICES = STANDARD
-  RUNTIMEDXE_CRYPTO_SERVICES = STANDARD
   SMM_CRYPTO_SERVICES = NONE
   STANDALONEMM_CRYPTO_SERVICES = NONE
   STANDALONEMM_MMSUPV_CRYPTO_SERVICES = STANDARD
   DXE_CRYPTO_ARCH = X64
-  RUNTIMEDXE_CRYPTO_ARCH = X64
   SMM_CRYPTO_ARCH = NONE
   STANDALONEMM_CRYPTO_ARCH = NONE
   STANDALONEMM_MMSUPV_CRYPTO_ARCH = X64
@@ -589,8 +587,8 @@
   gAdvLoggerPkgTokenSpaceGuid.PcdAdvancedLoggerLocator|TRUE
   gAdvLoggerPkgTokenSpaceGuid.PcdAdvancedLoggerAutoWrapEnable|TRUE
 
-  gQemuPkgTokenSpaceGuid.PcdSmmSmramRequire|$(SMM_ENABLED)
-  gUefiQemuQ35PkgTokenSpaceGuid.PcdStandaloneMmEnable|$(SMM_ENABLED)
+  gQemuPkgTokenSpaceGuid.PcdSmmSmramRequire|TRUE
+  gUefiQemuQ35PkgTokenSpaceGuid.PcdStandaloneMmEnable|TRUE
   gUefiCpuPkgTokenSpaceGuid.PcdCpuHotPlugSupport|FALSE
 
   gQemuPkgTokenSpaceGuid.PcdEnableMemoryProtection|$(MEMORY_PROTECTION)
@@ -688,10 +686,6 @@
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xB0000000
   gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber|$(QEMU_CORE_NUM)
 
-!if $(SMM_ENABLED) == FALSE
-  gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvModeEnable|TRUE
-!endif
-
   # Use profile index 1
   gOemPkgTokenSpaceGuid.PcdActiveProfileIndex|0x1
 
@@ -779,13 +773,8 @@
   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIMemoryNVS|0x80
   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory|0x20
   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiReservedMemoryType|0x510
-!if $(SMM_ENABLED) == FALSE
-  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesCode|0x200
-  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesData|0x200
-!else
   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesCode|0x100
   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesData|0x1C0
-!endif
 
   #
   # Network Pcds
@@ -1341,12 +1330,6 @@ QemuQ35Pkg/Library/ResetSystemLib/StandaloneMmResetSystemLib.inf
   }
   MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf
 
-  #
-  # Variable driver stack (NO SMM)
-  #
-  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
-  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
-
   #
   # TPM support
   #