From 43cf21b862a7a7423ecd8db9dcdd29c40ace012c Mon Sep 17 00:00:00 2001 From: "Project Mu Bot [bot]" <121908735+ProjectMuBot@users.noreply.github.com> Date: Thu, 16 Jan 2025 11:24:17 -0500 Subject: [PATCH] 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 --------- Signed-off-by: Project Mu Bot Co-authored-by: Aaron Pop --- Features/MM_SUPV | 2 +- MU_BASECORE | 2 +- Platforms/QemuQ35Pkg/QemuQ35Pkg.dsc | 10 +++++++-- Platforms/QemuQ35Pkg/QemuQ35Pkg.fdf | 2 +- Platforms/QemuSbsaPkg/QemuSbsaPkg.ci.yaml | 3 ++- Platforms/QemuSbsaPkg/QemuSbsaPkg.dsc | 25 ++++++++++++++--------- 6 files changed, 28 insertions(+), 16 deletions(-) diff --git a/Features/MM_SUPV b/Features/MM_SUPV index 59d5aa0110..75e5aec67e 160000 --- a/Features/MM_SUPV +++ b/Features/MM_SUPV @@ -1 +1 @@ -Subproject commit 59d5aa01102c9bba32bbcea2c8a9755d74ba0c3c +Subproject commit 75e5aec67e321eb2a1d6e69ef9bc293c2e8e4ff2 diff --git a/MU_BASECORE b/MU_BASECORE index 96e8877dd9..ab883845a0 160000 --- a/MU_BASECORE +++ b/MU_BASECORE @@ -1 +1 @@ -Subproject commit 96e8877dd90b5b65475487a393befbb406dc231a +Subproject commit ab883845a076ebabbd07168589004c3c3834680e diff --git a/Platforms/QemuQ35Pkg/QemuQ35Pkg.dsc b/Platforms/QemuQ35Pkg/QemuQ35Pkg.dsc index 96ebf245fa..048556e3bf 100644 --- 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 index 6002dc52f9..34d9a09bb6 100644 --- 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 index 7eb19c4c2b..ae56cbb1ef 100644 --- 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 index d6272c190c..7db8be8e49 100644 --- 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