From 6a27daa40698f06a34c209bd90092011d70f7795 Mon Sep 17 00:00:00 2001

From: Laszlo Ersek <lersek@redhat.com>

Date: Sun, 26 Jul 2015 08:02:50 +0000

Subject: [PATCH] ArmVirtPkg: take PcdResizeXterm from the QEMU command line

 (RH only)

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

- Adapt commit 6b97969096a3 to the fact that upstream has deprecated such

  setter functions for dynamic PCDs that don't return a status code (such

  as PcdSetBool()). Employ PcdSetBoolS(), and assert that it succeeds --

  there's really no circumstance in this case when it could fail.

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

- Refresh downstream-only commit d4564d39dfdb against context changes in

  "ArmVirtPkg/ArmVirtQemu.dsc" from upstream commit 7e5f1b673870

  ("ArmVirtPkg/PlatformHasAcpiDtDxe: allow guest level ACPI disable

  override", 2017-03-29).

Contributed-under: TianoCore Contribution Agreement 1.0

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

(cherry picked from commit d4564d39dfdbf74e762af43314005a2c026cb262)

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

---

 ArmVirtPkg/ArmVirtQemu.dsc                    |  7 +-

 .../TerminalPcdProducerLib.c                  | 87 +++++++++++++++++++

 .../TerminalPcdProducerLib.inf                | 41 +++++++++

 3 files changed, 134 insertions(+), 1 deletion(-)

 create mode 100644 ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.c

 create mode 100644 ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf

diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc

index a7a3899560..86d5d5a666 100644

--- a/ArmVirtPkg/ArmVirtQemu.dsc

+++ b/ArmVirtPkg/ArmVirtQemu.dsc

@@ -206,6 +206,8 @@

   gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosDocRev|0x0

   gUefiOvmfPkgTokenSpaceGuid.PcdQemuSmbiosValidated|FALSE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE

+

 [PcdsDynamicHii]

   gArmVirtTokenSpaceGuid.PcdForceNoAcpi|L"ForceNoAcpi"|gArmVirtVariableGuid|0x0|FALSE|NV,BS

@@ -282,7 +284,10 @@

   MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf

   MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf

   MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf

-  MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf

+  MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf {

+    <LibraryClasses>

+      NULL|ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf

+  }

   MdeModulePkg/Universal/SerialDxe/SerialDxe.inf

   MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

diff --git a/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.c b/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.c

new file mode 100644

index 0000000000..814ad48199

--- /dev/null

+++ b/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.c

@@ -0,0 +1,87 @@

+/** @file

+*  Plugin library for setting up dynamic PCDs for TerminalDxe, from fw_cfg

+*

+*  Copyright (C) 2015-2016, Red Hat, Inc.

+*  Copyright (c) 2014, Linaro Ltd. All rights reserved.

+*

+*  This program and the accompanying materials are licensed and made available

+*  under the terms and conditions of the BSD License which accompanies this

+*  distribution.  The full text of the license may be found at

+*  http://opensource.org/licenses/bsd-license.php

+*

+*  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+*  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR

+*  IMPLIED.

+*

+**/

+

+#include <Library/DebugLib.h>

+#include <Library/PcdLib.h>

+#include <Library/QemuFwCfgLib.h>

+

+STATIC

+RETURN_STATUS

+GetNamedFwCfgBoolean (

+  IN  CONST CHAR8 *FwCfgFileName,

+  OUT BOOLEAN     *Setting

+  )

+{

+  RETURN_STATUS        Status;

+  FIRMWARE_CONFIG_ITEM FwCfgItem;

+  UINTN                FwCfgSize;

+  UINT8                Value[3];

+

+  Status = QemuFwCfgFindFile (FwCfgFileName, &FwCfgItem, &FwCfgSize);

+  if (RETURN_ERROR (Status)) {

+    return Status;

+  }

+  if (FwCfgSize > sizeof Value) {

+    return RETURN_BAD_BUFFER_SIZE;

+  }

+  QemuFwCfgSelectItem (FwCfgItem);

+  QemuFwCfgReadBytes (FwCfgSize, Value);

+

+  if ((FwCfgSize == 1) ||

+      (FwCfgSize == 2 && Value[1] == '\n') ||

+      (FwCfgSize == 3 && Value[1] == '\r' && Value[2] == '\n')) {

+    switch (Value[0]) {

+      case '0':

+      case 'n':

+      case 'N':

+        *Setting = FALSE;

+        return RETURN_SUCCESS;

+

+      case '1':

+      case 'y':

+      case 'Y':

+        *Setting = TRUE;

+        return RETURN_SUCCESS;

+

+      default:

+        break;

+    }

+  }

+  return RETURN_PROTOCOL_ERROR;

+}

+

+#define UPDATE_BOOLEAN_PCD_FROM_FW_CFG(TokenName)                             \

+          do {                                                                \

+            BOOLEAN       Setting;                                            \

+            RETURN_STATUS PcdStatus;                                          \

+                                                                              \

+            if (!RETURN_ERROR (GetNamedFwCfgBoolean (                         \

+                    "opt/org.tianocore.edk2.aavmf/" #TokenName, &Setting))) { \

+              PcdStatus = PcdSetBoolS (TokenName, Setting);                   \

+              ASSERT_RETURN_ERROR (PcdStatus);                                \

+            }                                                                 \

+          } while (0)

+

+RETURN_STATUS

+EFIAPI

+TerminalPcdProducerLibConstructor (

+  VOID

+  )

+{

+  UPDATE_BOOLEAN_PCD_FROM_FW_CFG (PcdResizeXterm);

+  return RETURN_SUCCESS;

+}

diff --git a/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf b/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf

new file mode 100644

index 0000000000..fecb37bcdf

--- /dev/null

+++ b/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf

@@ -0,0 +1,41 @@

+## @file

+#  Plugin library for setting up dynamic PCDs for TerminalDxe, from fw_cfg

+#

+#  Copyright (C) 2015-2016, Red Hat, Inc.

+#  Copyright (c) 2014, Linaro Ltd. All rights reserved.

+#

+#  This program and the accompanying materials are licensed and made available

+#  under the terms and conditions of the BSD License which accompanies this

+#  distribution.  The full text of the license may be found at

+#  http://opensource.org/licenses/bsd-license.php

+#

+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR

+#  IMPLIED.

+#

+##

+

+[Defines]

+  INF_VERSION                    = 0x00010005

+  BASE_NAME                      = TerminalPcdProducerLib

+  FILE_GUID                      = 4a0c5ed7-8c42-4c01-8f4c-7bf258316a96

+  MODULE_TYPE                    = BASE

+  VERSION_STRING                 = 1.0

+  LIBRARY_CLASS                  = TerminalPcdProducerLib|DXE_DRIVER

+  CONSTRUCTOR                    = TerminalPcdProducerLibConstructor

+

+[Sources]

+  TerminalPcdProducerLib.c

+

+[Packages]

+  MdePkg/MdePkg.dec

+  OvmfPkg/OvmfPkg.dec

+  MdeModulePkg/MdeModulePkg.dec

+

+[LibraryClasses]

+  DebugLib

+  PcdLib

+  QemuFwCfgLib

+

+[Pcd]

+  gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm