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 DD2E192D12 for ; Thu, 23 Mar 2023 13:06:44 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 770E92B596 for ; Thu, 23 Mar 2023 13:06:44 +0100 (CET) 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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 23 Mar 2023 13:06:43 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id BB47B46641 for ; Thu, 23 Mar 2023 13:06:41 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Thu, 23 Mar 2023 13:06:38 +0100 Message-Id: <20230323120638.1557324-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL -0.002 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH edk2-firmware] fix #4606: cherry-pick fix for PlatformConfig setting editing 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: Thu, 23 Mar 2023 12:06:44 -0000 For example, the default screen resolution is such a setting. Signed-off-by: Fiona Ebner --- .../0001-OvmfPkg-fix-PlatformConfig.patch | 66 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 67 insertions(+) create mode 100644 debian/patches/0001-OvmfPkg-fix-PlatformConfig.patch diff --git a/debian/patches/0001-OvmfPkg-fix-PlatformConfig.patch b/debian/= patches/0001-OvmfPkg-fix-PlatformConfig.patch new file mode 100644 index 0000000..59782f3 --- /dev/null +++ b/debian/patches/0001-OvmfPkg-fix-PlatformConfig.patch @@ -0,0 +1,66 @@ +From de6869d8b6cd69bffe49d37e8324439189546991 Mon Sep 17 00:00:00 2001 +From: Gerd Hoffmann +Date: Fri, 9 Dec 2022 12:22:44 +0100 +Subject: [PATCH] OvmfPkg: fix PlatformConfig + +The Hii form is named "MainFormState" and the EFI variable is named +"PlatformConfig". Take into account the different names. + +Fixes: aefcc91805fd ("OvmfPkg/PlatformDxe: Handle all requests in ExtractC= onfig and RouteConfig") +Signed-off-by: Gerd Hoffmann +(cherry-picked from commit 16acacf24c2c1fa2eff9148ae8ec952d74e3ab03) +Signed-off-by: Fiona Ebner +--- + OvmfPkg/PlatformDxe/Platform.c | 4 ++-- + OvmfPkg/PlatformDxe/PlatformConfig.c | 1 + + OvmfPkg/PlatformDxe/PlatformConfig.h | 1 + + 3 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/OvmfPkg/PlatformDxe/Platform.c b/OvmfPkg/PlatformDxe/Platform= .c +index ac31fafbdc..e58e75eb22 100644 +--- a/OvmfPkg/PlatformDxe/Platform.c ++++ b/OvmfPkg/PlatformDxe/Platform.c +@@ -258,7 +258,7 @@ ExtractConfig ( + !HiiIsConfigHdrMatch (=0D + Request,=0D + &gOvmfPlatformConfigGuid,=0D +- mVariableName=0D ++ mHiiFormName=0D + )=0D + )=0D + {=0D +@@ -447,7 +447,7 @@ RouteConfig ( + !HiiIsConfigHdrMatch (=0D + Configuration,=0D + &gOvmfPlatformConfigGuid,=0D +- mVariableName=0D ++ mHiiFormName=0D + )=0D + )=0D + {=0D +diff --git a/OvmfPkg/PlatformDxe/PlatformConfig.c b/OvmfPkg/PlatformDxe/Pl= atformConfig.c +index f5ac2d0609..4058a324eb 100644 +--- a/OvmfPkg/PlatformDxe/PlatformConfig.c ++++ b/OvmfPkg/PlatformDxe/PlatformConfig.c +@@ -22,6 +22,7 @@ + // Name of the UEFI variable that we use for persistent storage.=0D + //=0D + CHAR16 mVariableName[] =3D L"PlatformConfig";=0D ++CHAR16 mHiiFormName[] =3D L"MainFormState";=0D + =0D + /**=0D + Serialize and persistently save platform configuration.=0D +diff --git a/OvmfPkg/PlatformDxe/PlatformConfig.h b/OvmfPkg/PlatformDxe/Pl= atformConfig.h +index 5d9b457b1b..93d06a9a6b 100644 +--- a/OvmfPkg/PlatformDxe/PlatformConfig.h ++++ b/OvmfPkg/PlatformDxe/PlatformConfig.h +@@ -51,5 +51,6 @@ PlatformConfigLoad ( + #define PLATFORM_CONFIG_F_DOWNGRADE BIT63=0D + =0D + extern CHAR16 mVariableName[];=0D ++extern CHAR16 mHiiFormName[];=0D + =0D + #endif // _PLATFORM_CONFIG_H_=0D +--=20 +2.30.2 + diff --git a/debian/patches/series b/debian/patches/series index ade8665..1cf1ccd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ +0001-OvmfPkg-fix-PlatformConfig.patch no-stack-protector-all-archs.diff brotlicompress-disable.diff x64-baseline-abi.patch --=20 2.30.2