Attachment 260266 Details for Bug 285554 – 202502 update patch with reverted memory attributes protocol

[patch] 202502 update patch with reverted memory attributes protocol

0001-sysutils-edk2-Update-to-202502.patch (text/plain), 30.94 KB, created by Alexey on 2025-05-08 17:52:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexey

Created: 2025-05-08 17:52:06 UTC

Size: 30.94 KB

patch

obsolete

>From 7a05bafa94e4a504f6f9bda904a5c4887cc6daa6 Mon Sep 17 00:00:00 2001
>From: Alexey Laurentsyeu <9vlc@proton.me>
>Date: Wed, 7 May 2025 13:29:05 +0300
>Subject: [PATCH] sysutils/edk2: Update to 202502
>
>---
> sysutils/edk2/Makefile                        | 112 +++---
> sysutils/edk2/distinfo                        |  42 ++-
> ...mfPkg_Bhyve_AcpiPlatformDxe_AcpiPlatform.c |  38 --
> ...patch-OvmfPkg_Bhyve_PlatformPei_Platform.c |  13 -
> .../edk2/files/patch-remove-memattr-protocol  | 353 ++++++++++++++++++
> 5 files changed, 433 insertions(+), 125 deletions(-)
> delete mode 100644 sysutils/edk2/files/patch-OvmfPkg_Bhyve_AcpiPlatformDxe_AcpiPlatform.c
> delete mode 100644 sysutils/edk2/files/patch-OvmfPkg_Bhyve_PlatformPei_Platform.c
> create mode 100644 sysutils/edk2/files/patch-remove-memattr-protocol
>
>diff --git a/sysutils/edk2/Makefile b/sysutils/edk2/Makefile
>index 5b1947c88..3f7a799db 100644
>--- a/sysutils/edk2/Makefile
>+++ b/sysutils/edk2/Makefile
>@@ -1,6 +1,5 @@
> PORTNAME=	edk2
>-PORTVERSION=	g202308
>-PORTREVISION=	5
>+PORTVERSION=	g202502
> CATEGORIES=	sysutils
> 
> PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
>@@ -15,39 +14,48 @@ ONLY_FOR_ARCHS=		aarch64 amd64
> ONLY_FOR_ARCHS_REASON=	only provides firmware for aarch64 and amd64
> 
> PKGNAMESUFFIX=	-${FLAVOR:C/_/-/g}
>-FLAVORS=	macchiatobin fvp rpi3 rpi4 xen_x64 bhyve qemu_x64 qemu_i386
>+FLAVORS=	bhyve macchiatobin fvp rpi3 rpi4 xen_x64 qemu_x64 qemu_i386
> 
>-USES=	cpe gmake python:build
>+USES=	dos2unix cpe gmake python:build
> CPE_VENDOR=	tianocore
>-USE_GCC=	yes:build
>+USE_GCC=	yes
>+DOS2UNIX_FILES=	UefiCpuPkg/CpuDxe/CpuDxe.inf \
>+		UefiCpuPkg/CpuDxe/CpuDxe.c \
>+		UefiCpuPkg/CpuDxe/CpuPageTable.c \
>+		UefiCpuPkg/CpuDxe/CpuPageTable.h
> 
> BUILD_DEPENDS+=	dtc>=1.4.1:sysutils/dtc \
> 		bash:shells/bash
> 
> # Both platform and non-osi repository don't have release, use latest known to work tag
>-PLATFORM_TAG=	e509ac5a72
>-NONOSI_TAG=	8c09bd0955
>+PLATFORM_TAG=	fd56374f2d1f8f6462a61a73dbe8948922c8abdf
>+NONOSI_TAG=	ea2040c2d4e2200557e87b9f9fbd4f8fb7a2b6e8
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	tianocore
>-GH_TAGNAME=	edk2-stable202308
>+GH_TAGNAME=	edk2-stable202502
> GH_TUPLE=	tianocore:edk2-platforms:${PLATFORM_TAG}:platforms \
> 		tianocore:edk2-non-osi:${NONOSI_TAG}:nonosi \
>-		google:brotli:v1.0.9-35-gf4153a0:brotli/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli \
>-		google:googletest:release-1.8.0-2983-g86add134:googletest/UnitTestFrameworkPkg/Library/GoogleTestLib/googletest \
>-		MIPI-Alliance:public-mipi-sys-t:v1.1+edk2:mipisyst/MdePkg/Library/MipiSysTLib/mipisyst \
>-		openssl:openssl:openssl-3.0.9:openssl/CryptoPkg/Library/OpensslLib/openssl \
>-		tianocore:edk2-cmocka:cmocka-1.1.5-23-g1cc9cde:cmocka/UnitTestFrameworkPkg/Library/CmockaLib/cmocka
>+		google:brotli:f4153a09f87cbb9c826d8fc12c74642bb2d879ea:brotli/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli \
>+		google:googletest:86add13493e5c881d7e4ba77fb91c1f57752b3a4:googletest/UnitTestFrameworkPkg/Library/GoogleTestLib/googletest \
>+		tianocore:edk2-cmocka:1cc9cde3448cdd2e000886a26acf1caac2db7cf1:cmocka/UnitTestFrameworkPkg/Library/CmockaLib/cmocka \
>+		MIPI-Alliance:public-mipi-sys-t:370b5944c046bab043dd8b133727b2135af7747a:mipisyst/MdePkg/Library/MipiSysTLib/mipisyst \
>+		openssl:openssl:a26d85337dbdcd33c971f38eb3fa5150e75cea87:openssl/CryptoPkg/Library/OpensslLib/openssl \
>+		Mbed-TLS:mbedtls:8c89224991adff88d53cd380f42a2baa36f91454:mbedtls/CryptoPkg/Library/MbedTlsLib/mbedtls \
>+		DMTF:libspdm:98ef964e1e9a0c39c7efb67143d3a13a819432e0:libspdm/SecurityPkg/DeviceSecurity/SpdmLib/libspdm
> 
> .include <bsd.port.pre.mk>
> 
>+# https://github.com/tianocore/edk2/pull/10667
>+PATCHFILES=	aa7f29a9e92b9e6f8b2e56bacaef6c96b8dc80ed.patch:-p1
>+
> # Heavily dependent on bsd.port.pre.mk definitions for lang/gcc* details:
> BINARY_ALIAS=	make=${GMAKE} \
>-		dtc=${LOCALBASE}/bin/dtc \
>-		ar=${AR} \
> 		gcc=${LOCALBASE}/bin/${CC} \
>-		gcc-ar=${LOCALBASE}/bin/${CC:S/gcc/&-ar/} \
> 		g++=${LOCALBASE}/bin/${CXX} \
>+		gcc-nm=${LOCALBASE}/bin/${CC:S/gcc/&-nm/} \
>+		gcc-ar=${LOCALBASE}/bin/${CC:S/gcc/&-ar/} \
>+		gcc-ranlib=${LOCALBASE}/bin/${CC:S/gcc/&-ranlib/} \
> 		python3=${PYTHON_CMD} python=${PYTHON_CMD}
> 
> # Avoid: "ld-elf.so.1: /lib/libgcc_s.so.1: version GCC_4.5.0
>@@ -65,7 +73,7 @@ PLAT_ARCH=	AARCH64
> PLAT_ARGS+=	-D X64EMU_ENABLE=FALSE -D CAPSULE_ENABLE=FALSE
> PLAT_TARGET=	RELEASE
> PLATFILE=	Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc
>-PLAT_RESULT=	ArmVExpress-FVP-AArch64/${PLAT_TARGET}_GCC5/FV/FVP_AARCH64_EFI.fd
>+PLAT_RESULT=	ArmVExpress-FVP-AArch64/${PLAT_TARGET}_GCC/FV/FVP_AARCH64_EFI.fd
> PLAT_FILENAME=	FVP_AARCH64_EFI.fd
> .endif
> 
>@@ -75,7 +83,7 @@ PLAT_ARCH=	AARCH64
> PLAT_ARGS+=	-D X64EMU_ENABLE=TRUE -D CAPSULE_ENABLE=FALSE
> PLAT_TARGET=	RELEASE
> PLATFILE=	Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
>-PLAT_RESULT=	Armada80x0McBin-AARCH64/${PLAT_TARGET}_GCC5/FV/ARMADA_EFI.fd
>+PLAT_RESULT=	Armada80x0McBin-AARCH64/${PLAT_TARGET}_GCC/FV/ARMADA_EFI.fd
> PLAT_FILENAME=	ARMADA_EFI.fd
> .endif
> 
>@@ -85,7 +93,7 @@ PLAT_ARCH=	AARCH64
> PLAT_ARGS+=	-D X64EMU_ENABLE=FALSE -D CAPSULE_ENABLE=FALSE
> PLAT_TARGET=	RELEASE
> PLATFILE=	Platform/RaspberryPi/RPi3/RPi3.dsc
>-PLAT_RESULT=	RPi3/${PLAT_TARGET}_GCC5/FV/RPI_EFI.fd
>+PLAT_RESULT=	RPi3/${PLAT_TARGET}_GCC/FV/RPI_EFI.fd
> PLAT_FILENAME=	RPI_EFI.fd
> .endif
> 
>@@ -95,7 +103,7 @@ PLAT_ARCH=	AARCH64
> PLAT_ARGS+=	-D X64EMU_ENABLE=FALSE -D CAPSULE_ENABLE=FALSE
> PLAT_TARGET=	RELEASE
> PLATFILE=	Platform/RaspberryPi/RPi4/RPi4.dsc
>-PLAT_RESULT=	RPi4/${PLAT_TARGET}_GCC5/FV/RPI_EFI.fd
>+PLAT_RESULT=	RPi4/${PLAT_TARGET}_GCC/FV/RPI_EFI.fd
> PLAT_FILENAME=	RPI_EFI.fd
> .endif
> 
>@@ -106,7 +114,7 @@ PLAT=		xen
> PLAT_ARCH=	X64
> PLAT_TARGET=	RELEASE
> PLATFILE=	OvmfPkg/OvmfXen.dsc
>-PLAT_RESULT=	OvmfXen/${PLAT_TARGET}_GCC5/FV/OVMF.fd
>+PLAT_RESULT=	OvmfXen/${PLAT_TARGET}_GCC/FV/OVMF.fd
> PLAT_FILENAME=	XEN_X64_EFI.fd
> .endif
> 
>@@ -118,13 +126,12 @@ PLAT_ARCH=	X64
> PLAT_ARGS+=	-D SECURE_BOOT_ENABLE=TRUE -D TPM2_ENABLE=TRUE
> PLAT_TARGET=	RELEASE
> PLATFILE=	OvmfPkg/Bhyve/BhyveX64.dsc
>-PLAT_RESULT=	BhyveX64/${PLAT_TARGET}_GCC5/FV/BHYVE.fd
>-PLAT_RESULT_CODE=	BhyveX64/${PLAT_TARGET}_GCC5/FV/BHYVE_CODE.fd
>-PLAT_RESULT_VARS=	BhyveX64/${PLAT_TARGET}_GCC5/FV/BHYVE_VARS.fd
>+PLAT_RESULT=	BhyveX64/${PLAT_TARGET}_GCC/FV/BHYVE.fd
>+PLAT_RESULT_CODE=	BhyveX64/${PLAT_TARGET}_GCC/FV/BHYVE_CODE.fd
>+PLAT_RESULT_VARS=	BhyveX64/${PLAT_TARGET}_GCC/FV/BHYVE_VARS.fd
> PLAT_FILENAME=	BHYVE_UEFI.fd
> PLAT_FILENAME_CODE=	BHYVE_UEFI_CODE.fd
> PLAT_FILENAME_VARS=	BHYVE_UEFI_VARS.fd
>-PATCHFILES=	ffce430d2b65d508a1604dc986ba16db3583943d.patch:-p1
> .endif
> 
> .if ${FLAVOR} == qemu_x64
>@@ -134,9 +141,9 @@ PLAT=		qemu
> PLAT_ARCH=	X64
> PLAT_TARGET=	RELEASE
> PLATFILE=	OvmfPkg/OvmfPkgX64.dsc
>-PLAT_RESULT=	OvmfX64/${PLAT_TARGET}_GCC5/FV/OVMF.fd
>-PLAT_RESULT_CODE=	OvmfX64/${PLAT_TARGET}_GCC5/FV/OVMF_CODE.fd
>-PLAT_RESULT_VARS=	OvmfX64/${PLAT_TARGET}_GCC5/FV/OVMF_VARS.fd
>+PLAT_RESULT=	OvmfX64/${PLAT_TARGET}_GCC/FV/OVMF.fd
>+PLAT_RESULT_CODE=	OvmfX64/${PLAT_TARGET}_GCC/FV/OVMF_CODE.fd
>+PLAT_RESULT_VARS=	OvmfX64/${PLAT_TARGET}_GCC/FV/OVMF_VARS.fd
> PLAT_FILENAME=	QEMU_UEFI-x86_64.fd
> PLAT_FILENAME_CODE=	QEMU_UEFI_CODE-x86_64.fd
> PLAT_FILENAME_VARS=	QEMU_UEFI_VARS-x86_64.fd
>@@ -149,9 +156,9 @@ PLAT=		qemu
> PLAT_ARCH=	IA32
> PLAT_TARGET=	RELEASE
> PLATFILE=	OvmfPkg/OvmfPkgIa32.dsc
>-PLAT_RESULT=	OvmfIa32/${PLAT_TARGET}_GCC5/FV/OVMF.fd
>-PLAT_RESULT_CODE=	OvmfIa32/${PLAT_TARGET}_GCC5/FV/OVMF_CODE.fd
>-PLAT_RESULT_VARS=	OvmfIa32/${PLAT_TARGET}_GCC5/FV/OVMF_VARS.fd
>+PLAT_RESULT=	OvmfIa32/${PLAT_TARGET}_GCC/FV/OVMF.fd
>+PLAT_RESULT_CODE=	OvmfIa32/${PLAT_TARGET}_GCC/FV/OVMF_CODE.fd
>+PLAT_RESULT_VARS=	OvmfIa32/${PLAT_TARGET}_GCC/FV/OVMF_VARS.fd
> PLAT_FILENAME=	QEMU_UEFI-i386.fd
> PLAT_FILENAME_CODE=	QEMU_UEFI_CODE-i386.fd
> PLAT_FILENAME_VARS=	QEMU_UEFI_VARS-i386.fd
>@@ -170,50 +177,45 @@ PLIST_FILES+=	${PREFIX}/share/uefi-firmware/${PLAT_FILENAME_CODE}
> PLIST_FILES+=	${PREFIX}/share/uefi-firmware/${PLAT_FILENAME_VARS}
> .endif
> 
>-# Emulate source edk2/edksetup.sh
>-MAKE_ENV+=	WORKSPACE=${WRKDIR} \
>-		PACKAGES_PATH=${WRKDIR}/edk2-${GH_TAGNAME}:${WRKDIR}/edk2-platforms-${PLATFORM_TAG}:${WRKDIR}/edk2-non-osi-${NONOSI_TAG} \
>-		CONF_PATH=${WRKDIR}/edk2-${GH_TAGNAME}/Conf \
>-		EDK_TOOLS_PATH=${WRKDIR}/edk2-${GH_TAGNAME}/BaseTools \
>-		PATH=${WRKDIR}/edk2-${GH_TAGNAME}/BaseTools/BinWrappers/PosixLike:${PATH} \
>-		PYTHON_COMMAND=python3 \
>-		PYTHONHASHSEED=1 \
>-		EXTRA_LDFLAGS=${EXTRA_LDFLAGS}
>-
> .if ${PLAT_ARCH} == AARCH64 && ${ARCH} != aarch64
> BUILD_DEPENDS+=	aarch64-none-elf-gcc:devel/aarch64-none-elf-gcc
>-MAKE_ENV+=	GCC5_AARCH64_PREFIX=aarch64-none-elf-
>+MAKE_ENV+=	GCC_AARCH64_PREFIX=aarch64-none-elf-
> .endif
> 
> .if ${PLAT_ARCH} == X64 || ${PLAT_ARCH} == IA32
> BUILD_DEPENDS+=	nasm:devel/nasm
> .endif
> 
>+MAKE_ENV+=	PYTHON_COMMAND=python3 \
>+		PYTHONHASHSEED=1 \
>+		EXTRA_LDFLAGS=${EXTRA_LDFLAGS} \
>+		PACKAGES_PATH=${WRKDIR}/edk2-${GH_TAGNAME}:${WRKDIR}/edk2-platforms-${PLATFORM_TAG}:${WRKDIR}/edk2-non-osi-${NONOSI_TAG}
>+
> # We can't have two submodule with the same origin in GH_TUPLE
> post-extract:
>-	(cd ${WRKDIR}/edk2-${GH_TAGNAME}/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli && tar cf - * | tar xf - -C ../../../../BaseTools/Source/C/BrotliCompress/brotli)
>+	(cd ${WRKDIR}/edk2-${GH_TAGNAME}/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli && ${CP} -a * ../../../../BaseTools/Source/C/BrotliCompress/brotli)
> 
> do-build:
>-	# This is normaly done during source edksetup.sh
>-	(cp ${WRKDIR}/edk2-${GH_TAGNAME}/BaseTools/Conf/build_rule.template ${WRKDIR}/edk2-${GH_TAGNAME}/Conf/build_rule.txt)
>-	(cp ${WRKDIR}/edk2-${GH_TAGNAME}/BaseTools/Conf/tools_def.template ${WRKDIR}/edk2-${GH_TAGNAME}/Conf/tools_def.txt)
>-	(cp ${WRKDIR}/edk2-${GH_TAGNAME}/BaseTools/Conf/target.template ${WRKDIR}/edk2-${GH_TAGNAME}/Conf/target.txt)
>-	# Build the basetools
>-	(cd ${WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C edk2-${GH_TAGNAME}/BaseTools ${_MAKE_JOBS})
>-	# Build EDK2
>-	(cd ${WRKDIR}/edk2-${GH_TAGNAME} && ${SETENV} ${MAKE_ENV} BaseTools/BinWrappers/PosixLike/build -a ${PLAT_ARCH} -p ${PLATFILE} -n ${MAKE_JOBS_NUMBER} -t GCC5 -b ${PLAT_TARGET} ${PLAT_ARGS})
>+	(bash -c ' \
>+		export ${MAKE_ENV} && \
>+		cd ${WRKDIR}/edk2-${GH_TAGNAME} && \
>+		${MAKE_CMD} -C BaseTools -j ${MAKE_JOBS_NUMBER} && \
>+		source edksetup.sh && \
>+		build -a ${PLAT_ARCH} -p ${PLATFILE} -n ${MAKE_JOBS_NUMBER} -t GCC -b ${PLAT_TARGET} ${PLAT_ARGS} \
>+	')
> 
> do-install:
> 	${MKDIR} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/
>-	${INSTALL_DATA} ${WRKDIR}/Build/${PLAT_RESULT} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME}
>+	${INSTALL_DATA} ${WRKDIR}/edk2-${GH_TAGNAME}/Build/${PLAT_RESULT} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME}
> .if defined(PLAT_FILENAME_CODE)
>-	${INSTALL_DATA} ${WRKDIR}/Build/${PLAT_RESULT_CODE} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME_CODE}
>+	${INSTALL_DATA} ${WRKDIR}/edk2-${GH_TAGNAME}/Build/${PLAT_RESULT_CODE} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME_CODE}
> .endif
> .if defined(PLAT_FILENAME_VARS)
>-	${INSTALL_DATA} ${WRKDIR}/Build/${PLAT_RESULT_VARS} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME_VARS}
>+	${INSTALL_DATA} ${WRKDIR}/edk2-${GH_TAGNAME}/Build/${PLAT_RESULT_VARS} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME_VARS}
> .endif
>+
> .if ${FLAVOR} == bhyve
>-	${INSTALL_DATA} ${WRKDIR}/Build/${PLAT_RESULT_CODE} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME}
>+	${INSTALL_DATA} ${WRKDIR}/edk2-${GH_TAGNAME}/Build/${PLAT_RESULT_CODE} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME}
> 	# For backwards compatibility
> 	${MKDIR} ${STAGEDIR}/${PREFIX}/share/uefi-firmware/
> 	${RLN} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME} ${STAGEDIR}/${PREFIX}/share/uefi-firmware/${PLAT_FILENAME}
>diff --git a/sysutils/edk2/distinfo b/sysutils/edk2/distinfo
>index 1409fbc82..19018107f 100644
>--- a/sysutils/edk2/distinfo
>+++ b/sysutils/edk2/distinfo
>@@ -1,19 +1,23 @@
>-TIMESTAMP = 1719565938
>-SHA256 (tianocore-edk2-g202308-edk2-stable202308_GH0.tar.gz) = 3f1cde1166ad94f86fc2375ee2c3f7f1c16c646b9518de3ff928efd28702ffe1
>-SIZE (tianocore-edk2-g202308-edk2-stable202308_GH0.tar.gz) = 16801285
>-SHA256 (tianocore-edk2-platforms-e509ac5a72_GH0.tar.gz) = 3b15b5b5c545023de4885a07b42a3426769323e4377fcf2d600b6094bcf4231c
>-SIZE (tianocore-edk2-platforms-e509ac5a72_GH0.tar.gz) = 11096819
>-SHA256 (tianocore-edk2-non-osi-8c09bd0955_GH0.tar.gz) = efc67f57ebb6f5c31711baa215a12666ba1b8961004548f6278c1020d365fe16
>-SIZE (tianocore-edk2-non-osi-8c09bd0955_GH0.tar.gz) = 21515641
>-SHA256 (google-brotli-v1.0.9-35-gf4153a0_GH0.tar.gz) = 8deff90317f030d770ab912fbc2a789394ac35c2d68eb5105e1f427aa8f88a3f
>-SIZE (google-brotli-v1.0.9-35-gf4153a0_GH0.tar.gz) = 512041
>-SHA256 (google-googletest-release-1.8.0-2983-g86add134_GH0.tar.gz) = b94dc8bbc62251542f3dc5dc1398527379465dd8fc48e146ddea86403a195071
>-SIZE (google-googletest-release-1.8.0-2983-g86add134_GH0.tar.gz) = 855431
>-SHA256 (MIPI-Alliance-public-mipi-sys-t-v1.1+edk2_GH0.tar.gz) = 473dcd46ed32b098091a2353f0ed13e69cbe773811c5551e6e766c16ac9ba464
>-SIZE (MIPI-Alliance-public-mipi-sys-t-v1.1+edk2_GH0.tar.gz) = 378282
>-SHA256 (openssl-openssl-openssl-3.0.9_GH0.tar.gz) = 2eec31f2ac0e126ff68d8107891ef534159c4fcfb095365d4cd4dc57d82616ee
>-SIZE (openssl-openssl-openssl-3.0.9_GH0.tar.gz) = 15335782
>-SHA256 (tianocore-edk2-cmocka-cmocka-1.1.5-23-g1cc9cde_GH0.tar.gz) = c2fb00395a55abd2ebfc2fcfe2705c7096cedd4416704dbb9237e394607fccb4
>-SIZE (tianocore-edk2-cmocka-cmocka-1.1.5-23-g1cc9cde_GH0.tar.gz) = 100320
>-SHA256 (ffce430d2b65d508a1604dc986ba16db3583943d.patch) = 2651482dc7c38563c8a1bec95eebb8f93bfe5051f95f5f4a05f201117650385e
>-SIZE (ffce430d2b65d508a1604dc986ba16db3583943d.patch) = 3373
>+TIMESTAMP = 1746546680
>+SHA256 (tianocore-edk2-g202502-edk2-stable202502_GH0.tar.gz) = 07313bb66950328d2e156f79128bc0b2bbec6428837b130bee14c199671f5f78
>+SIZE (tianocore-edk2-g202502-edk2-stable202502_GH0.tar.gz) = 18217115
>+SHA256 (tianocore-edk2-platforms-fd56374f2d1f8f6462a61a73dbe8948922c8abdf_GH0.tar.gz) = b1bee7e2795383a0fe3b7501bf53757f72ed2681cadf6a636ec04f83ef01a49e
>+SIZE (tianocore-edk2-platforms-fd56374f2d1f8f6462a61a73dbe8948922c8abdf_GH0.tar.gz) = 13561992
>+SHA256 (tianocore-edk2-non-osi-ea2040c2d4e2200557e87b9f9fbd4f8fb7a2b6e8_GH0.tar.gz) = a726656c45dd1e1698cc2ffd838b143197f6c574725a5c9bf42d1b01ea7f0719
>+SIZE (tianocore-edk2-non-osi-ea2040c2d4e2200557e87b9f9fbd4f8fb7a2b6e8_GH0.tar.gz) = 37790550
>+SHA256 (google-brotli-f4153a09f87cbb9c826d8fc12c74642bb2d879ea_GH0.tar.gz) = 6d6cacce05086b7debe75127415ff9c3661849f564fe2f5f3b0383d48aa4ed77
>+SIZE (google-brotli-f4153a09f87cbb9c826d8fc12c74642bb2d879ea_GH0.tar.gz) = 512229
>+SHA256 (google-googletest-86add13493e5c881d7e4ba77fb91c1f57752b3a4_GH0.tar.gz) = 3c3095488b936b14538dca64d7e68bcde09a8a18d2a32a47b59877eff0340403
>+SIZE (google-googletest-86add13493e5c881d7e4ba77fb91c1f57752b3a4_GH0.tar.gz) = 855874
>+SHA256 (tianocore-edk2-cmocka-1cc9cde3448cdd2e000886a26acf1caac2db7cf1_GH0.tar.gz) = 59cd4b81abafae35d94ac5d91cf4ae5b05122e688713cd6db51e5e4cef471d8f
>+SIZE (tianocore-edk2-cmocka-1cc9cde3448cdd2e000886a26acf1caac2db7cf1_GH0.tar.gz) = 100343
>+SHA256 (MIPI-Alliance-public-mipi-sys-t-370b5944c046bab043dd8b133727b2135af7747a_GH0.tar.gz) = 9fda3b9a78343ab2be6f06ce6396536e7e065abac29b47c8eb2e42cbb4c4f00b
>+SIZE (MIPI-Alliance-public-mipi-sys-t-370b5944c046bab043dd8b133727b2135af7747a_GH0.tar.gz) = 378522
>+SHA256 (openssl-openssl-a26d85337dbdcd33c971f38eb3fa5150e75cea87_GH0.tar.gz) = 41ff751b3577061c4f2cde2e9270d24181461a696c9fa7b2729c2d6b103f0520
>+SIZE (openssl-openssl-a26d85337dbdcd33c971f38eb3fa5150e75cea87_GH0.tar.gz) = 18522928
>+SHA256 (Mbed-TLS-mbedtls-8c89224991adff88d53cd380f42a2baa36f91454_GH0.tar.gz) = b5c7e7c54e013c168f4aae036e59912785f11b4aeebd57f6165a14e879b9a82c
>+SIZE (Mbed-TLS-mbedtls-8c89224991adff88d53cd380f42a2baa36f91454_GH0.tar.gz) = 4587796
>+SHA256 (DMTF-libspdm-98ef964e1e9a0c39c7efb67143d3a13a819432e0_GH0.tar.gz) = 634cbdf10bcaf32f3446b1bf8be7e8a60cecd1e9500e512f01e3c15b74cbcfd3
>+SIZE (DMTF-libspdm-98ef964e1e9a0c39c7efb67143d3a13a819432e0_GH0.tar.gz) = 2017163
>+SHA256 (aa7f29a9e92b9e6f8b2e56bacaef6c96b8dc80ed.patch) = 3648ba2bf1a00000e927e93ceaaca7cccd7d46dd999d14cd060370832648f177
>+SIZE (aa7f29a9e92b9e6f8b2e56bacaef6c96b8dc80ed.patch) = 4150
>diff --git a/sysutils/edk2/files/patch-OvmfPkg_Bhyve_AcpiPlatformDxe_AcpiPlatform.c b/sysutils/edk2/files/patch-OvmfPkg_Bhyve_AcpiPlatformDxe_AcpiPlatform.c
>deleted file mode 100644
>index 1096a5e4d..000000000
>--- a/sysutils/edk2/files/patch-OvmfPkg_Bhyve_AcpiPlatformDxe_AcpiPlatform.c
>+++ /dev/null
>@@ -1,38 +0,0 @@
>---- OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.c.orig	2023-09-07 08:35:06 UTC
>-+++ OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.c
>-@@ -259,19 +259,17 @@ InstallAcpiTables (
>-              BHYVE_BIOS_PHYSICAL_END,
>-              &Rsdp
>-              );
>--  if (EFI_ERROR (Status)) {
>--    return Status;
>--  }
>--
>--  Status = InstallAcpiTablesFromRsdp (
>--             AcpiTable,
>--             Rsdp
>--             );
>-   if (!EFI_ERROR (Status)) {
>--    return EFI_SUCCESS;
>-+    Status = InstallAcpiTablesFromRsdp (
>-+              AcpiTable,
>-+              Rsdp
>-+              );
>-+    if (!EFI_ERROR (Status)) {
>-+      return EFI_SUCCESS;
>-+    }
>-   }
>- 
>--  if (Status != EFI_NOT_FOUND) {
>-+  if (EFI_ERROR (Status)) {
>-     DEBUG (
>-       (
>-        DEBUG_WARN,
>-@@ -280,7 +278,6 @@ InstallAcpiTables (
>-        Status
>-       )
>-       );
>--    return Status;
>-   }
>- 
>-   Status = InstallOvmfFvTables (AcpiTable);
>diff --git a/sysutils/edk2/files/patch-OvmfPkg_Bhyve_PlatformPei_Platform.c b/sysutils/edk2/files/patch-OvmfPkg_Bhyve_PlatformPei_Platform.c
>deleted file mode 100644
>index 38dd3d905..000000000
>--- a/sysutils/edk2/files/patch-OvmfPkg_Bhyve_PlatformPei_Platform.c
>+++ /dev/null
>@@ -1,13 +0,0 @@
>---- OvmfPkg/Bhyve/PlatformPei/Platform.c.orig	2023-11-17 12:26:16 UTC
>-+++ OvmfPkg/Bhyve/PlatformPei/Platform.c
>-@@ -153,8 +153,8 @@ MemMapInitialization (
>-   UINT64         PciIoSize;
>-   RETURN_STATUS  PcdStatus;
>- 
>--  PciIoBase = 0xC000;
>--  PciIoSize = 0x4000;
>-+  PciIoBase = 0x2000;
>-+  PciIoSize = 0xE000;
>- 
>-   //
>-   // Create Memory Type Information HOB
>diff --git a/sysutils/edk2/files/patch-remove-memattr-protocol b/sysutils/edk2/files/patch-remove-memattr-protocol
>new file mode 100644
>index 000000000..5ca220228
>--- /dev/null
>+++ b/sysutils/edk2/files/patch-remove-memattr-protocol
>@@ -0,0 +1,353 @@
>+--- UefiCpuPkg/CpuDxe/CpuDxe.c.orig	2025-05-07 09:03:43 UTC
>++++ UefiCpuPkg/CpuDxe/CpuDxe.c
>+@@ -1034,11 +1034,6 @@ InitializeCpu (
>+   ASSERT_EFI_ERROR (Status);
>+ 
>+   //
>+-  // Install EFI memory attribute Protocol
>+-  //
>+-  InstallEfiMemoryAttributeProtocol (mCpuHandle);
>+-
>+-  //
>+   // Refresh GCD memory space map according to MTRR value.
>+   //
>+   RefreshGcdMemoryAttributes ();
>+--- UefiCpuPkg/CpuDxe/CpuDxe.inf.orig	2025-05-07 09:04:04 UTC
>++++ UefiCpuPkg/CpuDxe/CpuDxe.inf
>+@@ -75,7 +75,6 @@
>+ 
>+ [Protocols]
>+   gEfiCpuArchProtocolGuid                       ## PRODUCES
>+-  gEfiMemoryAttributeProtocolGuid               ## PRODUCES
>+   gEfiMpServiceProtocolGuid                     ## PRODUCES
>+   gEfiSmmBase2ProtocolGuid                      ## SOMETIMES_CONSUMES
>+ 
>+--- UefiCpuPkg/CpuDxe/CpuPageTable.c.orig	2025-05-07 09:04:40 UTC
>++++ UefiCpuPkg/CpuDxe/CpuPageTable.c
>+@@ -1436,298 +1436,3 @@ InitializePageTableLib (
>+ 
>+   return;
>+ }
>+-
>+-/**
>+-  This function set given attributes of the memory region specified by
>+-  BaseAddress and Length.
>+-  The valid Attributes is EFI_MEMORY_RP, EFI_MEMORY_XP, and EFI_MEMORY_RO.
>+-
>+-  @param  This              The EFI_MEMORY_ATTRIBUTE_PROTOCOL instance.
>+-  @param  BaseAddress       The physical address that is the start address of
>+-                            a memory region.
>+-  @param  Length            The size in bytes of the memory region.
>+-  @param  Attributes        The bit mask of attributes to set for the memory
>+-                            region.
>+-
>+-  @retval EFI_SUCCESS           The attributes were set for the memory region.
>+-  @retval EFI_INVALID_PARAMETER Length is zero.
>+-                                Attributes specified an illegal combination of
>+-                                attributes that cannot be set together.
>+-  @retval EFI_UNSUPPORTED       The processor does not support one or more
>+-                                bytes of the memory resource range specified
>+-                                by BaseAddress and Length.
>+-                                The bit mask of attributes is not supported for
>+-                                the memory resource range specified by
>+-                                BaseAddress and Length.
>+-  @retval EFI_OUT_OF_RESOURCES  Requested attributes cannot be applied due to lack of
>+-                                system resources.
>+-  @retval EFI_ACCESS_DENIED     Attributes for the requested memory region are
>+-                                controlled by system firmware and cannot be updated
>+-                                via the protocol.
>+-**/
>+-EFI_STATUS
>+-EFIAPI
>+-EfiSetMemoryAttributes (
>+-  IN  EFI_MEMORY_ATTRIBUTE_PROTOCOL  *This,
>+-  IN  EFI_PHYSICAL_ADDRESS           BaseAddress,
>+-  IN  UINT64                         Length,
>+-  IN  UINT64                         Attributes
>+-  )
>+-{
>+-  RETURN_STATUS  Status;
>+-  BOOLEAN        IsModified;
>+-  BOOLEAN        IsSplitted;
>+-
>+-  DEBUG ((DEBUG_VERBOSE, "%a: 0x%lx - 0x%lx (0x%lx)\n", __func__, BaseAddress, Length, Attributes));
>+-
>+-  if (Attributes == 0) {
>+-    DEBUG ((DEBUG_ERROR, "%a: Error - Attributes == 0\n", __func__));
>+-    return EFI_INVALID_PARAMETER;
>+-  }
>+-
>+-  if ((Attributes & ~EFI_MEMORY_ACCESS_MASK) != 0) {
>+-    DEBUG ((DEBUG_ERROR, "%a: Error - Attributes(0x%lx) invalid\n", __func__, Attributes));
>+-    return EFI_INVALID_PARAMETER;
>+-  }
>+-
>+-  if (Length == 0) {
>+-    DEBUG ((DEBUG_ERROR, "%a: Length is 0!\n", __func__));
>+-    return RETURN_INVALID_PARAMETER;
>+-  }
>+-
>+-  Status = ConvertMemoryPageAttributes (NULL, BaseAddress, Length, Attributes, PageActionSet, NULL, &IsSplitted, &IsModified);
>+-  if (!EFI_ERROR (Status)) {
>+-    if (IsModified) {
>+-      //
>+-      // Flush TLB as last step.
>+-      //
>+-      // Note: Since APs will always init CR3 register in HLT loop mode or do
>+-      // TLB flush in MWAIT loop mode, there's no need to flush TLB for them
>+-      // here.
>+-      //
>+-      CpuFlushTlb ();
>+-    }
>+-  } else {
>+-    DEBUG ((DEBUG_ERROR, "%a: Failed in ConvertMemoryPageAttributes (%r)\n", __func__, Status));
>+-  }
>+-
>+-  return Status;
>+-}
>+-
>+-/**
>+-  This function clears given attributes of the memory region specified by
>+-  BaseAddress and Length.
>+-  The valid Attributes is EFI_MEMORY_RP, EFI_MEMORY_XP, and EFI_MEMORY_RO.
>+-  @param  This              The EFI_MEMORY_ATTRIBUTE_PROTOCOL instance.
>+-  @param  BaseAddress       The physical address that is the start address of
>+-                            a memory region.
>+-  @param  Length            The size in bytes of the memory region.
>+-  @param  Attributes        The bit mask of attributes to clear for the memory
>+-                            region.
>+-
>+-  @retval EFI_SUCCESS           The attributes were cleared for the memory region.
>+-  @retval EFI_INVALID_PARAMETER Length is zero.
>+-                                Attributes specified an illegal combination of
>+-                                attributes that cannot be cleared together.
>+-  @retval EFI_UNSUPPORTED       The processor does not support one or more
>+-                                bytes of the memory resource range specified
>+-                                by BaseAddress and Length.
>+-                                The bit mask of attributes is not supported for
>+-                                the memory resource range specified by
>+-                                BaseAddress and Length.
>+-  @retval EFI_OUT_OF_RESOURCES  Requested attributes cannot be applied due to lack of
>+-                                system resources.
>+-  @retval EFI_ACCESS_DENIED     Attributes for the requested memory region are
>+-                                controlled by system firmware and cannot be updated
>+-                                via the protocol.
>+-**/
>+-EFI_STATUS
>+-EFIAPI
>+-EfiClearMemoryAttributes (
>+-  IN  EFI_MEMORY_ATTRIBUTE_PROTOCOL  *This,
>+-  IN  EFI_PHYSICAL_ADDRESS           BaseAddress,
>+-  IN  UINT64                         Length,
>+-  IN  UINT64                         Attributes
>+-  )
>+-{
>+-  RETURN_STATUS  Status;
>+-  BOOLEAN        IsModified;
>+-  BOOLEAN        IsSplitted;
>+-
>+-  DEBUG ((DEBUG_VERBOSE, "%a: 0x%lx - 0x%lx (0x%lx)\n", __func__, BaseAddress, Length, Attributes));
>+-
>+-  if (Attributes == 0) {
>+-    DEBUG ((DEBUG_ERROR, "%a: Error - Attributes == 0\n", __func__));
>+-    return EFI_INVALID_PARAMETER;
>+-  }
>+-
>+-  if ((Attributes & ~EFI_MEMORY_ACCESS_MASK) != 0) {
>+-    DEBUG ((DEBUG_ERROR, "%a: Error - Attributes(0x%lx) invalid\n", __func__, Attributes));
>+-    return EFI_INVALID_PARAMETER;
>+-  }
>+-
>+-  if (Length == 0) {
>+-    DEBUG ((DEBUG_ERROR, "%a: Length is 0!\n", __func__));
>+-    return RETURN_INVALID_PARAMETER;
>+-  }
>+-
>+-  Status = ConvertMemoryPageAttributes (NULL, BaseAddress, Length, Attributes, PageActionClear, NULL, &IsSplitted, &IsModified);
>+-  if (!EFI_ERROR (Status)) {
>+-    if (IsModified) {
>+-      //
>+-      // Flush TLB as last step.
>+-      //
>+-      // Note: Since APs will always init CR3 register in HLT loop mode or do
>+-      // TLB flush in MWAIT loop mode, there's no need to flush TLB for them
>+-      // here.
>+-      //
>+-      CpuFlushTlb ();
>+-    }
>+-  } else {
>+-    DEBUG ((DEBUG_ERROR, "%a: Failed in ConvertMemoryPageAttributes (%r)\n", __func__, Status));
>+-  }
>+-
>+-  return Status;
>+-}
>+-
>+-/**
>+-  This function retrieves the attributes of the memory region specified by
>+-  BaseAddress and Length. If different attributes are got from different part
>+-  of the memory region, EFI_NO_MAPPING will be returned.
>+-
>+-  @param  This                The EFI_MEMORY_ATTRIBUTE_PROTOCOL instance.
>+-  @param  BaseAddress         The physical address that is the start address of
>+-                              a memory region.
>+-  @param  Length              The size in bytes of the memory region.
>+-  @param  Attributes          Pointer to attributes returned.
>+-
>+-  @retval EFI_SUCCESS           The attributes got for the memory region.
>+-  @retval EFI_INVALID_PARAMETER Length is zero.
>+-                                Attributes is NULL.
>+-  @retval EFI_NO_MAPPING        Attributes are not consistent cross the memory
>+-                                region.
>+-  @retval EFI_UNSUPPORTED       The processor does not support one or more
>+-                                bytes of the memory resource range specified
>+-                                by BaseAddress and Length.
>+-**/
>+-EFI_STATUS
>+-EFIAPI
>+-EfiGetMemoryAttributes (
>+-  IN  EFI_MEMORY_ATTRIBUTE_PROTOCOL  *This,
>+-  IN  EFI_PHYSICAL_ADDRESS           BaseAddress,
>+-  IN  UINT64                         Length,
>+-  OUT UINT64                         *Attributes
>+-  )
>+-{
>+-  PAGE_TABLE_LIB_PAGING_CONTEXT  CurrentPagingContext;
>+-  EFI_PHYSICAL_ADDRESS           Address;
>+-  UINT64                         *PageEntry;
>+-  UINT64                         MemAttr;
>+-  PAGE_ATTRIBUTE                 PageAttr;
>+-  INT64                          Size;
>+-  UINT64                         AddressEncMask;
>+-
>+-  DEBUG ((DEBUG_VERBOSE, "%a: 0x%lx - 0x%lx\n", __func__, BaseAddress, Length));
>+-
>+-  if (!IS_ALIGNED (BaseAddress, EFI_PAGE_SIZE)) {
>+-    DEBUG ((DEBUG_ERROR, "%a: BaseAddress(0x%lx) is not aligned!\n", __func__, BaseAddress));
>+-    return EFI_UNSUPPORTED;
>+-  }
>+-
>+-  if (!IS_ALIGNED (Length, EFI_PAGE_SIZE)) {
>+-    DEBUG ((DEBUG_ERROR, "%a: Length(0x%lx) is not aligned!\n", __func__, Length));
>+-    return EFI_UNSUPPORTED;
>+-  }
>+-
>+-  if (Length == 0) {
>+-    DEBUG ((DEBUG_ERROR, "%a: Length is 0!\n", __func__));
>+-    return RETURN_INVALID_PARAMETER;
>+-  }
>+-
>+-  if (Attributes == NULL) {
>+-    DEBUG ((DEBUG_ERROR, "%a: Attributes is NULL\n", __func__));
>+-    return EFI_INVALID_PARAMETER;
>+-  }
>+-
>+-  Size    = (INT64)Length;
>+-  MemAttr = (UINT64)-1;
>+-
>+-  // Make sure AddressEncMask is contained to smallest supported address field.
>+-  //
>+-  AddressEncMask = PcdGet64 (PcdPteMemoryEncryptionAddressOrMask) & PAGING_1G_ADDRESS_MASK_64;
>+-
>+-  GetCurrentPagingContext (&CurrentPagingContext);
>+-
>+-  do {
>+-    PageEntry = GetPageTableEntry (&CurrentPagingContext, BaseAddress, &PageAttr);
>+-    if ((PageEntry == NULL) || (PageAttr == PageNone)) {
>+-      return EFI_UNSUPPORTED;
>+-    }
>+-
>+-    //
>+-    // If the memory range is cross page table boundary, make sure they
>+-    // share the same attribute. Return EFI_NO_MAPPING if not.
>+-    //
>+-    *Attributes = GetAttributesFromPageEntry (PageEntry);
>+-    if ((MemAttr != (UINT64)-1) && (*Attributes != MemAttr)) {
>+-      return EFI_NO_MAPPING;
>+-    }
>+-
>+-    switch (PageAttr) {
>+-      case Page4K:
>+-        Address      = *PageEntry & ~AddressEncMask & PAGING_4K_ADDRESS_MASK_64;
>+-        Size        -= (EFI_PAGE_SIZE - (BaseAddress - Address));
>+-        BaseAddress += (EFI_PAGE_SIZE - (BaseAddress - Address));
>+-        break;
>+-
>+-      case Page2M:
>+-        Address      = *PageEntry & ~AddressEncMask & PAGING_2M_ADDRESS_MASK_64;
>+-        Size        -= SIZE_2MB - (BaseAddress - Address);
>+-        BaseAddress += SIZE_2MB - (BaseAddress - Address);
>+-        break;
>+-
>+-      case Page1G:
>+-        Address      = *PageEntry & ~AddressEncMask & PAGING_1G_ADDRESS_MASK_64;
>+-        Size        -= SIZE_1GB - (BaseAddress - Address);
>+-        BaseAddress += SIZE_1GB - (BaseAddress - Address);
>+-        break;
>+-
>+-      default:
>+-        return EFI_UNSUPPORTED;
>+-    }
>+-
>+-    MemAttr = *Attributes;
>+-  } while (Size > 0);
>+-
>+-  DEBUG ((DEBUG_VERBOSE, "%a: Attributes is 0x%lx\n", __func__, *Attributes));
>+-
>+-  return EFI_SUCCESS;
>+-}
>+-
>+-EFI_MEMORY_ATTRIBUTE_PROTOCOL  mMemoryAttributeProtocol = {
>+-  EfiGetMemoryAttributes,
>+-  EfiSetMemoryAttributes,
>+-  EfiClearMemoryAttributes,
>+-};
>+-
>+-/**
>+-  Install Efi Memory Attribute Protocol.
>+-
>+-  @param Handle A pointer to the EFI_HANDLE on which the interface is to be installed
>+-
>+-**/
>+-VOID
>+-InstallEfiMemoryAttributeProtocol (
>+-  IN EFI_HANDLE  Handle
>+-  )
>+-{
>+-  EFI_STATUS  Status;
>+-
>+-  Status = gBS->InstallMultipleProtocolInterfaces (
>+-                  &Handle,
>+-                  &gEfiMemoryAttributeProtocolGuid,
>+-                  &mMemoryAttributeProtocol,
>+-                  NULL
>+-                  );
>+-  ASSERT_EFI_ERROR (Status);
>+-}
>+--- UefiCpuPkg/CpuDxe/CpuPageTable.h.orig	2025-05-07 09:06:57 UTC
>++++ UefiCpuPkg/CpuDxe/CpuPageTable.h
>+@@ -10,7 +10,6 @@
>+ #define _PAGE_TABLE_LIB_H_
>+ 
>+ #include <IndustryStandard/PeImage.h>
>+-#include <Protocol/MemoryAttribute.h>
>+ 
>+ #define PAGE_TABLE_LIB_PAGING_CONTEXT_IA32_X64_ATTRIBUTES_PSE              BIT0
>+ #define PAGE_TABLE_LIB_PAGING_CONTEXT_IA32_X64_ATTRIBUTES_PAE              BIT1
>+@@ -152,17 +151,6 @@ GetPagingDetails (
>+   IN  PAGE_TABLE_LIB_PAGING_CONTEXT_DATA  *PagingContextData,
>+   OUT UINTN                               **PageTableBase     OPTIONAL,
>+   OUT UINT32                              **Attributes        OPTIONAL
>+-  );
>+-
>+-/**
>+-  Install Efi Memory Attribute Protocol.
>+-
>+-  @param Handle A pointer to the EFI_HANDLE on which the interface is to be installed
>+-
>+-**/
>+-VOID
>+-InstallEfiMemoryAttributeProtocol (
>+-  IN EFI_HANDLE  Handle
>+   );
>+ 
>+ #endif
>-- 
>2.49.0
>

Actions: View | Diff

Attachments on bug 285554: 258837 | 260266 | 260668