Blame SOURCES/0022-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch

3e2dc0
From e7f57f154439c1c18ea5030b01f8d7bc492698b2 Mon Sep 17 00:00:00 2001
6009e6
From: Laszlo Ersek <lersek@redhat.com>
6009e6
Date: Wed, 27 Jan 2016 03:05:18 +0100
6009e6
Subject: ArmVirtPkg: silence DEBUG_VERBOSE (0x00400000) in QemuRamfbDxe (RH
6009e6
 only)
6009e6
3e2dc0
Notes about the RHEL-8.2/20190904-37eef91017ad [edk2-stable201908] ->
3e2dc0
RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] rebase:
3e2dc0
3e2dc0
- no change
3e2dc0
6009e6
Notes about the RHEL-8.1/20190308-89910a39dcfd [edk2-stable201903] ->
6009e6
RHEL-8.2/20190904-37eef91017ad [edk2-stable201908] rebase:
6009e6
6009e6
- The previous version of this patch (downstream commit 76b4ac28e975)
6009e6
  caused a regression (RHBZ#1714446), which was fixed up in downstream
6009e6
  commit 5a216abaa737 ("ArmVirtPkg: silence DEBUG_VERBOSE masking
6009e6
  ~0x00400000 in QemuRamfbDxe (RH only)", 2019-08-05).
6009e6
6009e6
  Squash the fixup into the original patch. Fuse the commit messages.
6009e6
  (Acked-by tags are not preserved, lest we confuse ourselves while
6009e6
  reviewing this rebase.)
6009e6
6009e6
Notes about the RHEL-8.0/20180508-ee3198e672e2 ->
6009e6
RHEL-8.1/20190308-89910a39dcfd rebase:
6009e6
6009e6
- new patch, due to upstream commit c64688f36a8b ("ArmVirtPkg: add
6009e6
  QemuRamfbDxe", 2018-06-14)
6009e6
6009e6
QemuRamfbDxe uses FrameBufferLib. The FrameBufferBltLib instance added in
6009e6
commit b1ca386074bd ("MdeModulePkg: Add FrameBufferBltLib library
6009e6
instance") logs many messages on the VERBOSE level; for example, a normal
6009e6
boot with ArmVirtQemu[Kernel] can produce 500+ "VideoFill" messages,
6009e6
dependent on the progress bar, when the VERBOSE bit is set in
6009e6
PcdDebugPrintErrorLevel.
6009e6
6009e6
Clear the VERBOSE bit without touching other bits -- those other bits
6009e6
differ between the "silent" and "verbose" builds, so we can't set them as
6009e6
constants.
6009e6
6009e6
QemuRamfbDxe itself doesn't log anything at the VERBOSE level, so we lose
6009e6
none of its messages, with the VERBOSE bit clear.
6009e6
6009e6
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
6009e6
(cherry picked from commit 76b4ac28e975bd63c25db903a1d42c47b38cc756)
6009e6
Reported-by: Andrew Jones <drjones@redhat.com>
6009e6
Suggested-by: Laszlo Ersek <lersek@redhat.com>
6009e6
Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
6009e6
(cherry picked from commit 5a216abaa737195327235e37563b18a6bf2a74dc)
6009e6
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
3e2dc0
(cherry picked from commit e5b8152bced2364a1ded0926dbba4d65e23e3f84)
6009e6
---
6009e6
 ArmVirtPkg/ArmVirtQemu.dsc       | 5 ++++-
6009e6
 ArmVirtPkg/ArmVirtQemuKernel.dsc | 5 ++++-
6009e6
 2 files changed, 8 insertions(+), 2 deletions(-)
6009e6
6009e6
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
3e2dc0
index 57c5b3f898..dda887b2ae 100644
6009e6
--- a/ArmVirtPkg/ArmVirtQemu.dsc
6009e6
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
3e2dc0
@@ -494,7 +494,10 @@
6009e6
   #
6009e6
   # Video support
6009e6
   #
6009e6
-  OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf
6009e6
+  OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf {
6009e6
+    <PcdsFixedAtBuild>
6009e6
+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|($(DEBUG_PRINT_ERROR_LEVEL)) & 0xFFBFFFFF
6009e6
+  }
6009e6
   OvmfPkg/VirtioGpuDxe/VirtioGpu.inf
6009e6
   OvmfPkg/PlatformDxe/Platform.inf
6009e6
 
6009e6
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
3e2dc0
index d186263e18..711dd63e20 100644
6009e6
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
6009e6
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
3e2dc0
@@ -427,7 +427,10 @@
6009e6
   #
6009e6
   # Video support
6009e6
   #
6009e6
-  OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf
6009e6
+  OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf {
6009e6
+    <PcdsFixedAtBuild>
6009e6
+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|($(DEBUG_PRINT_ERROR_LEVEL)) & 0xFFBFFFFF
6009e6
+  }
6009e6
   OvmfPkg/VirtioGpuDxe/VirtioGpu.inf
6009e6
   OvmfPkg/PlatformDxe/Platform.inf
6009e6
 
6009e6
-- 
6009e6
2.18.1
6009e6