From 4c43c025cb288c7dc2fe5043fd7601e90a4b361a Mon Sep 17 00:00:00 2001

From: Laszlo Ersek <lersek@redhat.com>

Date: Wed, 14 Oct 2015 15:59:06 +0200

Subject: OvmfPkg: take PcdResizeXterm from the QEMU command line (RH only)

Notes about edk2-stable202205 rebase

- Necessary minor fixes for upstream changes

Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] ->

RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase:

- Extend the DSC change to the new OvmfPkg/AmdSev platform, which has been

  introduced upstream in commit 30d277ed7a82 ("OvmfPkg/Amdsev: Base commit

  to build encrypted boot specific OVMF", 2020-12-14), for TianoCore#3077.

  We've always patched all those DSC/FDF files in OvmfPkg down-stream that

  made sense at least in theory on QEMU. (For example, we've always

  patched "OvmfPkgIa32.dsc" and "OvmfPkgIa32.fdf", even though we never

  build or ship the pure IA32 firmware platform.) Follow suit with

  "AmdSevX64.dsc".

Notes about the RHEL-8.2/20190904-37eef91017ad [edk2-stable201908] ->

RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] rebase:

- Resolve contextual conflict in the DSC files, from upstream commit

  b0ed7ebdebd1 ("OvmfPkg: set fixed FlashNvStorage base addresses with -D

  SMM_REQUIRE", 2020-03-12).

Notes about the RHEL-8.1/20190308-89910a39dcfd [edk2-stable201903] ->

RHEL-8.2/20190904-37eef91017ad [edk2-stable201908] rebase:

- no change

Notes about the RHEL-8.0/20180508-ee3198e672e2 ->

RHEL-8.1/20190308-89910a39dcfd rebase:

- no change

Notes about the RHEL-7.6/ovmf-20180508-2.gitee3198e672e2.el7 ->

RHEL-8.0/20180508-ee3198e672e2 rebase:

- reorder the rebase changelog in the commit message so that it reads like

  a blog: place more recent entries near the top

- no changes to the patch body

Notes about the 20171011-92d07e48907f -> 20180508-ee3198e672e2 rebase:

- no change

Notes about the 20170228-c325e41585e3 -> 20171011-92d07e48907f rebase:

- refresh downstream-only commit 8abc2a6ddad2 against context differences

  in the DSC files from upstream commit 5e167d7e784c

  ("OvmfPkg/PlatformPei: don't allocate reserved mem varstore if

  SMM_REQUIRE", 2017-03-12).

Notes about the 20160608b-988715a -> 20170228-c325e41585e3 rebase:

- no changes

Contributed-under: TianoCore Contribution Agreement 1.0

Signed-off-by: Laszlo Ersek <lersek@redhat.com>

(cherry picked from commit 6fa0c4d67c0bb8bde2ddd6db41c19eb0c40b2721)

(cherry picked from commit 8abc2a6ddad25af7e88dc0cf57d55dfb75fbf92d)

(cherry picked from commit b311932d3841c017a0f0fec553edcac365cc2038)

(cherry picked from commit 61914fb81cf624c9028d015533b400b2794e52d3)

(cherry picked from commit 2ebf3cc2ae99275d63bb6efd3c22dec76251a853)

(cherry picked from commit f9b73437b9b231773c1a20e0c516168817a930a2)

(cherry picked from commit 2cc462ee963d0be119bc97bfc9c70d292a40516f)

(cherry picked from commit 51e0de961029af84b5bdbfddcc9762b1819d500f)

---

 OvmfPkg/AmdSev/AmdSevX64.dsc        |  1 +

 OvmfPkg/CloudHv/CloudHvX64.dsc      |  1 +

 OvmfPkg/IntelTdx/IntelTdxX64.dsc    |  1 +

 OvmfPkg/Microvm/MicrovmX64.dsc      |  2 +-

 OvmfPkg/OvmfPkgIa32.dsc             |  1 +

 OvmfPkg/OvmfPkgIa32X64.dsc          |  1 +

 OvmfPkg/OvmfPkgX64.dsc              |  1 +

 OvmfPkg/PlatformPei/Platform.c      | 13 +++++++++++++

 OvmfPkg/PlatformPei/PlatformPei.inf |  1 +

 9 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc

index fc1fdb2e22..ae23094ffc 100644

--- a/OvmfPkg/AmdSev/AmdSevX64.dsc

+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc

@@ -524,6 +524,7 @@

 [PcdsDynamicDefault]

   gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0

+  gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0

diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc b/OvmfPkg/CloudHv/CloudHvX64.dsc

index 92664f319b..4aa54e4dc3 100644

--- a/OvmfPkg/CloudHv/CloudHvX64.dsc

+++ b/OvmfPkg/CloudHv/CloudHvX64.dsc

@@ -574,6 +574,7 @@

   #   ($(SMM_REQUIRE) == FALSE)

   gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0

+  gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE

 !if $(SMM_REQUIRE) == FALSE

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0

diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.dsc b/OvmfPkg/IntelTdx/IntelTdxX64.dsc

index dd8d446f4a..ec1aab6f09 100644

--- a/OvmfPkg/IntelTdx/IntelTdxX64.dsc

+++ b/OvmfPkg/IntelTdx/IntelTdxX64.dsc

@@ -461,6 +461,7 @@

   #   ($(SMM_REQUIRE) == FALSE)

   gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0

+  gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0

diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc

index f8fc977cb2..02ce394e18 100644

--- a/OvmfPkg/Microvm/MicrovmX64.dsc

+++ b/OvmfPkg/Microvm/MicrovmX64.dsc

@@ -556,7 +556,7 @@

   # only set when

   #   ($(SMM_REQUIRE) == FALSE)

   gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0

-

+  gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0

diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc

index a9841cbfc3..b69e3c05a2 100644

--- a/OvmfPkg/OvmfPkgIa32.dsc

+++ b/OvmfPkg/OvmfPkgIa32.dsc

@@ -585,6 +585,7 @@

   #   ($(SMM_REQUIRE) == FALSE)

   gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0

+  gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE

 !if $(SMM_REQUIRE) == FALSE

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0

diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc

index f7949780fa..726011ec42 100644

--- a/OvmfPkg/OvmfPkgIa32X64.dsc

+++ b/OvmfPkg/OvmfPkgIa32X64.dsc

@@ -593,6 +593,7 @@

   #   ($(SMM_REQUIRE) == FALSE)

   gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0

+  gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE

 !if $(SMM_REQUIRE) == FALSE

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0

diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc

index 1448f925b7..ab2e31ea8f 100644

--- a/OvmfPkg/OvmfPkgX64.dsc

+++ b/OvmfPkg/OvmfPkgX64.dsc

@@ -612,6 +612,7 @@

   #   ($(SMM_REQUIRE) == FALSE)

   gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0

+  gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE

 !if $(SMM_REQUIRE) == FALSE

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0

diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c

index f006755d5f..b8f5690251 100644

--- a/OvmfPkg/PlatformPei/Platform.c

+++ b/OvmfPkg/PlatformPei/Platform.c

@@ -41,6 +41,18 @@

 #include "Platform.h"

+#define UPDATE_BOOLEAN_PCD_FROM_FW_CFG(TokenName)                   \

+          do {                                                      \

+            BOOLEAN       Setting;                                  \

+            RETURN_STATUS PcdStatus;                                \

+                                                                    \

+            if (!RETURN_ERROR (QemuFwCfgParseBool (                 \

+                              "opt/ovmf/" #TokenName, &Setting))) { \

+              PcdStatus = PcdSetBoolS (TokenName, Setting);         \

+              ASSERT_RETURN_ERROR (PcdStatus);                      \

+            }                                                       \

+          } while (0)

+

 EFI_HOB_PLATFORM_INFO  mPlatformInfoHob = { 0 };

 EFI_PEI_PPI_DESCRIPTOR  mPpiBootMode[] = {

@@ -387,6 +399,7 @@ InitializePlatform (

     MemTypeInfoInitialization ();

     MemMapInitialization (&mPlatformInfoHob);

     NoexecDxeInitialization ();

+    UPDATE_BOOLEAN_PCD_FROM_FW_CFG (PcdResizeXterm);

   }

   InstallClearCacheCallback ();

diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/PlatformPei.inf

index 00372fa0eb..2dfa357c38 100644

--- a/OvmfPkg/PlatformPei/PlatformPei.inf

+++ b/OvmfPkg/PlatformPei/PlatformPei.inf

@@ -98,6 +98,7 @@

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize

   gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved

+  gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm

   gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode

   gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable

   gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack

-- 

2.31.1