1. Patchew
  2. EDK2
  3. View series

[[edk2-devel] PATH v1 2/3] OvmfPkg: take PcdResizeXterm from the QEMU command line

Paweł Poławski posted 1 patch 1 year, 8 months ago
Failed in applying to current master (apply log)
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/PlatformPei.inf |  1 +
OvmfPkg/PlatformPei/Platform.c      | 13 +++++++++++++
9 files changed, 21 insertions(+), 1 deletion(-)
[[edk2-devel] PATH v1 2/3] OvmfPkg: take PcdResizeXterm from the QEMU command line
Posted by Paweł Poławski 1 year, 8 months ago 
From: Laszlo Ersek <lersek@redhat.com>

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

Pawel: Updated commit message for re-submission

Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>

Signed-off-by: Paweł Poławski <ppolawsk@redhat.com>
---
 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/PlatformPei.inf |  1 +
 OvmfPkg/PlatformPei/Platform.c      | 13 +++++++++++++
 9 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
index 90e8a213ef77..20f9f0fd2424 100644
--- a/OvmfPkg/AmdSev/AmdSevX64.dsc
+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
@@ -475,6 +475,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 f0d700f14477..bac05b72f2da 100644
--- a/OvmfPkg/CloudHv/CloudHvX64.dsc
+++ b/OvmfPkg/CloudHv/CloudHvX64.dsc
@@ -573,6 +573,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 71b1cf8e7090..f6945f6598b6 100644
--- a/OvmfPkg/IntelTdx/IntelTdxX64.dsc
+++ b/OvmfPkg/IntelTdx/IntelTdxX64.dsc
@@ -464,6 +464,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 52498bbe90a8..89c3dfce98ba 100644
--- a/OvmfPkg/Microvm/MicrovmX64.dsc
+++ b/OvmfPkg/Microvm/MicrovmX64.dsc
@@ -562,7 +562,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 725a01ae9a20..22ea7e109c21 100644
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -584,6 +584,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 adc813ba2e1e..3d832080f3b9 100644
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -592,6 +592,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 6e68f60dc90f..16cfa4c362cb 100644
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -611,6 +611,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/PlatformPei.inf b/OvmfPkg/PlatformPei/PlatformPei.inf
index 3cd83e6ec3e5..47adfd0fbb90 100644
--- a/OvmfPkg/PlatformPei/PlatformPei.inf
+++ b/OvmfPkg/PlatformPei/PlatformPei.inf
@@ -99,6 +99,7 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize

   gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved

+  gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm

   gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode

   gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable

   gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack

diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c
index 009db67ee60a..83d40b8a51f5 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 ();

-- 
2.37.2



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#92631): https://edk2.groups.io/g/devel/message/92631
Mute This Topic: https://groups.io/mt/93195503/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [[edk2-devel] PATH v1 2/3] OvmfPkg: take PcdResizeXterm from the QEMU command line
Posted by Ard Biesheuvel 1 year, 7 months ago 
On Tue, 23 Aug 2022 at 03:03, Paweł Poławski <ppolawsk@redhat.com> wrote:
>
> From: Laszlo Ersek <lersek@redhat.com>
>

<--- insert explanatory text here --->


> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
>
> Pawel: Updated commit message for re-submission
>
> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
>
> Signed-off-by: Paweł Poławski <ppolawsk@redhat.com>
> ---
>  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/PlatformPei.inf |  1 +
>  OvmfPkg/PlatformPei/Platform.c      | 13 +++++++++++++
>  9 files changed, 21 insertions(+), 1 deletion(-)
>
> diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
> index 90e8a213ef77..20f9f0fd2424 100644
> --- a/OvmfPkg/AmdSev/AmdSevX64.dsc
> +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
> @@ -475,6 +475,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 f0d700f14477..bac05b72f2da 100644
> --- a/OvmfPkg/CloudHv/CloudHvX64.dsc
> +++ b/OvmfPkg/CloudHv/CloudHvX64.dsc
> @@ -573,6 +573,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 71b1cf8e7090..f6945f6598b6 100644
> --- a/OvmfPkg/IntelTdx/IntelTdxX64.dsc
> +++ b/OvmfPkg/IntelTdx/IntelTdxX64.dsc
> @@ -464,6 +464,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 52498bbe90a8..89c3dfce98ba 100644
> --- a/OvmfPkg/Microvm/MicrovmX64.dsc
> +++ b/OvmfPkg/Microvm/MicrovmX64.dsc
> @@ -562,7 +562,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 725a01ae9a20..22ea7e109c21 100644
> --- a/OvmfPkg/OvmfPkgIa32.dsc
> +++ b/OvmfPkg/OvmfPkgIa32.dsc
> @@ -584,6 +584,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 adc813ba2e1e..3d832080f3b9 100644
> --- a/OvmfPkg/OvmfPkgIa32X64.dsc
> +++ b/OvmfPkg/OvmfPkgIa32X64.dsc
> @@ -592,6 +592,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 6e68f60dc90f..16cfa4c362cb 100644
> --- a/OvmfPkg/OvmfPkgX64.dsc
> +++ b/OvmfPkg/OvmfPkgX64.dsc
> @@ -611,6 +611,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/PlatformPei.inf b/OvmfPkg/PlatformPei/PlatformPei.inf
> index 3cd83e6ec3e5..47adfd0fbb90 100644
> --- a/OvmfPkg/PlatformPei/PlatformPei.inf
> +++ b/OvmfPkg/PlatformPei/PlatformPei.inf
> @@ -99,6 +99,7 @@
>    gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
>    gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
>    gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm
>    gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode
>    gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable
>    gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack
> diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c
> index 009db67ee60a..83d40b8a51f5 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 ();
> --
> 2.37.2
>


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#93144): https://edk2.groups.io/g/devel/message/93144
Mute This Topic: https://groups.io/mt/93195503/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.