From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 533FA83F1 for ; Wed, 30 Aug 2023 17:07:03 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2F15836F26 for ; Wed, 30 Aug 2023 17:06:33 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 30 Aug 2023 17:06:32 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 06CC047839 for ; Wed, 30 Aug 2023 17:06:32 +0200 (CEST) Message-ID: <6716299d-cb21-c5a0-de22-8b7b8b9da299@proxmox.com> Date: Wed, 30 Aug 2023 17:06:30 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.14.0 Content-Language: en-US To: pve-devel@lists.proxmox.com References: <20230830150247.1915713-1-s.hanreich@proxmox.com> From: Stefan Hanreich In-Reply-To: <20230830150247.1915713-1-s.hanreich@proxmox.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.829 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_NUMSUBJECT 0.5 Subject ends in numbers excluding current years NICE_REPLY_A -1.242 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pve-devel] [PATCH edk2-firmware] update to edk2-stable202308 X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Aug 2023 15:07:03 -0000 forgot to keep the metadata in the reapplied patch i'll follow up with a v2! On 8/30/23 17:02, Stefan Hanreich wrote: > * Removed 0001-OvmfPkg-PlatformInitLib-limit-phys-bits-to-46.patch > since it has been included upstream since commit c1e85376 [1]. > > * Updated the patch > Revert-ArmVirtPkg-make-EFI_LOADER_DATA-non-executabl so it applies > again. > > * had to increase FD_SIZE to 4M for the x64 build as otherwise the > package wouldn't build due to the size of the resulting image > > [1] https://github.com/tianocore/edk2/commit/c1e853769046b322690ad336fdb98966757e7414 > > Signed-off-by: Stefan Hanreich > --- > Wasn't able to build this package without setting FD_SIZE to 4M, not > sure if this is due to my failure or if the image just got bigger with > the new changes. > > Due to CRLF shenanigans I have made this commit available via my repos > as well - you can find it under staff/s.hanreich/pve-edk2-firmware on > the branch 2023-08. > > Still not sure if the line endings are 100% correct since I have > warnings about EOL and trailing spaces, but I think they are because > of gits CRLF handling. > > > debian/changelog | 6 +++ > ...latformInitLib-limit-phys-bits-to-46.patch | 43 ------------------- > ...g-make-EFI_LOADER_DATA-non-executabl.patch | 17 +++----- > debian/patches/series | 1 - > debian/rules | 3 +- > edk2 | 2 +- > 6 files changed, 13 insertions(+), 59 deletions(-) > delete mode 100644 debian/patches/0001-OvmfPkg-PlatformInitLib-limit-phys-bits-to-46.patch > > diff --git a/debian/changelog b/debian/changelog > index 4d0ac21..dd61c6f 100644 > --- a/debian/changelog > +++ b/debian/changelog > @@ -1,3 +1,9 @@ > +pve-edk2-firmware (3.20230826-1) bookworm; urgency=medium > + > + * update sources to upstream edk2-stable202308 tag > + > + -- Proxmox Support Team Tue, 29 Aug 2023 13:58:15 +0200 > + > pve-edk2-firmware (3.20230228-4) bookworm; urgency=medium > > * limiting the phys-bits to 46 instead of 47 to work around older guest > diff --git a/debian/patches/0001-OvmfPkg-PlatformInitLib-limit-phys-bits-to-46.patch b/debian/patches/0001-OvmfPkg-PlatformInitLib-limit-phys-bits-to-46.patch > deleted file mode 100644 > index 1708f40..0000000 > --- a/debian/patches/0001-OvmfPkg-PlatformInitLib-limit-phys-bits-to-46.patch > +++ /dev/null > @@ -1,43 +0,0 @@ > -From 89a12f2a42b989e7925b4a71e503209971eaa271 Mon Sep 17 00:00:00 2001 > -From: Gerd Hoffmann > -Date: Thu, 1 Jun 2023 09:57:31 +0200 > -Subject: [PATCH] OvmfPkg/PlatformInitLib: limit phys-bits to 46. > - > -Older linux kernels have problems with phys-bits larger than 46, > -ubuntu 18.04 (kernel 4.15) has been reported to be affected. > - > -Reduce phys-bits limit from 47 to 46. > - > -Reported-by: Fiona Ebner > -Signed-off-by: Gerd Hoffmann > ---- > - OvmfPkg/Library/PlatformInitLib/MemDetect.c | 9 ++++++--- > - 1 file changed, 6 insertions(+), 3 deletions(-) > - > -diff --git a/OvmfPkg/Library/PlatformInitLib/MemDetect.c b/OvmfPkg/Library/PlatformInitLib/MemDetect.c > -index 38cece9173..4d0522ce22 100644 > ---- a/OvmfPkg/Library/PlatformInitLib/MemDetect.c > -+++ b/OvmfPkg/Library/PlatformInitLib/MemDetect.c > -@@ -657,16 +657,19 @@ PlatformAddressWidthFromCpuid ( > - )); > - > - if (Valid) { > -- if (PhysBits > 47) { > -+ if (PhysBits > 46) { > - /* > - * Avoid 5-level paging altogether for now, which limits > - * PhysBits to 48. Also avoid using address bit 48, due to sign > - * extension we can't identity-map these addresses (and lots of > - * places in edk2 assume we have everything identity-mapped). > - * So the actual limit is 47. > -+ * > -+ * Also some older linux kernels apparently have problems handling > -+ * phys-bits > 46 correctly, so use that as limit. > - */ > -- DEBUG ((DEBUG_INFO, "%a: limit PhysBits to 47 (avoid 5-level paging)\n", __func__)); > -- PhysBits = 47; > -+ DEBUG ((DEBUG_INFO, "%a: limit PhysBits to 46 (avoid 5-level paging)\n", __func__)); > -+ PhysBits = 46; > - } > - > - if (!Page1GSupport && (PhysBits > 40)) { > diff --git a/debian/patches/Revert-ArmVirtPkg-make-EFI_LOADER_DATA-non-executabl.patch b/debian/patches/Revert-ArmVirtPkg-make-EFI_LOADER_DATA-non-executabl.patch > index 7e1417a..b2aedec 100644 > --- a/debian/patches/Revert-ArmVirtPkg-make-EFI_LOADER_DATA-non-executabl.patch > +++ b/debian/patches/Revert-ArmVirtPkg-make-EFI_LOADER_DATA-non-executabl.patch > @@ -1,20 +1,13 @@ > -Description: Revert "ArmVirtPkg: make EFI_LOADER_DATA non-executable" > - The versions of GRUB most distros are shipping still depend on executable > - EFI_LOADER_DATA. Revert this upstream change until the necessary fixes are > - more generally available. > -Author: dann frazier > -Bug-Debian: https://bugs.debian.org/1025656 > -Forwarded: https://edk2.groups.io/g/devel/message/97814 > -Last-Update: 2023-03-09 > - > +diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc > +index 2443e8351c..9a0cef46d9 100644 > --- a/ArmVirtPkg/ArmVirt.dsc.inc > +++ b/ArmVirtPkg/ArmVirt.dsc.inc > -@@ -361,7 +361,7 @@ > +@@ -365,7 +365,7 @@ > # reserved ones, with the exception of LoaderData regions, of which OS loaders > # (i.e., GRUB) may assume that its contents are executable. > # > - gEfiMdeModulePkgTokenSpaceGuid.PcdDxeNxMemoryProtectionPolicy|0xC000000000007FD5 > + gEfiMdeModulePkgTokenSpaceGuid.PcdDxeNxMemoryProtectionPolicy|0xC000000000007FD1 > > - [Components.common] > - # > + gEfiMdeModulePkgTokenSpaceGuid.PcdCpuStackGuard|TRUE > + > diff --git a/debian/patches/series b/debian/patches/series > index a9ee2be..f1ec614 100644 > --- a/debian/patches/series > +++ b/debian/patches/series > @@ -2,4 +2,3 @@ no-stack-protector-all-archs.diff > brotlicompress-disable.diff > x64-baseline-abi.patch > Revert-ArmVirtPkg-make-EFI_LOADER_DATA-non-executabl.patch > -0001-OvmfPkg-PlatformInitLib-limit-phys-bits-to-46.patch > diff --git a/debian/rules b/debian/rules > index eb0ee89..934fe50 100755 > --- a/debian/rules > +++ b/debian/rules > @@ -29,7 +29,6 @@ COMMON_FLAGS += -DPVSCSI_ENABLE=TRUE > OVMF_COMMON_FLAGS = $(COMMON_FLAGS) > OVMF_2M_FLAGS = $(OVMF_COMMON_FLAGS) -DFD_SIZE_2MB > OVMF_4M_FLAGS = $(OVMF_COMMON_FLAGS) -DFD_SIZE_4MB > -OVMF_2M_SMM_FLAGS = $(OVMF_2M_FLAGS) -DSMM_REQUIRE=TRUE > OVMF_4M_SMM_FLAGS = $(OVMF_4M_FLAGS) -DSMM_REQUIRE=TRUE > OVMF32_4M_FLAGS = $(OVMF_COMMON_FLAGS) -DFD_SIZE_4MB > OVMF32_4M_SMM_FLAGS = $(OVMF32_4M_FLAGS) -DSMM_REQUIRE=TRUE > @@ -132,7 +131,7 @@ $(OVMF_BINARIES) $(OVMF_IMAGES): debian/setup-build-stamp > -t $(EDK2_TOOLCHAIN) \ > -p OvmfPkg/OvmfPkgX64.dsc \ > $(PCD_OPTIONS) \ > - $(OVMF_2M_SMM_FLAGS) -b $(BUILD_TYPE) > + $(OVMF_4M_SMM_FLAGS) -b $(BUILD_TYPE) > cp $(OVMF_BUILD_DIR)/FV/OVMF_CODE.fd \ > $(OVMF_INSTALL_DIR)/OVMF_CODE.secboot.fd > rm -rf Build/OvmfX64 > diff --git a/edk2 b/edk2 > index f80f052..819cfc6 160000 > --- a/edk2 > +++ b/edk2 > @@ -1 +1 @@ > -Subproject commit f80f052277c88a67c55e107b550f504eeea947d3 > +Subproject commit 819cfc6b42a68790a23509e4fcc58ceb70e1965e > -- > 2.39.2 > >