[pve-devel] [PATCH edk2-firmware] fix #4606: cherry-pick fix for PlatformConfig setting editing

[Fiona Ebner]

For example, the default screen resolution is such a setting.

Signed-off-by: Fiona Ebner <f.ebner at proxmox.com>
---
 .../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 <kraxel at redhat.com>
+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 ExtractConfig and RouteConfig")
+Signed-off-by: Gerd Hoffmann <kraxel at redhat.com>
+(cherry-picked from commit 16acacf24c2c1fa2eff9148ae8ec952d74e3ab03)
+Signed-off-by: Fiona Ebner <f.ebner at proxmox.com>
+---
+ 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 (
+          Request,
+          &gOvmfPlatformConfigGuid,
+-         mVariableName
++         mHiiFormName
+          )
+       )
+   {
+@@ -447,7 +447,7 @@ RouteConfig (
+       !HiiIsConfigHdrMatch (
+          Configuration,
+          &gOvmfPlatformConfigGuid,
+-         mVariableName
++         mHiiFormName
+          )
+       )
+   {
+diff --git a/OvmfPkg/PlatformDxe/PlatformConfig.c b/OvmfPkg/PlatformDxe/PlatformConfig.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.
+ //
+ CHAR16  mVariableName[] = L"PlatformConfig";
++CHAR16  mHiiFormName[]  = L"MainFormState";
+ 
+ /**
+   Serialize and persistently save platform configuration.
+diff --git a/OvmfPkg/PlatformDxe/PlatformConfig.h b/OvmfPkg/PlatformDxe/PlatformConfig.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
+ 
+ extern CHAR16  mVariableName[];
++extern CHAR16  mHiiFormName[];
+ 
+ #endif // _PLATFORM_CONFIG_H_
+-- 
+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
-- 
2.30.2