4bec430
From 6f1c7583bce90e89193ae40042923f16c6e16ca7 Mon Sep 17 00:00:00 2001
59c3cdc
From: Paolo Bonzini <pbonzini@redhat.com>
59c3cdc
Date: Tue, 21 Nov 2017 00:57:45 +0100
0e05742
Subject: [PATCH 06/14] OvmfPkg: enable DEBUG_VERBOSE (RHEL only)
59c3cdc
59c3cdc
Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] ->
59c3cdc
RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase:
59c3cdc
59c3cdc
- Extend the DSC change to the new OvmfPkg/AmdSev platform, which has been
59c3cdc
  introduced upstream in commit 30d277ed7a82 ("OvmfPkg/Amdsev: Base commit
59c3cdc
  to build encrypted boot specific OVMF", 2020-12-14), for TianoCore#3077.
59c3cdc
59c3cdc
- Remove obsolete commit message tags related to downstream patch
59c3cdc
  management: Message-id, Patchwork-id, O-Subject, Acked-by, From
59c3cdc
  (RHBZ#1846481).
59c3cdc
59c3cdc
Notes about the RHEL-8.2/20190904-37eef91017ad [edk2-stable201908] ->
59c3cdc
RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] rebase:
59c3cdc
59c3cdc
- context difference from upstream commit 46bb81200742 ("OvmfPkg: Make
59c3cdc
  SOURCE_DEBUG_ENABLE actually need to be set to TRUE", 2019-10-22)
59c3cdc
  resolved automatically
59c3cdc
59c3cdc
Notes about the RHEL-8.1/20190308-89910a39dcfd [edk2-stable201903] ->
59c3cdc
RHEL-8.2/20190904-37eef91017ad [edk2-stable201908] rebase:
59c3cdc
59c3cdc
- no change
59c3cdc
59c3cdc
Notes about the RHEL-8.0/20180508-ee3198e672e2 ->
59c3cdc
RHEL-8.1/20190308-89910a39dcfd rebase:
59c3cdc
59c3cdc
- no change
59c3cdc
59c3cdc
Notes about the RHEL-7.6/ovmf-20180508-2.gitee3198e672e2.el7 ->
59c3cdc
RHEL-8.0/20180508-ee3198e672e2 rebase:
59c3cdc
59c3cdc
- reorder the rebase changelog in the commit message so that it reads like
59c3cdc
  a blog: place more recent entries near the top
59c3cdc
- no changes to the patch body
59c3cdc
59c3cdc
Notes about the 20171011-92d07e48907f -> 20180508-ee3198e672e2 rebase:
59c3cdc
59c3cdc
- no changes
59c3cdc
59c3cdc
Bugzilla: 1488247
59c3cdc
59c3cdc
Set the DEBUG_VERBOSE bit (0x00400000) in the log mask. We want detailed
59c3cdc
debug messages, and code in OvmfPkg logs many messages on the
59c3cdc
DEBUG_VERBOSE level.
59c3cdc
59c3cdc
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
59c3cdc
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
59c3cdc
(this patch was previously applied as commit 78d3ed73172b5738e32d2b0bc03f7984b9584117)
59c3cdc
(cherry picked from commit 7aeeaabc9871f657e65d2b99d81011b4964a1ce9)
59c3cdc
(cherry picked from commit a0617a6be1a80966099ddceb010f89202a79ee76)
59c3cdc
(cherry picked from commit 759bd3f591e2db699bdef4c7ea4e97c908e7f027)
59c3cdc
(cherry picked from commit 7e6d5dc4078c64be6d55d8fc3317c59a91507a50)
59c3cdc
(cherry picked from commit 3cb92f9ba18ac79911bd5258ff4f949cc617ae89)
59c3cdc
(cherry picked from commit 5ecc18badaabe774d9d0806b027ab63a30c6a2d7)
59c3cdc
---
59c3cdc
 OvmfPkg/AmdSev/AmdSevX64.dsc | 2 +-
59c3cdc
 OvmfPkg/OvmfPkgIa32.dsc      | 2 +-
59c3cdc
 OvmfPkg/OvmfPkgIa32X64.dsc   | 2 +-
59c3cdc
 OvmfPkg/OvmfPkgX64.dsc       | 2 +-
59c3cdc
 4 files changed, 4 insertions(+), 4 deletions(-)
59c3cdc
59c3cdc
diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
4bec430
index cf81a86c67dd..d8b1c4d9e8af 100644
59c3cdc
--- a/OvmfPkg/AmdSev/AmdSevX64.dsc
59c3cdc
+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
4bec430
@@ -427,7 +427,7 @@ [PcdsFixedAtBuild]
59c3cdc
   # DEBUG_VERBOSE   0x00400000  // Detailed debug messages that may
59c3cdc
   #                             // significantly impact boot performance
59c3cdc
   # DEBUG_ERROR     0x80000000  // Error
59c3cdc
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
59c3cdc
+  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8040004F
59c3cdc
 
59c3cdc
 !if $(SOURCE_DEBUG_ENABLE) == TRUE
59c3cdc
   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17
59c3cdc
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
4bec430
index 2395bcf6b8dc..21118b11f6b3 100644
59c3cdc
--- a/OvmfPkg/OvmfPkgIa32.dsc
59c3cdc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
4bec430
@@ -537,7 +537,7 @@ [PcdsFixedAtBuild]
59c3cdc
   # DEBUG_VERBOSE   0x00400000  // Detailed debug messages that may
59c3cdc
   #                             // significantly impact boot performance
59c3cdc
   # DEBUG_ERROR     0x80000000  // Error
59c3cdc
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
59c3cdc
+  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8040004F
59c3cdc
 
59c3cdc
 !if $(SOURCE_DEBUG_ENABLE) == TRUE
59c3cdc
   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17
59c3cdc
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
4bec430
index 9bf5ac0d143c..afb1afcceb61 100644
59c3cdc
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
59c3cdc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
4bec430
@@ -544,7 +544,7 @@ [PcdsFixedAtBuild]
59c3cdc
   # DEBUG_VERBOSE   0x00400000  // Detailed debug messages that may
59c3cdc
   #                             // significantly impact boot performance
59c3cdc
   # DEBUG_ERROR     0x80000000  // Error
59c3cdc
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
59c3cdc
+  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8040004F
59c3cdc
 
59c3cdc
 !if $(SOURCE_DEBUG_ENABLE) == TRUE
59c3cdc
   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17
59c3cdc
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
4bec430
index 69deaf8e08ec..45e0658e2b4a 100644
59c3cdc
--- a/OvmfPkg/OvmfPkgX64.dsc
59c3cdc
+++ b/OvmfPkg/OvmfPkgX64.dsc
4bec430
@@ -563,7 +563,7 @@ [PcdsFixedAtBuild]
59c3cdc
   # DEBUG_VERBOSE   0x00400000  // Detailed debug messages that may
59c3cdc
   #                             // significantly impact boot performance
59c3cdc
   # DEBUG_ERROR     0x80000000  // Error
59c3cdc
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
59c3cdc
+  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8040004F
59c3cdc
 
59c3cdc
 !if $(SOURCE_DEBUG_ENABLE) == TRUE
59c3cdc
   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17
59c3cdc
-- 
4bec430
2.41.0
59c3cdc