Bump MU_BASECORE from 2024050000.1.4 to 2024050003.0.1 (#1087)

Bumps MU_BASECORE from `2024050000.1.4` to `2024050003.0.0` Bumps MM_SUPV from `v14.0.2` to `v15.0.0.` Incorporates fixes for breaking changes in both modules. Signed-off-by: Project Mu Bot <[email protected]> --------- Signed-off-by: Project Mu Bot <[email protected]> Co-authored-by: Aaron Pop <[email protected]>
microsoft · Jan 16, 2025 · 43cf21b · 43cf21b
1 parent 43e3101
commit 43cf21b
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 16 deletions.
diff --git a/Features/MM_SUPV b/Features/MM_SUPV
diff --git a/MU_BASECORE b/MU_BASECORE
diff --git a/Platforms/QemuQ35Pkg/QemuQ35Pkg.dsc b/Platforms/QemuQ35Pkg/QemuQ35Pkg.dsc
@@ -54,12 +54,14 @@
   DXE_CRYPTO_SERVICES = STANDARD
   RUNTIMEDXE_CRYPTO_SERVICES = STANDARD
   SMM_CRYPTO_SERVICES = NONE
-  STANDALONEMM_CRYPTO_SERVICES = STANDARD
+  STANDALONEMM_CRYPTO_SERVICES = NONE
+  STANDALONEMM_MMSUPV_CRYPTO_SERVICES = STANDARD
   PEI_CRYPTO_ARCH = IA32
   DXE_CRYPTO_ARCH = X64
   RUNTIMEDXE_CRYPTO_ARCH = X64
   SMM_CRYPTO_ARCH = NONE
-  STANDALONEMM_CRYPTO_ARCH = X64
+  STANDALONEMM_CRYPTO_ARCH = NONE
+  STANDALONEMM_MMSUPV_CRYPTO_ARCH = X64
 
 ################################################################################
 #
@@ -321,6 +323,8 @@
 
   HobPrintLib|MdeModulePkg/Library/HobPrintLib/HobPrintLib.inf
 
+  MemoryBinOverrideLib|MdeModulePkg/Library/MemoryBinOverrideLibNull/MemoryBinOverrideLibNull.inf
+
 [LibraryClasses.IA32, LibraryClasses.X64]
   XenHypercallLib|QemuQ35Pkg/Library/XenHypercallLib/XenHypercallLib.inf
 
@@ -362,6 +366,8 @@
 [LibraryClasses.common.MM_CORE_STANDALONE, LibraryClasses.common.MM_STANDALONE]
   MmMemoryProtectionHobLib|MdeModulePkg/Library/MemoryProtectionHobLib/StandaloneMmMemoryProtectionHobLib.inf
 
+  PeCoffLibNegative|SeaPkg/Library/BasePeCoffLibNegative/BasePeCoffLibNegative.inf
+  SecurePolicyLib|MmSupervisorPkg/Library/SecurePolicyLib/SecurePolicyLib.inf
 #########################################
 # PEI Libraries
 #########################################

diff --git a/Platforms/QemuQ35Pkg/QemuQ35Pkg.fdf b/Platforms/QemuQ35Pkg/QemuQ35Pkg.fdf
@@ -514,7 +514,7 @@ 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.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

diff --git a/Platforms/QemuSbsaPkg/QemuSbsaPkg.ci.yaml b/Platforms/QemuSbsaPkg/QemuSbsaPkg.ci.yaml
@@ -140,7 +140,8 @@
             "dmaivrs",
             "nxcompat",
             "standalonemm",
-            "runtimedxe"
+            "runtimedxe",
+            "mmsupv",
         ],           # words to extend to the dictionary for this package
         "IgnoreStandardPaths": [],   # Standard Plugin defined paths that should be ignore
         "AdditionalIncludePaths": [] # Additional paths to spell check (wildcards supported)

diff --git a/Platforms/QemuSbsaPkg/QemuSbsaPkg.dsc b/Platforms/QemuSbsaPkg/QemuSbsaPkg.dsc
@@ -73,16 +73,18 @@
   DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS  = TRUE
   DEFINE NETWORK_ISCSI_ENABLE            = FALSE
 
-  PEI_CRYPTO_SERVICES           = TINY_SHA
-  DXE_CRYPTO_SERVICES           = STANDARD
-  RUNTIMEDXE_CRYPTO_SERVICES    = NONE
-  STANDALONEMM_CRYPTO_SERVICES  = STANDARD
-  SMM_CRYPTO_SERVICES           = NONE
-  PEI_CRYPTO_ARCH               = AARCH64
-  DXE_CRYPTO_ARCH               = AARCH64
-  RUNTIMEDXE_CRYPTO_ARCH        = NONE
-  STANDALONEMM_CRYPTO_ARCH      = AARCH64
-  SMM_CRYPTO_ARCH               = NONE
+  PEI_CRYPTO_SERVICES                 = TINY_SHA
+  DXE_CRYPTO_SERVICES                 = STANDARD
+  RUNTIMEDXE_CRYPTO_SERVICES          = NONE
+  STANDALONEMM_CRYPTO_SERVICES        = STANDARD
+  STANDALONEMM_MMSUPV_CRYPTO_SERVICES = NONE
+  SMM_CRYPTO_SERVICES                 = NONE
+  PEI_CRYPTO_ARCH                     = AARCH64
+  DXE_CRYPTO_ARCH                     = AARCH64
+  RUNTIMEDXE_CRYPTO_ARCH              = NONE
+  STANDALONEMM_CRYPTO_ARCH            = AARCH64
+  STANDALONEMM_MMSUPV_CRYPTO_ARCH     = NONE
+  SMM_CRYPTO_ARCH                     = NONE
 
 !if $(NETWORK_SNP_ENABLE) == TRUE
   !error "NETWORK_SNP_ENABLE is IA32/X64/EBC only"
@@ -378,6 +380,8 @@
 
   HobPrintLib|MdeModulePkg/Library/HobPrintLib/HobPrintLib.inf
 
+  MemoryBinOverrideLib|MdeModulePkg/Library/MemoryBinOverrideLibNull/MemoryBinOverrideLibNull.inf
+
 [LibraryClasses.common.SEC, LibraryClasses.common.PEI_CORE]
   NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf
 
@@ -505,6 +509,7 @@
   MemoryTypeInfoSecVarCheckLib|MdeModulePkg/Library/MemoryTypeInfoSecVarCheckLib/MemoryTypeInfoSecVarCheckLib.inf
   FltUsedLib|MdePkg/Library/FltUsedLib/FltUsedLib.inf
 
+
 [LibraryClasses.common.UEFI_DRIVER]
   UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
   ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
+0 −4		.azurepipelines/BaseTools-Build-For-Publication.yml
+0 −6		.github/workflows/release-basetools.yml
+1 −1		BaseTools/Conf/build_rule.template
+16 −8		BaseTools/Conf/tools_def.template
+4 −0		BaseTools/Edk2ToolsBuild.py
+4 −1		BaseTools/Source/C/GNUmakefile
+18 −0		BaseTools/Source/C/GenStm/GNUmakefile
+728 −0		BaseTools/Source/C/GenStm/GenStm.c
+72 −0		BaseTools/Source/C/GenStm/GenStm.h
+17 −0		BaseTools/Source/C/GenStm/Makefile
+7 −0		BaseTools/Source/C/Makefile
+2 −2		BaseTools/Source/C/Makefiles/ms.common
+1 −1		CryptoPkg/Binaries/BaseCryptoDriver_ext_dep.json
+1 −0		MdeModulePkg/Core/Dxe/DxeMain.inf
+25 −1		MdeModulePkg/Core/Dxe/Mem/Page.c
+48 −0		MdeModulePkg/Include/Library/MemoryBinOverrideLib.h
+52 −0		MdeModulePkg/Library/MemoryBinOverrideLibNull/MemoryBinOverrideLibNull.c
+31 −0		MdeModulePkg/Library/MemoryBinOverrideLibNull/MemoryBinOverrideLibNull.inf
+1 −1		MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
+6 −0		MdeModulePkg/MdeModulePkg.dec
+2 −0		MdeModulePkg/MdeModulePkg.dsc
+2 −0		MdeModulePkg/Test/MdeModulePkgHostTest.dsc
+360 −0		MdeModulePkg/Test/Mock/Include/GoogleTest/Library/MockHiiLib.h
+81 −0		MdeModulePkg/Test/Mock/Include/GoogleTest/Library/MockVariablePolicyHelperLib.h
+49 −0		MdeModulePkg/Test/Mock/Library/GoogleTest/MockHiiLib/MockHiiLib.cpp
+34 −0		MdeModulePkg/Test/Mock/Library/GoogleTest/MockHiiLib/MockHiiLib.inf
+14 −0		MdeModulePkg/Test/Mock/Library/GoogleTest/MockVariablePolicyHelperLib/MockVariablePolicyHelperLib.cpp
+33 −0		MdeModulePkg/Test/Mock/Library/GoogleTest/MockVariablePolicyHelperLib/MockVariablePolicyHelperLib.inf
+7 −1		MdePkg/Include/IndustryStandard/SmBios.h
+1 −0		MdePkg/Test/MdePkgHostTest.dsc
+1,001 −0		MdePkg/Test/Mock/Include/GoogleTest/Library/MockSafeIntLib.h
+13 −0		MdePkg/Test/Mock/Include/GoogleTest/Library/MockUefiBootServicesTableLib.h
+100 −0		MdePkg/Test/Mock/Include/GoogleTest/Protocol/MockFirmwareVolumeBlock.h
+162 −0		MdePkg/Test/Mock/Include/GoogleTest/Protocol/MockHiiDatabase.h
+47 −0		MdePkg/Test/Mock/Include/GoogleTest/Protocol/MockMmReportStatusCodeHandler.h
+92 −0		MdePkg/Test/Mock/Include/GoogleTest/Protocol/MockPciPlatformProtocol.h
+262 −0		MdePkg/Test/Mock/Include/GoogleTest/Protocol/MockPciRootBridgeIoProtocol.h
+52 −0		MdePkg/Test/Mock/Include/GoogleTest/Protocol/MockSmmSwDispatch2.h
+116 −0		MdePkg/Test/Mock/Library/GoogleTest/MockSafeIntLib/MockSafeIntLib.cpp
+33 −0		MdePkg/Test/Mock/Library/GoogleTest/MockSafeIntLib/MockSafeIntLib.inf
+6 −2		MdePkg/Test/Mock/Library/GoogleTest/MockUefiBootServicesTableLib/MockUefiBootServicesTableLib.cpp
+3 −1		ShellPkg/ShellPkg.ci.yaml
+1 −0		ShellPkg/ShellPkg.dec
+399 −0		ShellPkg/Test/Mock/Include/GoogleTest/Library/MockShellLib.h
+71 −0		ShellPkg/Test/Mock/Library/GoogleTest/MockShellLib/MockShellLib.cpp
+34 −0		ShellPkg/Test/Mock/Library/GoogleTest/MockShellLib/MockShellLib.inf
+31 −0		ShellPkg/Test/ShellPkgHostTest.dsc
+42 −28		StandaloneMmPkg/Core/Dispatcher.c