From ced5d89940999473221347c30865ad31e3ebaea7 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Wed, 23 Mar 2022 09:15:34 +0100 Subject: [PATCH] Update to edk2-stable202202 --- ...-do-not-build-BrotliCompress-RH-only.patch | 8 +- ...ove-package-private-Brotli-include-p.patch | 11 +- ...-max-debug-message-length-to-512-RHE.patch | 9 +- ...minalDxe-add-other-text-resolutions-.patch | 93 +++---- ...minalDxe-set-xterm-resolution-on-mod.patch | 81 +++--- ...ResizeXterm-from-the-QEMU-command-li.patch | 40 +-- ...PcdResizeXterm-from-the-QEMU-command.patch | 97 ++++---- ...clusion-of-the-shell-from-the-firmwa.patch | 20 +- ...ntroduce-fixed-PCD-for-early-hello-m.patch | 11 +- ...rePeiCore-write-early-hello-message-.patch | 100 ++++---- ...tPkg-set-early-hello-message-RH-only.patch | 10 +- ...mfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch | 22 +- ...DEBUG_VERBOSE-0x00400000-in-QemuVide.patch | 22 +- ...ce-DEBUG_VERBOSE-0x00400000-in-QemuR.patch | 16 +- ...bDxe-Do-not-report-DXE-failure-on-Aa.patch | 47 ++-- ...EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch | 24 +- ...lLib-list-RHEL8-specific-OpenSSL-fil.patch | 16 +- ...elLoaderFsDxe-suppress-error-on-no-k.patch | 21 +- ...Dxe-suppress-error-on-no-swtpm-in-si.patch | 42 ++-- ...take-PcdResizeXterm-from-the-QEMU-co.patch | 10 +- ...tools_def-to-support-cross-compiling.patch | 13 +- ...ptSevLib-Check-the-guest-type-before.patch | 230 ------------------ edk2.spec | 55 ++--- sources | 2 +- 24 files changed, 389 insertions(+), 611 deletions(-) rename 0008-BaseTools-do-not-build-BrotliCompress-RH-only.patch => 0001-BaseTools-do-not-build-BrotliCompress-RH-only.patch (86%) rename 0009-MdeModulePkg-remove-package-private-Brotli-include-p.patch => 0002-MdeModulePkg-remove-package-private-Brotli-include-p.patch (86%) rename 0011-OvmfPkg-increase-max-debug-message-length-to-512-RHE.patch => 0003-OvmfPkg-increase-max-debug-message-length-to-512-RHE.patch (93%) rename 0012-MdeModulePkg-TerminalDxe-add-other-text-resolutions-.patch => 0004-MdeModulePkg-TerminalDxe-add-other-text-resolutions-.patch (66%) rename 0013-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch => 0005-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch (82%) rename 0014-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch => 0006-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch (88%) rename 0015-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch => 0007-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch (94%) rename 0016-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch => 0008-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch (92%) rename 0017-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch => 0009-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch (92%) rename 0018-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch => 0010-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch (87%) rename 0019-ArmVirtPkg-set-early-hello-message-RH-only.patch => 0011-ArmVirtPkg-set-early-hello-message-RH-only.patch (92%) rename 0020-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch => 0012-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch (90%) rename 0021-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch => 0013-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch (92%) rename 0022-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch => 0014-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch (90%) rename 0023-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch => 0015-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch (85%) rename 0024-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch => 0016-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch (90%) rename 0025-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch => 0017-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch (95%) rename 0026-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch => 0018-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch (85%) rename 0027-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch => 0019-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch (84%) rename 0029-OvmfPkg-Microvm-take-PcdResizeXterm-from-the-QEMU-co.patch => 0020-OvmfPkg-Microvm-take-PcdResizeXterm-from-the-QEMU-co.patch (77%) rename fedora-Tweak-the-tools_def-to-support-cross-compiling.patch => 0021-Tweak-the-tools_def-to-support-cross-compiling.patch (91%) delete mode 100644 0028-OvmfPkg-MemEncryptSevLib-Check-the-guest-type-before.patch diff --git a/0008-BaseTools-do-not-build-BrotliCompress-RH-only.patch b/0001-BaseTools-do-not-build-BrotliCompress-RH-only.patch similarity index 86% rename from 0008-BaseTools-do-not-build-BrotliCompress-RH-only.patch rename to 0001-BaseTools-do-not-build-BrotliCompress-RH-only.patch index 78d65ea..298d93b 100644 --- a/0008-BaseTools-do-not-build-BrotliCompress-RH-only.patch +++ b/0001-BaseTools-do-not-build-BrotliCompress-RH-only.patch @@ -1,7 +1,7 @@ -From dca56cf4d28bbbb1d3be029ce9a6710cb3f6cd2f Mon Sep 17 00:00:00 2001 +From 61e29798c9c4e6b89a8e5c50939c6ab2f9ba3478 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Thu, 4 Jun 2020 13:34:12 +0200 -Subject: BaseTools: do not build BrotliCompress (RH only) +Subject: [PATCH 01/21] BaseTools: do not build BrotliCompress (RH only) Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] -> RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase: @@ -27,7 +27,7 @@ Signed-off-by: Laszlo Ersek 1 file changed, 1 deletion(-) diff --git a/BaseTools/Source/C/GNUmakefile b/BaseTools/Source/C/GNUmakefile -index 8c191e0c38..3eae824a1c 100644 +index 8c191e0c3817..3eae824a1c31 100644 --- a/BaseTools/Source/C/GNUmakefile +++ b/BaseTools/Source/C/GNUmakefile @@ -48,7 +48,6 @@ all: makerootdir subdirs @@ -39,5 +39,5 @@ index 8c191e0c38..3eae824a1c 100644 EfiRom \ GenFfs \ -- -2.27.0 +2.35.1 diff --git a/0009-MdeModulePkg-remove-package-private-Brotli-include-p.patch b/0002-MdeModulePkg-remove-package-private-Brotli-include-p.patch similarity index 86% rename from 0009-MdeModulePkg-remove-package-private-Brotli-include-p.patch rename to 0002-MdeModulePkg-remove-package-private-Brotli-include-p.patch index 6046944..c20a494 100644 --- a/0009-MdeModulePkg-remove-package-private-Brotli-include-p.patch +++ b/0002-MdeModulePkg-remove-package-private-Brotli-include-p.patch @@ -1,7 +1,8 @@ -From 9729dd1d6b83961d531e29777d0cc4a610b108be Mon Sep 17 00:00:00 2001 +From f4eea2685593bc4f39ebc50d79b849fd853a3a62 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Thu, 4 Jun 2020 13:39:08 +0200 -Subject: MdeModulePkg: remove package-private Brotli include path (RH only) +Subject: [PATCH 02/21] MdeModulePkg: remove package-private Brotli include + path (RH only) Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] -> RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase: @@ -31,10 +32,10 @@ Signed-off-by: Laszlo Ersek 1 file changed, 3 deletions(-) diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec -index 8d38383915..ba2d0290e7 100644 +index 40601c95832b..56138abbe407 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec -@@ -24,9 +24,6 @@ +@@ -24,9 +24,6 @@ [Defines] [Includes] Include @@ -45,5 +46,5 @@ index 8d38383915..ba2d0290e7 100644 ## @libraryclass Defines a set of methods to reset whole system. ResetSystemLib|Include/Library/ResetSystemLib.h -- -2.27.0 +2.35.1 diff --git a/0011-OvmfPkg-increase-max-debug-message-length-to-512-RHE.patch b/0003-OvmfPkg-increase-max-debug-message-length-to-512-RHE.patch similarity index 93% rename from 0011-OvmfPkg-increase-max-debug-message-length-to-512-RHE.patch rename to 0003-OvmfPkg-increase-max-debug-message-length-to-512-RHE.patch index ad9dd72..d5e571e 100644 --- a/0011-OvmfPkg-increase-max-debug-message-length-to-512-RHE.patch +++ b/0003-OvmfPkg-increase-max-debug-message-length-to-512-RHE.patch @@ -1,7 +1,8 @@ -From ed975a4db7c55e49ab9de1a0919baafdce9661e3 Mon Sep 17 00:00:00 2001 +From 6c102285ab54deba5098316e9a56a95e6895c866 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Thu, 20 Feb 2014 22:54:45 +0100 -Subject: OvmfPkg: increase max debug message length to 512 (RHEL only) +Subject: [PATCH 03/21] OvmfPkg: increase max debug message length to 512 (RHEL + only) Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] -> RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase: @@ -65,7 +66,7 @@ Signed-off-by: Laszlo Ersek 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c -index dffb20822d..0577c43c3d 100644 +index 4e25f198aa76..640627f38b72 100644 --- a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c +++ b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c @@ -21,7 +21,7 @@ @@ -78,5 +79,5 @@ index dffb20822d..0577c43c3d 100644 // // VA_LIST can not initialize to NULL for all compiler, so we use this to -- -2.27.0 +2.35.1 diff --git a/0012-MdeModulePkg-TerminalDxe-add-other-text-resolutions-.patch b/0004-MdeModulePkg-TerminalDxe-add-other-text-resolutions-.patch similarity index 66% rename from 0012-MdeModulePkg-TerminalDxe-add-other-text-resolutions-.patch rename to 0004-MdeModulePkg-TerminalDxe-add-other-text-resolutions-.patch index 73d2995..bd3661f 100644 --- a/0012-MdeModulePkg-TerminalDxe-add-other-text-resolutions-.patch +++ b/0004-MdeModulePkg-TerminalDxe-add-other-text-resolutions-.patch @@ -1,7 +1,8 @@ -From 6901201d2cd1d943ebd41f3d65102f787540d3c4 Mon Sep 17 00:00:00 2001 +From 986f59c22b45facd1bd124896a5c655d901065a3 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Tue, 25 Feb 2014 18:40:35 +0100 -Subject: MdeModulePkg: TerminalDxe: add other text resolutions (RHEL only) +Subject: [PATCH 04/21] MdeModulePkg: TerminalDxe: add other text resolutions + (RHEL only) Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] -> RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase: @@ -112,57 +113,57 @@ Signed-off-by: Laszlo Ersek 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c -index a98b690c8b..ded5513c74 100644 +index e2d779c78378..f238c4103b3d 100644 --- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c +++ b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c -@@ -115,9 +115,44 @@ TERMINAL_DEV mTerminalDevTemplate = { +@@ -112,9 +112,44 @@ TERMINAL_DEV mTerminalDevTemplate = { }; - TERMINAL_CONSOLE_MODE_DATA mTerminalConsoleModeData[] = { -- {80, 25}, -- {80, 50}, -- {100, 31}, -+ { 80, 25 }, // from graphics resolution 640 x 480 -+ { 80, 50 }, // from graphics resolution 640 x 960 -+ { 100, 25 }, // from graphics resolution 800 x 480 -+ { 100, 31 }, // from graphics resolution 800 x 600 -+ { 104, 32 }, // from graphics resolution 832 x 624 -+ { 120, 33 }, // from graphics resolution 960 x 640 -+ { 128, 31 }, // from graphics resolution 1024 x 600 -+ { 128, 40 }, // from graphics resolution 1024 x 768 -+ { 144, 45 }, // from graphics resolution 1152 x 864 -+ { 144, 45 }, // from graphics resolution 1152 x 870 -+ { 160, 37 }, // from graphics resolution 1280 x 720 -+ { 160, 40 }, // from graphics resolution 1280 x 760 -+ { 160, 40 }, // from graphics resolution 1280 x 768 -+ { 160, 42 }, // from graphics resolution 1280 x 800 -+ { 160, 50 }, // from graphics resolution 1280 x 960 -+ { 160, 53 }, // from graphics resolution 1280 x 1024 -+ { 170, 40 }, // from graphics resolution 1360 x 768 -+ { 170, 40 }, // from graphics resolution 1366 x 768 -+ { 175, 55 }, // from graphics resolution 1400 x 1050 -+ { 180, 47 }, // from graphics resolution 1440 x 900 -+ { 200, 47 }, // from graphics resolution 1600 x 900 -+ { 200, 63 }, // from graphics resolution 1600 x 1200 -+ { 210, 55 }, // from graphics resolution 1680 x 1050 -+ { 240, 56 }, // from graphics resolution 1920 x 1080 -+ { 240, 63 }, // from graphics resolution 1920 x 1200 -+ { 240, 75 }, // from graphics resolution 1920 x 1440 -+ { 250, 105 }, // from graphics resolution 2000 x 2000 -+ { 256, 80 }, // from graphics resolution 2048 x 1536 -+ { 256, 107 }, // from graphics resolution 2048 x 2048 -+ { 320, 75 }, // from graphics resolution 2560 x 1440 -+ { 320, 84 }, // from graphics resolution 2560 x 1600 -+ { 320, 107 }, // from graphics resolution 2560 x 2048 -+ { 350, 110 }, // from graphics resolution 2800 x 2100 -+ { 400, 126 }, // from graphics resolution 3200 x 2400 -+ { 480, 113 }, // from graphics resolution 3840 x 2160 -+ { 512, 113 }, // from graphics resolution 4096 x 2160 -+ { 960, 227 }, // from graphics resolution 7680 x 4320 + TERMINAL_CONSOLE_MODE_DATA mTerminalConsoleModeData[] = { +- { 80, 25 }, +- { 80, 50 }, +- { 100, 31 }, ++ { 80, 25 }, // from graphics resolution 640 x 480 ++ { 80, 50 }, // from graphics resolution 640 x 960 ++ { 100, 25 }, // from graphics resolution 800 x 480 ++ { 100, 31 }, // from graphics resolution 800 x 600 ++ { 104, 32 }, // from graphics resolution 832 x 624 ++ { 120, 33 }, // from graphics resolution 960 x 640 ++ { 128, 31 }, // from graphics resolution 1024 x 600 ++ { 128, 40 }, // from graphics resolution 1024 x 768 ++ { 144, 45 }, // from graphics resolution 1152 x 864 ++ { 144, 45 }, // from graphics resolution 1152 x 870 ++ { 160, 37 }, // from graphics resolution 1280 x 720 ++ { 160, 40 }, // from graphics resolution 1280 x 760 ++ { 160, 40 }, // from graphics resolution 1280 x 768 ++ { 160, 42 }, // from graphics resolution 1280 x 800 ++ { 160, 50 }, // from graphics resolution 1280 x 960 ++ { 160, 53 }, // from graphics resolution 1280 x 1024 ++ { 170, 40 }, // from graphics resolution 1360 x 768 ++ { 170, 40 }, // from graphics resolution 1366 x 768 ++ { 175, 55 }, // from graphics resolution 1400 x 1050 ++ { 180, 47 }, // from graphics resolution 1440 x 900 ++ { 200, 47 }, // from graphics resolution 1600 x 900 ++ { 200, 63 }, // from graphics resolution 1600 x 1200 ++ { 210, 55 }, // from graphics resolution 1680 x 1050 ++ { 240, 56 }, // from graphics resolution 1920 x 1080 ++ { 240, 63 }, // from graphics resolution 1920 x 1200 ++ { 240, 75 }, // from graphics resolution 1920 x 1440 ++ { 250, 105 }, // from graphics resolution 2000 x 2000 ++ { 256, 80 }, // from graphics resolution 2048 x 1536 ++ { 256, 107 }, // from graphics resolution 2048 x 2048 ++ { 320, 75 }, // from graphics resolution 2560 x 1440 ++ { 320, 84 }, // from graphics resolution 2560 x 1600 ++ { 320, 107 }, // from graphics resolution 2560 x 2048 ++ { 350, 110 }, // from graphics resolution 2800 x 2100 ++ { 400, 126 }, // from graphics resolution 3200 x 2400 ++ { 480, 113 }, // from graphics resolution 3840 x 2160 ++ { 512, 113 }, // from graphics resolution 4096 x 2160 ++ { 960, 227 }, // from graphics resolution 7680 x 4320 + { 1024, 227 }, // from graphics resolution 8192 x 4320 // // New modes can be added here. // -- -2.27.0 +2.35.1 diff --git a/0013-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch b/0005-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch similarity index 82% rename from 0013-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch rename to 0005-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch index 5fe8ff6..18937e3 100644 --- a/0013-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch +++ b/0005-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch @@ -1,8 +1,8 @@ -From 9485b38e5dbfd2e23ea6ad0585e773d7842a1903 Mon Sep 17 00:00:00 2001 +From 7d89e95bad10d53c0b58f96606d076fe73a648cb Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Tue, 25 Feb 2014 22:40:01 +0100 -Subject: MdeModulePkg: TerminalDxe: set xterm resolution on mode change (RH - only) +Subject: [PATCH 05/21] MdeModulePkg: TerminalDxe: set xterm resolution on mode + change (RH only) Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] -> RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase: @@ -82,15 +82,15 @@ Signed-off-by: Laszlo Ersek (cherry picked from commit bc2266f20de5db1636e09a07e4a72c8dbf505f5a) --- MdeModulePkg/MdeModulePkg.dec | 4 +++ - .../Console/TerminalDxe/TerminalConOut.c | 30 +++++++++++++++++++ .../Console/TerminalDxe/TerminalDxe.inf | 2 ++ - 3 files changed, 36 insertions(+) + .../Console/TerminalDxe/TerminalConOut.c | 29 +++++++++++++++++++ + 3 files changed, 35 insertions(+) diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec -index ba2d0290e7..ff70d6e6eb 100644 +index 56138abbe407..8a2bc9e4f80b 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec -@@ -2046,6 +2046,10 @@ +@@ -2080,6 +2080,10 @@ [PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx] # @Prompt Enable PCIe Resizable BAR Capability support. gEfiMdeModulePkgTokenSpaceGuid.PcdPcieResizableBarSupport|FALSE|BOOLEAN|0x10000024 @@ -101,8 +101,28 @@ index ba2d0290e7..ff70d6e6eb 100644 [PcdsPatchableInModule] ## Specify memory size with page number for PEI code when # Loading Module at Fixed Address feature is enabled. +diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf +index b2a8aeba8510..eff625346539 100644 +--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf ++++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf +@@ -55,6 +55,7 @@ [LibraryClasses] + DebugLib + PcdLib + BaseLib ++ PrintLib + + [Guids] + ## SOMETIMES_PRODUCES ## Variable:L"ConInDev" +@@ -87,6 +88,7 @@ [Protocols] + [Pcd] + gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType ## SOMETIMES_CONSUMES + gEfiMdeModulePkgTokenSpaceGuid.PcdErrorCodeSetVariable ## CONSUMES ++ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm ## CONSUMES + + # [Event] + # # Relative timer event set by UnicodeToEfiKey(), used to be one 2 seconds input timeout. diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c -index aae470e956..26156857aa 100644 +index 7809869e7d49..496849458db4 100644 --- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c +++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c @@ -7,6 +7,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent @@ -114,9 +134,9 @@ index aae470e956..26156857aa 100644 #include "Terminal.h" // -@@ -80,6 +82,16 @@ CHAR16 mSetCursorPositionString[] = { ESC, '[', '0', '0', ';', '0', '0', 'H', 0 - CHAR16 mCursorForwardString[] = { ESC, '[', '0', '0', 'C', 0 }; - CHAR16 mCursorBackwardString[] = { ESC, '[', '0', '0', 'D', 0 }; +@@ -80,6 +82,15 @@ CHAR16 mSetCursorPositionString[] = { ESC, '[', '0', '0', ';', '0', '0', 'H', 0 + CHAR16 mCursorForwardString[] = { ESC, '[', '0', '0', 'C', 0 }; + CHAR16 mCursorBackwardString[] = { ESC, '[', '0', '0', 'D', 0 }; +// +// Note that this is an ASCII format string, taking two INT32 arguments: @@ -124,26 +144,25 @@ index aae470e956..26156857aa 100644 +// +// A %d (INT32) format specification can expand to at most 11 characters. +// -+CHAR8 mResizeTextAreaFormatString[] = "\x1B[8;%d;%dt"; -+#define RESIZE_SEQ_SIZE (sizeof mResizeTextAreaFormatString + 2 * (11 - 2)) -+ ++CHAR8 mResizeTextAreaFormatString[] = "\x1B[8;%d;%dt"; ++#define RESIZE_SEQ_SIZE (sizeof mResizeTextAreaFormatString + 2 * (11 - 2)) + // // Body of the ConOut functions // -@@ -506,6 +518,24 @@ TerminalConOutSetMode ( +@@ -498,6 +509,24 @@ TerminalConOutSetMode ( return EFI_DEVICE_ERROR; } + if (PcdGetBool (PcdResizeXterm)) { -+ CHAR16 ResizeSequence[RESIZE_SEQ_SIZE]; ++ CHAR16 ResizeSequence[RESIZE_SEQ_SIZE]; + + UnicodeSPrintAsciiFormat ( + ResizeSequence, + sizeof ResizeSequence, + mResizeTextAreaFormatString, -+ (INT32) TerminalDevice->TerminalConsoleModeData[ModeNumber].Rows, -+ (INT32) TerminalDevice->TerminalConsoleModeData[ModeNumber].Columns ++ (INT32)TerminalDevice->TerminalConsoleModeData[ModeNumber].Rows, ++ (INT32)TerminalDevice->TerminalConsoleModeData[ModeNumber].Columns + ); + TerminalDevice->OutputEscChar = TRUE; + Status = This->OutputString (This, ResizeSequence); @@ -153,29 +172,9 @@ index aae470e956..26156857aa 100644 + } + } + - This->Mode->Mode = (INT32) ModeNumber; + This->Mode->Mode = (INT32)ModeNumber; - Status = This->ClearScreen (This); -diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf -index b2a8aeba85..eff6253465 100644 ---- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf -+++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf -@@ -55,6 +55,7 @@ - DebugLib - PcdLib - BaseLib -+ PrintLib - - [Guids] - ## SOMETIMES_PRODUCES ## Variable:L"ConInDev" -@@ -87,6 +88,7 @@ - [Pcd] - gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType ## SOMETIMES_CONSUMES - gEfiMdeModulePkgTokenSpaceGuid.PcdErrorCodeSetVariable ## CONSUMES -+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm ## CONSUMES - - # [Event] - # # Relative timer event set by UnicodeToEfiKey(), used to be one 2 seconds input timeout. + Status = This->ClearScreen (This); -- -2.27.0 +2.35.1 diff --git a/0014-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch b/0006-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch similarity index 88% rename from 0014-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch rename to 0006-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch index b42d5f3..df5c8a1 100644 --- a/0014-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch +++ b/0006-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch @@ -1,7 +1,7 @@ -From cbfd81c5bdd8bb8ee49f4e3387226cdcb83e6fb3 Mon Sep 17 00:00:00 2001 +From d0b512ade91abd2183c879a07663ceb085b261a2 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 14 Oct 2015 15:59:06 +0200 -Subject: [PATCH 07/20] OvmfPkg: take PcdResizeXterm from the QEMU command line +Subject: [PATCH 06/21] OvmfPkg: take PcdResizeXterm from the QEMU command line (RH only) edk2-stable202108 rebase @@ -80,58 +80,58 @@ Signed-off-by: Laszlo Ersek 6 files changed, 6 insertions(+) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index e589eafa49a8..e2aba82718c8 100644 +index fd56176796d5..d1f9bc6d0d61 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -534,6 +534,7 @@ [PcdsFixedAtBuild] +@@ -519,6 +519,7 @@ [PcdsFixedAtBuild] [PcdsDynamicDefault] gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 - gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0 - gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0 diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 5ccdd55472cc..9bde8702e74b 100644 +index 85abed24c1a7..6bcd222af7c2 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -594,6 +594,7 @@ [PcdsDynamicDefault] +@@ -580,6 +580,7 @@ [PcdsDynamicDefault] # ($(SMM_REQUIRE) == FALSE) gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE !if $(SMM_REQUIRE) == FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 - gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 9862112601f2..7ee5eaa0ace7 100644 +index a9c1daecc1a8..0cce3b768e12 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -600,6 +600,7 @@ [PcdsDynamicDefault] +@@ -586,6 +586,7 @@ [PcdsDynamicDefault] # ($(SMM_REQUIRE) == FALSE) gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE !if $(SMM_REQUIRE) == FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 - gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index a6ba816d2fb5..ec8df8397ed4 100644 +index 718399299f57..847cf6a46652 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -600,6 +600,7 @@ [PcdsDynamicDefault] +@@ -585,6 +585,7 @@ [PcdsDynamicDefault] # ($(SMM_REQUIRE) == FALSE) gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE !if $(SMM_REQUIRE) == FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 - gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/PlatformPei.inf -index 89d1f7636870..655240c6436e 100644 +index 212aa7b04751..1c0b7204ea9a 100644 --- a/OvmfPkg/PlatformPei/PlatformPei.inf +++ b/OvmfPkg/PlatformPei/PlatformPei.inf -@@ -93,6 +93,7 @@ [Pcd] +@@ -97,6 +97,7 @@ [Pcd] gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved @@ -140,10 +140,10 @@ index 89d1f7636870..655240c6436e 100644 gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c -index d3a20122a2ea..9a40932156a3 100644 +index d0323c645162..9011a55d0f90 100644 --- a/OvmfPkg/PlatformPei/Platform.c +++ b/OvmfPkg/PlatformPei/Platform.c -@@ -738,6 +738,7 @@ InitializePlatform ( +@@ -851,6 +851,7 @@ InitializePlatform ( MemTypeInfoInitialization (); MemMapInitialization (); NoexecDxeInitialization (); @@ -152,5 +152,5 @@ index d3a20122a2ea..9a40932156a3 100644 InstallClearCacheCallback (); -- -2.33.1 +2.35.1 diff --git a/0015-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch b/0007-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch similarity index 94% rename from 0015-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch rename to 0007-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch index aeb9736..f0eeeac 100644 --- a/0015-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch +++ b/0007-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch @@ -1,7 +1,8 @@ -From 3f9662c435278564640be672f0c4e17e535f1765 Mon Sep 17 00:00:00 2001 +From 39b83b28b9239d2c55226f4861c469f38fd967d1 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Sun, 26 Jul 2015 08:02:50 +0000 -Subject: ArmVirtPkg: take PcdResizeXterm from the QEMU command line (RH only) +Subject: [PATCH 07/21] ArmVirtPkg: take PcdResizeXterm from the QEMU command + line (RH only) Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] -> RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase: @@ -88,17 +89,17 @@ Signed-off-by: Laszlo Ersek (cherry picked from commit a5f7a57bf390f1f340ff1d1f1884a73716817ef1) --- ArmVirtPkg/ArmVirtQemu.dsc | 7 +++- - .../TerminalPcdProducerLib.c | 34 +++++++++++++++++++ .../TerminalPcdProducerLib.inf | 33 ++++++++++++++++++ + .../TerminalPcdProducerLib.c | 34 +++++++++++++++++++ 3 files changed, 73 insertions(+), 1 deletion(-) - create mode 100644 ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.c create mode 100644 ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf + create mode 100644 ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.c diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index 54d637163c..41a26c8d18 100644 +index b2b0d304d335..6960df62b082 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -280,6 +280,8 @@ +@@ -282,6 +282,8 @@ [PcdsDynamicDefault.common] gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask|0 !endif @@ -107,7 +108,7 @@ index 54d637163c..41a26c8d18 100644 [PcdsDynamicHii] gArmVirtTokenSpaceGuid.PcdForceNoAcpi|L"ForceNoAcpi"|gArmVirtVariableGuid|0x0|FALSE|NV,BS -@@ -382,7 +384,10 @@ +@@ -384,7 +386,10 @@ [Components.common] MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf @@ -119,9 +120,48 @@ index 54d637163c..41a26c8d18 100644 MdeModulePkg/Universal/SerialDxe/SerialDxe.inf MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf +diff --git a/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf b/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf +new file mode 100644 +index 000000000000..a51dbd1670a8 +--- /dev/null ++++ b/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf +@@ -0,0 +1,33 @@ ++## @file ++# Plugin library for setting up dynamic PCDs for TerminalDxe, from fw_cfg ++# ++# Copyright (C) 2015-2020, Red Hat, Inc. ++# Copyright (c) 2014, Linaro Ltd. All rights reserved.
++# ++# SPDX-License-Identifier: BSD-2-Clause-Patent ++## ++ ++[Defines] ++ INF_VERSION = 0x00010005 ++ BASE_NAME = TerminalPcdProducerLib ++ FILE_GUID = 4a0c5ed7-8c42-4c01-8f4c-7bf258316a96 ++ MODULE_TYPE = BASE ++ VERSION_STRING = 1.0 ++ LIBRARY_CLASS = NULL ++ CONSTRUCTOR = TerminalPcdProducerLibConstructor ++ ++[Sources] ++ TerminalPcdProducerLib.c ++ ++[Packages] ++ MdeModulePkg/MdeModulePkg.dec ++ MdePkg/MdePkg.dec ++ OvmfPkg/OvmfPkg.dec ++ ++[LibraryClasses] ++ DebugLib ++ PcdLib ++ QemuFwCfgSimpleParserLib ++ ++[Pcd] ++ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm ## SOMETIMES_PRODUCES diff --git a/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.c b/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.c new file mode 100644 -index 0000000000..bfd3a6a535 +index 000000000000..bfd3a6a535f9 --- /dev/null +++ b/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.c @@ -0,0 +1,34 @@ @@ -159,45 +199,6 @@ index 0000000000..bfd3a6a535 + 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..a51dbd1670 ---- /dev/null -+++ b/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf -@@ -0,0 +1,33 @@ -+## @file -+# Plugin library for setting up dynamic PCDs for TerminalDxe, from fw_cfg -+# -+# Copyright (C) 2015-2020, Red Hat, Inc. -+# Copyright (c) 2014, Linaro Ltd. All rights reserved.
-+# -+# SPDX-License-Identifier: BSD-2-Clause-Patent -+## -+ -+[Defines] -+ INF_VERSION = 0x00010005 -+ BASE_NAME = TerminalPcdProducerLib -+ FILE_GUID = 4a0c5ed7-8c42-4c01-8f4c-7bf258316a96 -+ MODULE_TYPE = BASE -+ VERSION_STRING = 1.0 -+ LIBRARY_CLASS = NULL -+ CONSTRUCTOR = TerminalPcdProducerLibConstructor -+ -+[Sources] -+ TerminalPcdProducerLib.c -+ -+[Packages] -+ MdeModulePkg/MdeModulePkg.dec -+ MdePkg/MdePkg.dec -+ OvmfPkg/OvmfPkg.dec -+ -+[LibraryClasses] -+ DebugLib -+ PcdLib -+ QemuFwCfgSimpleParserLib -+ -+[Pcd] -+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm ## SOMETIMES_PRODUCES -- -2.27.0 +2.35.1 diff --git a/0016-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch b/0008-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch similarity index 92% rename from 0016-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch rename to 0008-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch index c392569..e57d931 100644 --- a/0016-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch +++ b/0008-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch @@ -1,8 +1,8 @@ -From e9d9e73c317b256c0bdc6530b82a6a625d7d54db Mon Sep 17 00:00:00 2001 +From 2d7c77e17a3461d53521b42221e468fb234d5893 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Tue, 4 Nov 2014 23:02:53 +0100 -Subject: OvmfPkg: allow exclusion of the shell from the firmware image (RH - only) +Subject: [PATCH 08/21] OvmfPkg: allow exclusion of the shell from the firmware + image (RH only) Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] -> RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase: @@ -111,10 +111,10 @@ Signed-off-by: Laszlo Ersek 3 files changed, 6 insertions(+) diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index e3b1d74ce2..969524cf3b 100644 +index a6b2142ccd0c..b5bc8407e7d7 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf -@@ -293,12 +293,14 @@ INF FatPkg/EnhancedFatDxe/Fat.inf +@@ -283,12 +283,14 @@ [FV.DXEFV] INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf @@ -130,10 +130,10 @@ index e3b1d74ce2..969524cf3b 100644 INF MdeModulePkg/Logo/LogoDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index f7732382d4..36f078556f 100644 +index 49266dd46768..f4fa19bb013c 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf -@@ -294,12 +294,14 @@ INF FatPkg/EnhancedFatDxe/Fat.inf +@@ -287,12 +287,14 @@ [FV.DXEFV] INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf @@ -149,10 +149,10 @@ index f7732382d4..36f078556f 100644 INF MdeModulePkg/Logo/LogoDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index 137ed6bceb..a5900d8377 100644 +index ba7f26d01dc4..dfd17804c2a2 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf -@@ -306,12 +306,14 @@ INF FatPkg/EnhancedFatDxe/Fat.inf +@@ -309,12 +309,14 @@ [FV.DXEFV] INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf @@ -168,5 +168,5 @@ index 137ed6bceb..a5900d8377 100644 INF MdeModulePkg/Logo/LogoDxe.inf -- -2.27.0 +2.35.1 diff --git a/0017-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch b/0009-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch similarity index 92% rename from 0017-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch rename to 0009-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch index 590baed..c1f24b1 100644 --- a/0017-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch +++ b/0009-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch @@ -1,7 +1,8 @@ -From 6d968342cbfa40a8192cee7c685e1c794e6053df Mon Sep 17 00:00:00 2001 +From da4731a05cd2279c5ba504ad117ccd6256d75305 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 14 Oct 2015 13:49:43 +0200 -Subject: ArmPlatformPkg: introduce fixed PCD for early hello message (RH only) +Subject: [PATCH 09/21] ArmPlatformPkg: introduce fixed PCD for early hello + message (RH only) Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] -> RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase: @@ -71,10 +72,10 @@ Signed-off-by: Laszlo Ersek 1 file changed, 7 insertions(+) diff --git a/ArmPlatformPkg/ArmPlatformPkg.dec b/ArmPlatformPkg/ArmPlatformPkg.dec -index 3a25ddcdc8..b2b58553c7 100644 +index 3a25ddcdc8ca..b2b58553c7a6 100644 --- a/ArmPlatformPkg/ArmPlatformPkg.dec +++ b/ArmPlatformPkg/ArmPlatformPkg.dec -@@ -121,6 +121,13 @@ +@@ -121,6 +121,13 @@ [PcdsFixedAtBuild.common] ## If set, this will swap settings for HDLCD RED_SELECT and BLUE_SELECT registers gArmPlatformTokenSpaceGuid.PcdArmHdLcdSwapBlueRedSelect|FALSE|BOOLEAN|0x00000045 @@ -89,5 +90,5 @@ index 3a25ddcdc8..b2b58553c7 100644 ## PL031 RealTimeClock gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x0|UINT32|0x00000024 -- -2.27.0 +2.35.1 diff --git a/0018-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch b/0010-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch similarity index 87% rename from 0018-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch rename to 0010-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch index affbde1..557ac1e 100644 --- a/0018-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch +++ b/0010-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch @@ -1,8 +1,8 @@ -From e46d1e3f4c9b301acfa15fa4089661947e8742a4 Mon Sep 17 00:00:00 2001 +From 2ac5fede049429237cb2a698a9f927f21fd22c6e Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 14 Oct 2015 13:59:20 +0200 -Subject: ArmPlatformPkg: PrePeiCore: write early hello message to the serial - port (RH) +Subject: [PATCH 10/21] ArmPlatformPkg: PrePeiCore: write early hello message + to the serial port (RH) Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] -> RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase: @@ -65,20 +65,56 @@ Signed-off-by: Laszlo Ersek (cherry picked from commit 8d5a8827aabc67cb2a046697e1a750ca8d9cc453) (cherry picked from commit 49fe5596cd79c94d903c4d506c563d642ccd69aa) --- - ArmPlatformPkg/PrePeiCore/MainMPCore.c | 5 +++++ - ArmPlatformPkg/PrePeiCore/MainUniCore.c | 5 +++++ - ArmPlatformPkg/PrePeiCore/PrePeiCore.h | 1 + ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf | 2 ++ ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf | 2 ++ + ArmPlatformPkg/PrePeiCore/PrePeiCore.h | 1 + + ArmPlatformPkg/PrePeiCore/MainMPCore.c | 5 +++++ + ArmPlatformPkg/PrePeiCore/MainUniCore.c | 5 +++++ 5 files changed, 15 insertions(+) +diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf +index fb01dd1a113e..a6681c103297 100644 +--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf ++++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf +@@ -69,6 +69,8 @@ [FixedPcd] + gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize + gArmPlatformTokenSpaceGuid.PcdCPUCoreSecondaryStackSize + ++ gArmPlatformTokenSpaceGuid.PcdEarlyHelloMessage ++ + gArmTokenSpaceGuid.PcdGicDistributorBase + gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase + gArmTokenSpaceGuid.PcdGicSgiIntId +diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf +index e9eb092d3ac9..c98dc82f0c66 100644 +--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf ++++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf +@@ -67,4 +67,6 @@ [FixedPcd] + gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize + gArmPlatformTokenSpaceGuid.PcdCPUCoreSecondaryStackSize + ++ gArmPlatformTokenSpaceGuid.PcdEarlyHelloMessage ++ + gEfiMdeModulePkgTokenSpaceGuid.PcdInitValueInTempStack +diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCore.h b/ArmPlatformPkg/PrePeiCore/PrePeiCore.h +index 0345dd7bdd2a..ae8302becda2 100644 +--- a/ArmPlatformPkg/PrePeiCore/PrePeiCore.h ++++ b/ArmPlatformPkg/PrePeiCore/PrePeiCore.h +@@ -16,6 +16,7 @@ + #include + #include + #include ++#include + + #include + #include diff --git a/ArmPlatformPkg/PrePeiCore/MainMPCore.c b/ArmPlatformPkg/PrePeiCore/MainMPCore.c -index 859f1adf20..cf9e65bb7c 100644 +index b5d0d3a6442f..5126a6dfb0b1 100644 --- a/ArmPlatformPkg/PrePeiCore/MainMPCore.c +++ b/ArmPlatformPkg/PrePeiCore/MainMPCore.c -@@ -111,6 +111,11 @@ PrimaryMain ( - UINTN TemporaryRamBase; - UINTN TemporaryRamSize; +@@ -116,6 +116,11 @@ PrimaryMain ( + UINTN TemporaryRamBase; + UINTN TemporaryRamSize; + if (FixedPcdGetSize (PcdEarlyHelloMessage) > 1) { + SerialPortWrite (FixedPcdGetPtr (PcdEarlyHelloMessage), @@ -89,12 +125,12 @@ index 859f1adf20..cf9e65bb7c 100644 // Enable the GIC Distributor diff --git a/ArmPlatformPkg/PrePeiCore/MainUniCore.c b/ArmPlatformPkg/PrePeiCore/MainUniCore.c -index 220f9b5680..158cc34c77 100644 +index 1c2580eb923b..2a7580dbb405 100644 --- a/ArmPlatformPkg/PrePeiCore/MainUniCore.c +++ b/ArmPlatformPkg/PrePeiCore/MainUniCore.c @@ -29,6 +29,11 @@ PrimaryMain ( - UINTN TemporaryRamBase; - UINTN TemporaryRamSize; + UINTN TemporaryRamBase; + UINTN TemporaryRamSize; + if (FixedPcdGetSize (PcdEarlyHelloMessage) > 1) { + SerialPortWrite (FixedPcdGetPtr (PcdEarlyHelloMessage), @@ -104,42 +140,6 @@ index 220f9b5680..158cc34c77 100644 CreatePpiList (&PpiListSize, &PpiList); // Adjust the Temporary Ram as the new Ppi List (Common + Platform Ppi Lists) is created at -diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCore.h b/ArmPlatformPkg/PrePeiCore/PrePeiCore.h -index 7b155a8a61..e9e283f9ec 100644 ---- a/ArmPlatformPkg/PrePeiCore/PrePeiCore.h -+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCore.h -@@ -15,6 +15,7 @@ - #include - #include - #include -+#include - - #include - #include -diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf -index fb01dd1a11..a6681c1032 100644 ---- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf -+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf -@@ -69,6 +69,8 @@ - gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize - gArmPlatformTokenSpaceGuid.PcdCPUCoreSecondaryStackSize - -+ gArmPlatformTokenSpaceGuid.PcdEarlyHelloMessage -+ - gArmTokenSpaceGuid.PcdGicDistributorBase - gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase - gArmTokenSpaceGuid.PcdGicSgiIntId -diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf -index e9eb092d3a..c98dc82f0c 100644 ---- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf -+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf -@@ -67,4 +67,6 @@ - gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize - gArmPlatformTokenSpaceGuid.PcdCPUCoreSecondaryStackSize - -+ gArmPlatformTokenSpaceGuid.PcdEarlyHelloMessage -+ - gEfiMdeModulePkgTokenSpaceGuid.PcdInitValueInTempStack -- -2.27.0 +2.35.1 diff --git a/0019-ArmVirtPkg-set-early-hello-message-RH-only.patch b/0011-ArmVirtPkg-set-early-hello-message-RH-only.patch similarity index 92% rename from 0019-ArmVirtPkg-set-early-hello-message-RH-only.patch rename to 0011-ArmVirtPkg-set-early-hello-message-RH-only.patch index 5e4f5c9..c4c046c 100644 --- a/0019-ArmVirtPkg-set-early-hello-message-RH-only.patch +++ b/0011-ArmVirtPkg-set-early-hello-message-RH-only.patch @@ -1,7 +1,7 @@ -From b14a92fafb171ad4a47598076bd028e5cf33ac28 Mon Sep 17 00:00:00 2001 +From aa5965f02de8c044106a413f817b6a2651e89e97 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 14 Oct 2015 14:07:17 +0200 -Subject: ArmVirtPkg: set early hello message (RH only) +Subject: [PATCH 11/21] ArmVirtPkg: set early hello message (RH only) Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] -> RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase: @@ -66,10 +66,10 @@ Signed-off-by: Laszlo Ersek 1 file changed, 1 insertion(+) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index 41a26c8d18..971422411d 100644 +index 6960df62b082..847a82ac52e6 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -132,6 +132,7 @@ +@@ -134,6 +134,7 @@ [PcdsFeatureFlag.common] gArmVirtTokenSpaceGuid.PcdTpm2SupportEnabled|$(TPM2_ENABLE) [PcdsFixedAtBuild.common] @@ -78,5 +78,5 @@ index 41a26c8d18..971422411d 100644 gArmTokenSpaceGuid.PcdVFPEnabled|1 !endif -- -2.27.0 +2.35.1 diff --git a/0020-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch b/0012-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch similarity index 90% rename from 0020-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch rename to 0012-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch index 51c0342..e4374d0 100644 --- a/0020-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch +++ b/0012-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch @@ -1,7 +1,7 @@ -From 1771ff7479664c05884dab5a34d128cf8b01086f Mon Sep 17 00:00:00 2001 +From 68eb31a414bf2fc427cfa7831a90690dcb703c65 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 21 Nov 2017 00:57:45 +0100 -Subject: OvmfPkg: enable DEBUG_VERBOSE (RHEL only) +Subject: [PATCH 12/21] OvmfPkg: enable DEBUG_VERBOSE (RHEL only) Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] -> RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase: @@ -65,10 +65,10 @@ Signed-off-by: Paolo Bonzini 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index 0a8cb7fd3b..6e8defe5c7 100644 +index d1f9bc6d0d61..538a0c77f671 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -486,7 +486,7 @@ +@@ -471,7 +471,7 @@ [PcdsFixedAtBuild] # DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may # // significantly impact boot performance # DEBUG_ERROR 0x80000000 // Error @@ -78,10 +78,10 @@ index 0a8cb7fd3b..6e8defe5c7 100644 !if $(SOURCE_DEBUG_ENABLE) == TRUE gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index e6df324c7c..52cd87f698 100644 +index 6bcd222af7c2..91a3c8f9dda6 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -534,7 +534,7 @@ +@@ -520,7 +520,7 @@ [PcdsFixedAtBuild] # DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may # // significantly impact boot performance # DEBUG_ERROR 0x80000000 // Error @@ -91,10 +91,10 @@ index e6df324c7c..52cd87f698 100644 !if $(SOURCE_DEBUG_ENABLE) == TRUE gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 8104fe0218..214195a594 100644 +index 0cce3b768e12..1a7ba6e6eac5 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -538,7 +538,7 @@ +@@ -524,7 +524,7 @@ [PcdsFixedAtBuild] # DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may # // significantly impact boot performance # DEBUG_ERROR 0x80000000 // Error @@ -104,10 +104,10 @@ index 8104fe0218..214195a594 100644 !if $(SOURCE_DEBUG_ENABLE) == TRUE gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 3c8b2649a8..02aad65b00 100644 +index 847cf6a46652..1a7afc764607 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -540,7 +540,7 @@ +@@ -525,7 +525,7 @@ [PcdsFixedAtBuild] # DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may # // significantly impact boot performance # DEBUG_ERROR 0x80000000 // Error @@ -117,5 +117,5 @@ index 3c8b2649a8..02aad65b00 100644 !if $(SOURCE_DEBUG_ENABLE) == TRUE gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 -- -2.27.0 +2.35.1 diff --git a/0021-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch b/0013-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch similarity index 92% rename from 0021-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch rename to 0013-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch index 4cea103..b681445 100644 --- a/0021-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch +++ b/0013-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch @@ -1,7 +1,7 @@ -From 4b2a35ab1d659068d47baaf1dd5b2918ba8a2573 Mon Sep 17 00:00:00 2001 +From 4a93ff1fcac08c28bd3f70e9f5bb0e402c27cb43 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 21 Nov 2017 00:57:46 +0100 -Subject: OvmfPkg: silence DEBUG_VERBOSE (0x00400000) in +Subject: [PATCH 13/21] OvmfPkg: silence DEBUG_VERBOSE (0x00400000) in QemuVideoDxe/QemuRamfbDxe (RH) Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] -> @@ -82,10 +82,10 @@ Signed-off-by: Paolo Bonzini 4 files changed, 32 insertions(+), 8 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index 6e8defe5c7..568ca369e6 100644 +index 538a0c77f671..ea4070eedbde 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -747,8 +747,14 @@ +@@ -715,8 +715,14 @@ [Components] MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf @@ -103,10 +103,10 @@ index 6e8defe5c7..568ca369e6 100644 # diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 52cd87f698..52fd057c90 100644 +index 91a3c8f9dda6..37d1d4b9a5e0 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -842,9 +842,15 @@ +@@ -812,9 +812,15 @@ [Components] MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf !ifndef $(CSM_ENABLE) @@ -125,10 +125,10 @@ index 52cd87f698..52fd057c90 100644 # diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 214195a594..653849cc7a 100644 +index 1a7ba6e6eac5..948e1a5ba59c 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -856,9 +856,15 @@ +@@ -826,9 +826,15 @@ [Components.X64] MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf !ifndef $(CSM_ENABLE) @@ -147,10 +147,10 @@ index 214195a594..653849cc7a 100644 # diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 02aad65b00..5275f2502b 100644 +index 1a7afc764607..46799406b613 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -854,9 +854,15 @@ +@@ -823,9 +823,15 @@ [Components] MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf !ifndef $(CSM_ENABLE) @@ -169,5 +169,5 @@ index 02aad65b00..5275f2502b 100644 # -- -2.27.0 +2.35.1 diff --git a/0022-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch b/0014-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch similarity index 90% rename from 0022-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch rename to 0014-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch index 18d30be..850d5d3 100644 --- a/0022-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch +++ b/0014-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch @@ -1,8 +1,8 @@ -From 251653ccf48a973481bb8c90161cccde50c78ad5 Mon Sep 17 00:00:00 2001 +From 1a0949d47578b6f74e3ac70c479454307141c1b9 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 27 Jan 2016 03:05:18 +0100 -Subject: ArmVirtPkg: silence DEBUG_VERBOSE (0x00400000) in QemuRamfbDxe (RH - only) +Subject: [PATCH 14/21] ArmVirtPkg: silence DEBUG_VERBOSE (0x00400000) in + QemuRamfbDxe (RH only) Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] -> RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase: @@ -61,10 +61,10 @@ Signed-off-by: Laszlo Ersek 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index 971422411d..d2a2fdac8e 100644 +index 847a82ac52e6..d94a8cdd696e 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -504,7 +504,10 @@ +@@ -509,7 +509,10 @@ [Components.common] # # Video support # @@ -77,10 +77,10 @@ index 971422411d..d2a2fdac8e 100644 OvmfPkg/PlatformDxe/Platform.inf diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc -index f598ac6a85..7e50ce8b3b 100644 +index 36343f347bab..99189055d8bd 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc -@@ -434,7 +434,10 @@ +@@ -438,7 +438,10 @@ [Components.common] # # Video support # @@ -93,5 +93,5 @@ index f598ac6a85..7e50ce8b3b 100644 OvmfPkg/PlatformDxe/Platform.inf -- -2.27.0 +2.35.1 diff --git a/0023-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch b/0015-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch similarity index 85% rename from 0023-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch rename to 0015-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch index e75701e..f289454 100644 --- a/0023-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch +++ b/0015-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch @@ -1,8 +1,8 @@ -From bacf42ebf768aebb8c2b36fb52d154daf19c0c74 Mon Sep 17 00:00:00 2001 +From 9ee0430cff8d62256904063205d6c874cf949adf Mon Sep 17 00:00:00 2001 From: Philippe Mathieu-Daude Date: Thu, 1 Aug 2019 20:43:48 +0200 -Subject: OvmfPkg: QemuRamfbDxe: Do not report DXE failure on Aarch64 silent - builds (RH only) +Subject: [PATCH 15/21] OvmfPkg: QemuRamfbDxe: Do not report DXE failure on + Aarch64 silent builds (RH only) Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] -> RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase: @@ -42,12 +42,24 @@ Signed-off-by: Laszlo Ersek (cherry picked from commit aa2b66b18a62d652bdbefae7b5732297294306ca) (cherry picked from commit deb3451034326b75fd760aba47a5171493ff055e) --- - OvmfPkg/QemuRamfbDxe/QemuRamfb.c | 14 ++++++++++++++ OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf | 1 + - 2 files changed, 15 insertions(+) + OvmfPkg/QemuRamfbDxe/QemuRamfb.c | 15 +++++++++++++++ + 2 files changed, 16 insertions(+) +diff --git a/OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf b/OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf +index e3890b8c202f..6ffee5acb24c 100644 +--- a/OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf ++++ b/OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf +@@ -29,6 +29,7 @@ [LibraryClasses] + BaseLib + BaseMemoryLib + DebugLib ++ DebugPrintErrorLevelLib + DevicePathLib + FrameBufferBltLib + MemoryAllocationLib diff --git a/OvmfPkg/QemuRamfbDxe/QemuRamfb.c b/OvmfPkg/QemuRamfbDxe/QemuRamfb.c -index 0d49d8bbab..dbf9bcbe16 100644 +index f5113fbc78a6..0295986fe0f1 100644 --- a/OvmfPkg/QemuRamfbDxe/QemuRamfb.c +++ b/OvmfPkg/QemuRamfbDxe/QemuRamfb.c @@ -13,6 +13,7 @@ @@ -58,11 +70,11 @@ index 0d49d8bbab..dbf9bcbe16 100644 #include #include #include -@@ -242,6 +243,19 @@ InitializeQemuRamfb ( +@@ -259,6 +260,20 @@ InitializeQemuRamfb ( Status = QemuFwCfgFindFile ("etc/ramfb", &mRamfbFwCfgItem, &FwCfgSize); if (EFI_ERROR (Status)) { -+#if defined (MDE_CPU_AARCH64) ++ #if defined (MDE_CPU_AARCH64) + // + // RHBZ#1714446 + // If no ramfb device was configured, this platform DXE driver should @@ -74,22 +86,11 @@ index 0d49d8bbab..dbf9bcbe16 100644 + if (GetDebugPrintErrorLevel () == DEBUG_ERROR) { + return EFI_SUCCESS; + } -+#endif ++ ++ #endif return EFI_NOT_FOUND; } - if (FwCfgSize != sizeof (RAMFB_CONFIG)) { -diff --git a/OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf b/OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf -index e3890b8c20..6ffee5acb2 100644 ---- a/OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf -+++ b/OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf -@@ -29,6 +29,7 @@ - BaseLib - BaseMemoryLib - DebugLib -+ DebugPrintErrorLevelLib - DevicePathLib - FrameBufferBltLib - MemoryAllocationLib + -- -2.27.0 +2.35.1 diff --git a/0024-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch b/0016-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch similarity index 90% rename from 0024-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch rename to 0016-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch index d08e6fd..11b88c3 100644 --- a/0024-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch +++ b/0016-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch @@ -1,8 +1,8 @@ -From 41c61737a6ead56c36edabd1b2e685a04c2e81c6 Mon Sep 17 00:00:00 2001 +From a365d5f65506c2b8c993089ad5b77dac7c6f4296 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 21 Nov 2017 00:57:47 +0100 -Subject: OvmfPkg: silence EFI_D_VERBOSE (0x00400000) in NvmExpressDxe (RH - only) +Subject: [PATCH 16/21] OvmfPkg: silence EFI_D_VERBOSE (0x00400000) in + NvmExpressDxe (RH only) Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] -> RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase: @@ -63,10 +63,10 @@ Signed-off-by: Paolo Bonzini 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index 568ca369e6..fb00b12f8c 100644 +index ea4070eedbde..b9718ff03f7b 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -741,7 +741,10 @@ +@@ -709,7 +709,10 @@ [Components] OvmfPkg/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf @@ -79,10 +79,10 @@ index 568ca369e6..fb00b12f8c 100644 MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 52fd057c90..119267e3c8 100644 +index 37d1d4b9a5e0..4dfd33853162 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -835,7 +835,10 @@ +@@ -805,7 +805,10 @@ [Components] OvmfPkg/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf @@ -95,10 +95,10 @@ index 52fd057c90..119267e3c8 100644 MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 653849cc7a..166c9f1fef 100644 +index 948e1a5ba59c..63721e5d177e 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -849,7 +849,10 @@ +@@ -819,7 +819,10 @@ [Components.X64] OvmfPkg/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf @@ -111,10 +111,10 @@ index 653849cc7a..166c9f1fef 100644 MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 5275f2502b..19d0944a72 100644 +index 46799406b613..cac0391c0807 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -847,7 +847,10 @@ +@@ -816,7 +816,10 @@ [Components] OvmfPkg/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf @@ -127,5 +127,5 @@ index 5275f2502b..19d0944a72 100644 MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf -- -2.27.0 +2.35.1 diff --git a/0025-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch b/0017-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch similarity index 95% rename from 0025-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch rename to 0017-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch index 9310962..0d76682 100644 --- a/0025-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch +++ b/0017-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch @@ -1,8 +1,8 @@ -From 7e6817e96a15f9ce32f0c9cf6326bb682672724c Mon Sep 17 00:00:00 2001 +From 5a952392dd42f4f041f2c8e9e8aaf7df1d654639 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Sat, 16 Nov 2019 17:11:27 +0100 -Subject: CryptoPkg/OpensslLib: list RHEL8-specific OpenSSL files in the INFs - (RH) +Subject: [PATCH 17/21] CryptoPkg/OpensslLib: list RHEL8-specific OpenSSL files + in the INFs (RH) Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] -> RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase: @@ -131,10 +131,10 @@ Signed-off-by: Laszlo Ersek 2 files changed, 22 insertions(+) diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf -index b00bb74ce6..71e32f26ea 100644 +index d84bde056af2..19913a4ac617 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf -@@ -570,6 +570,17 @@ +@@ -570,6 +570,17 @@ [Sources] $(OPENSSL_PATH)/ssl/statem/statem.h $(OPENSSL_PATH)/ssl/statem/statem_local.h # Autogenerated files list ends here @@ -153,10 +153,10 @@ index b00bb74ce6..71e32f26ea 100644 ossl_store.c rand_pool.c diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf -index 3557711bd8..003dcbad7a 100644 +index cdeed0d073eb..5057857e8d89 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf -@@ -519,6 +519,17 @@ +@@ -519,6 +519,17 @@ [Sources] $(OPENSSL_PATH)/crypto/x509v3/standard_exts.h $(OPENSSL_PATH)/crypto/x509v3/v3_admis.h # Autogenerated files list ends here @@ -175,5 +175,5 @@ index 3557711bd8..003dcbad7a 100644 ossl_store.c rand_pool.c -- -2.27.0 +2.35.1 diff --git a/0026-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch b/0018-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch similarity index 85% rename from 0026-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch rename to 0018-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch index 9564bd4..4cbbf3b 100644 --- a/0026-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch +++ b/0018-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch @@ -1,7 +1,7 @@ -From 11a79ac24d7411c8ad9d8a6779b324c5164e06d0 Mon Sep 17 00:00:00 2001 +From c36a16dad384129382088ef783d8e672ead2752a Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 24 Jun 2020 11:31:36 +0200 -Subject: [PATCH 19/20] OvmfPkg/QemuKernelLoaderFsDxe: suppress error on no +Subject: [PATCH 18/21] OvmfPkg/QemuKernelLoaderFsDxe: suppress error on no "-kernel" in silent aa64 build (RH) Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] -> @@ -27,9 +27,9 @@ Signed-off-by: Laszlo Ersek Signed-off-by: Miroslav Rezanina (cherry picked from commit 9adcdf493ebbd11efb74e2905ab5f6c8996e096d) --- - .../QemuKernelLoaderFsDxe.inf | 1 + - .../QemuKernelLoaderFsDxe.c | 17 +++++++++++++++++ - 2 files changed, 18 insertions(+) + .../QemuKernelLoaderFsDxe.inf | 1 + + .../QemuKernelLoaderFsDxe.c | 18 ++++++++++++++++++ + 2 files changed, 19 insertions(+) diff --git a/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf b/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf index 7b35adb8e034..e0331c6e2cbc 100644 @@ -44,7 +44,7 @@ index 7b35adb8e034..e0331c6e2cbc 100644 MemoryAllocationLib QemuFwCfgLib diff --git a/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c b/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c -index 6832d563bcb0..08ed67f5ffea 100644 +index d4f3cd92255f..f007f8a6c233 100644 --- a/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c +++ b/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c @@ -19,6 +19,7 @@ @@ -55,11 +55,11 @@ index 6832d563bcb0..08ed67f5ffea 100644 #include #include #include -@@ -1054,6 +1055,22 @@ QemuKernelLoaderFsDxeEntrypoint ( +@@ -1081,6 +1082,23 @@ QemuKernelLoaderFsDxeEntrypoint ( if (KernelBlob->Data == NULL) { Status = EFI_NOT_FOUND; -+#if defined (MDE_CPU_AARCH64) ++ #if defined (MDE_CPU_AARCH64) + // + // RHBZ#1844682 + // @@ -74,10 +74,11 @@ index 6832d563bcb0..08ed67f5ffea 100644 + if (GetDebugPrintErrorLevel () == DEBUG_ERROR) { + Status = EFI_SUCCESS; + } -+#endif ++ ++ #endif goto FreeBlobs; } -- -2.33.1 +2.35.1 diff --git a/0027-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch b/0019-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch similarity index 84% rename from 0027-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch rename to 0019-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch index 3cc5803..eb80d57 100644 --- a/0027-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch +++ b/0019-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch @@ -1,8 +1,8 @@ -From dc27035d2a8ca09dc5b0113c97a643341f286c08 Mon Sep 17 00:00:00 2001 +From bee2e929ef342eafbe44f0471154da4270cac91d Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 24 Jun 2020 11:40:09 +0200 -Subject: SecurityPkg/Tcg2Dxe: suppress error on no swtpm in silent aa64 build - (RH) +Subject: [PATCH 19/21] SecurityPkg/Tcg2Dxe: suppress error on no swtpm in + silent aa64 build (RH) Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] -> RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase: @@ -26,12 +26,24 @@ Signed-off-by: Laszlo Ersek Signed-off-by: Miroslav Rezanina (cherry picked from commit cbce29f7749477e271f9764fed82de94724af5df) --- - SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c | 17 +++++++++++++++++ SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf | 1 + + SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) +diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf +index 7dc7a2683d71..3bc88339311e 100644 +--- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf ++++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf +@@ -55,6 +55,7 @@ [LibraryClasses] + UefiRuntimeServicesTableLib + BaseMemoryLib + DebugLib ++ DebugPrintErrorLevelLib + Tpm2CommandLib + PrintLib + UefiLib diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c -index 6d17616c1c..f1a97d4b2d 100644 +index f6ea8b2bbf18..681eb7e08b98 100644 --- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c +++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c @@ -28,6 +28,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent @@ -42,9 +54,9 @@ index 6d17616c1c..f1a97d4b2d 100644 #include #include #include -@@ -2642,6 +2643,22 @@ DriverEntry ( - if (CompareGuid (PcdGetPtr(PcdTpmInstanceGuid), &gEfiTpmDeviceInstanceNoneGuid) || - CompareGuid (PcdGetPtr(PcdTpmInstanceGuid), &gEfiTpmDeviceInstanceTpm12Guid)){ +@@ -2691,6 +2692,22 @@ DriverEntry ( + CompareGuid (PcdGetPtr (PcdTpmInstanceGuid), &gEfiTpmDeviceInstanceTpm12Guid)) + { DEBUG ((DEBUG_INFO, "No TPM2 instance required!\n")); +#if defined (MDE_CPU_AARCH64) + // @@ -65,18 +77,6 @@ index 6d17616c1c..f1a97d4b2d 100644 return EFI_UNSUPPORTED; } -diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf -index 7dc7a2683d..3bc8833931 100644 ---- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf -+++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf -@@ -55,6 +55,7 @@ - UefiRuntimeServicesTableLib - BaseMemoryLib - DebugLib -+ DebugPrintErrorLevelLib - Tpm2CommandLib - PrintLib - UefiLib -- -2.27.0 +2.35.1 diff --git a/0029-OvmfPkg-Microvm-take-PcdResizeXterm-from-the-QEMU-co.patch b/0020-OvmfPkg-Microvm-take-PcdResizeXterm-from-the-QEMU-co.patch similarity index 77% rename from 0029-OvmfPkg-Microvm-take-PcdResizeXterm-from-the-QEMU-co.patch rename to 0020-OvmfPkg-Microvm-take-PcdResizeXterm-from-the-QEMU-co.patch index a8b737d..bf41586 100644 --- a/0029-OvmfPkg-Microvm-take-PcdResizeXterm-from-the-QEMU-co.patch +++ b/0020-OvmfPkg-Microvm-take-PcdResizeXterm-from-the-QEMU-co.patch @@ -1,7 +1,7 @@ -From 9120e7cff424f37e58f305d275124126aac27fd1 Mon Sep 17 00:00:00 2001 +From b0f070f4bf317f899de1b20a122ca124ad900d80 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Thu, 2 Dec 2021 14:06:18 +0100 -Subject: [PATCH 1/1] OvmfPkg/Microvm: take PcdResizeXterm from the QEMU +Subject: [PATCH 20/21] OvmfPkg/Microvm: take PcdResizeXterm from the QEMU command line (RH only) --- @@ -9,7 +9,7 @@ Subject: [PATCH 1/1] OvmfPkg/Microvm: take PcdResizeXterm from the QEMU 1 file changed, 1 insertion(+) diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc -index 617f92539518..80a01d551f3f 100644 +index 1ea43443ae97..073ff040a28a 100644 --- a/OvmfPkg/Microvm/MicrovmX64.dsc +++ b/OvmfPkg/Microvm/MicrovmX64.dsc @@ -551,6 +551,7 @@ [PcdsDynamicDefault] @@ -19,7 +19,7 @@ index 617f92539518..80a01d551f3f 100644 + gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 - gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 -- -2.33.1 +2.35.1 diff --git a/fedora-Tweak-the-tools_def-to-support-cross-compiling.patch b/0021-Tweak-the-tools_def-to-support-cross-compiling.patch similarity index 91% rename from fedora-Tweak-the-tools_def-to-support-cross-compiling.patch rename to 0021-Tweak-the-tools_def-to-support-cross-compiling.patch index b36f1e4..5c1ee18 100644 --- a/fedora-Tweak-the-tools_def-to-support-cross-compiling.patch +++ b/0021-Tweak-the-tools_def-to-support-cross-compiling.patch @@ -1,7 +1,7 @@ -From d8b75ad1013b21c089a1af579b510f32c49c5b14 Mon Sep 17 00:00:00 2001 +From 7aa9291cca4a5d3e499081741ae1bff1c2ebe2e9 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 16 Aug 2018 15:45:47 -0400 -Subject: [PATCH] Tweak the tools_def to support cross-compiling. +Subject: [PATCH 21/21] Tweak the tools_def to support cross-compiling. These files are meant for customization, so this is not upstream. @@ -12,10 +12,10 @@ Signed-off-by: Cole Robinson 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template -index 933b3160fd..e62ccc322d 100755 +index 9c310cf23d25..3189a3958b53 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template -@@ -2350,17 +2350,17 @@ RELEASE_GCC49_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x20 +@@ -2299,17 +2299,17 @@ RELEASE_GCC49_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x20 ################## # GCC5 IA32 definitions ################## @@ -44,7 +44,7 @@ index 933b3160fd..e62ccc322d 100755 *_GCC5_IA32_ASLCC_FLAGS = DEF(GCC5_ASLCC_FLAGS) -m32 *_GCC5_IA32_ASLDLINK_FLAGS = DEF(GCC5_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386 -no-pie -@@ -2382,17 +2382,17 @@ RELEASE_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl, +@@ -2331,17 +2331,17 @@ RELEASE_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl, ################## # GCC5 X64 definitions ################## @@ -73,3 +73,6 @@ index 933b3160fd..e62ccc322d 100755 *_GCC5_X64_ASLCC_FLAGS = DEF(GCC5_ASLCC_FLAGS) -m64 *_GCC5_X64_ASLDLINK_FLAGS = DEF(GCC5_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64 +-- +2.35.1 + diff --git a/0028-OvmfPkg-MemEncryptSevLib-Check-the-guest-type-before.patch b/0028-OvmfPkg-MemEncryptSevLib-Check-the-guest-type-before.patch deleted file mode 100644 index 4b3dfb3..0000000 --- a/0028-OvmfPkg-MemEncryptSevLib-Check-the-guest-type-before.patch +++ /dev/null @@ -1,230 +0,0 @@ -From 418ad50beaffaeb4b7b25d86b935f122f1740ebd Mon Sep 17 00:00:00 2001 -From: Brijesh Singh -Date: Wed, 1 Dec 2021 10:24:07 -0600 -Subject: [PATCH 1/1] OvmfPkg/MemEncryptSevLib: Check the guest type before - EsWorkarea access - -The commit 80e67af9afca added support for a generic workarea concept. -The workarea header contains the information of the guest type. The -header is populated by ResetVector code during the guest detection. - -Currently, the InternalMemEncryptSevStatus() reads the EsWorkArea to -determine the C-bit position. The EsWorkArea PCD is valid only for the -SEV guest type. Add a check of the guest type before accessing the -EsWorkArea PCD. - -Fixes: 80e67af9afca ("OvmfPkg: introduce a common work area") -Cc: James Bottomley -Cc: Min Xu -Cc: Jiewen Yao -Cc: Tom Lendacky -Cc: Jordan Justen -Cc: Ard Biesheuvel -Cc: Erdem Aktas -Cc: Gerd Hoffmann -Cc: Qi Zhou -Signed-off-by: Brijesh Singh -Message-Id: <20211201162407.3323063-1-brijesh.singh@amd.com> -Signed-off-by: Gerd Hoffmann ---- - .../DxeMemEncryptSevLib.inf | 2 + - .../PeiMemEncryptSevLib.inf | 2 + - .../SecMemEncryptSevLib.inf | 2 + - .../PeiMemEncryptSevLibInternal.c | 50 +++++++++++++++- - .../SecMemEncryptSevLibInternal.c | 58 ++++++++++++++++++- - 5 files changed, 110 insertions(+), 4 deletions(-) - -diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/DxeMemEncryptSevLib.inf b/OvmfPkg/Library/BaseMemEncryptSevLib/DxeMemEncryptSevLib.inf -index f2e162d68076..ca3d82ef93bf 100644 ---- a/OvmfPkg/Library/BaseMemEncryptSevLib/DxeMemEncryptSevLib.inf -+++ b/OvmfPkg/Library/BaseMemEncryptSevLib/DxeMemEncryptSevLib.inf -@@ -54,4 +54,6 @@ [FeaturePcd] - gUefiOvmfPkgTokenSpaceGuid.PcdSmmSmramRequire - - [Pcd] -+ gUefiOvmfPkgTokenSpaceGuid.PcdOvmfWorkAreaBase - gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask -+ gUefiOvmfPkgTokenSpaceGuid.PcdOvmfConfidentialComputingWorkAreaHeader -diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLib.inf b/OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLib.inf -index 03a78c32df28..2f27b5569d7a 100644 ---- a/OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLib.inf -+++ b/OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLib.inf -@@ -54,4 +54,6 @@ [FeaturePcd] - gUefiOvmfPkgTokenSpaceGuid.PcdSmmSmramRequire - - [FixedPcd] -+ gUefiOvmfPkgTokenSpaceGuid.PcdOvmfWorkAreaBase - gUefiCpuPkgTokenSpaceGuid.PcdSevEsWorkAreaBase -+ gUefiOvmfPkgTokenSpaceGuid.PcdOvmfConfidentialComputingWorkAreaHeader -diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLib.inf b/OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLib.inf -index 279c38bfbc2c..36c4f906d554 100644 ---- a/OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLib.inf -+++ b/OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLib.inf -@@ -48,4 +48,6 @@ [LibraryClasses] - PcdLib - - [FixedPcd] -+ gUefiOvmfPkgTokenSpaceGuid.PcdOvmfWorkAreaBase - gUefiCpuPkgTokenSpaceGuid.PcdSevEsWorkAreaBase -+ gUefiOvmfPkgTokenSpaceGuid.PcdOvmfConfidentialComputingWorkAreaHeader -diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLibInternal.c b/OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLibInternal.c -index e2fd109d120f..c61bee4c4779 100644 ---- a/OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLibInternal.c -+++ b/OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLibInternal.c -@@ -24,6 +24,52 @@ STATIC BOOLEAN mSevStatusChecked = FALSE; - STATIC UINT64 mSevEncryptionMask = 0; - STATIC BOOLEAN mSevEncryptionMaskSaved = FALSE; - -+/** -+ Determine if the SEV is active. -+ -+ During the early booting, GuestType is set in the work area. Verify that it -+ is an SEV guest. -+ -+ @retval TRUE SEV is enabled -+ @retval FALSE SEV is not enabled -+ -+ **/ -+STATIC -+BOOLEAN -+IsSevGuest ( -+ VOID -+ ) -+{ -+ OVMF_WORK_AREA *WorkArea; -+ -+ // -+ // Ensure that the size of the Confidential Computing work area header -+ // is same as what is provided through a fixed PCD. -+ // -+ ASSERT ((UINTN) FixedPcdGet32 (PcdOvmfConfidentialComputingWorkAreaHeader) == -+ sizeof(CONFIDENTIAL_COMPUTING_WORK_AREA_HEADER)); -+ -+ WorkArea = (OVMF_WORK_AREA *) FixedPcdGet32 (PcdOvmfWorkAreaBase); -+ -+ return ((WorkArea != NULL) && (WorkArea->Header.GuestType == GUEST_TYPE_AMD_SEV)); -+} -+ -+STATIC -+SEC_SEV_ES_WORK_AREA * -+GetSevEsWorkArea ( -+ VOID -+ ) -+{ -+ // -+ // Before accessing the Es workarea lets verify that its SEV guest -+ // -+ if (!IsSevGuest()) { -+ return NULL; -+ } -+ -+ return (SEC_SEV_ES_WORK_AREA *) FixedPcdGet32 (PcdSevEsWorkAreaBase); -+} -+ - /** - Reads and sets the status of SEV features. - -@@ -43,7 +89,7 @@ InternalMemEncryptSevStatus ( - - ReadSevMsr = FALSE; - -- SevEsWorkArea = (SEC_SEV_ES_WORK_AREA *) FixedPcdGet32 (PcdSevEsWorkAreaBase); -+ SevEsWorkArea = GetSevEsWorkArea (); - if (SevEsWorkArea != NULL && SevEsWorkArea->EncryptionMask != 0) { - // - // The MSR has been read before, so it is safe to read it again and avoid -@@ -139,7 +185,7 @@ MemEncryptSevGetEncryptionMask ( - if (!mSevEncryptionMaskSaved) { - SEC_SEV_ES_WORK_AREA *SevEsWorkArea; - -- SevEsWorkArea = (SEC_SEV_ES_WORK_AREA *) FixedPcdGet32 (PcdSevEsWorkAreaBase); -+ SevEsWorkArea = GetSevEsWorkArea (); - if (SevEsWorkArea != NULL) { - mSevEncryptionMask = SevEsWorkArea->EncryptionMask; - } else { -diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLibInternal.c b/OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLibInternal.c -index 56d8f3f3183f..f906f0de1b6c 100644 ---- a/OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLibInternal.c -+++ b/OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLibInternal.c -@@ -17,6 +17,52 @@ - #include - #include - -+/** -+ Determine if the SEV is active. -+ -+ During the early booting, GuestType is set in the work area. Verify that it -+ is an SEV guest. -+ -+ @retval TRUE SEV is enabled -+ @retval FALSE SEV is not enabled -+ -+ **/ -+STATIC -+BOOLEAN -+IsSevGuest ( -+ VOID -+ ) -+{ -+ OVMF_WORK_AREA *WorkArea; -+ -+ // -+ // Ensure that the size of the Confidential Computing work area header -+ // is same as what is provided through a fixed PCD. -+ // -+ ASSERT ((UINTN) FixedPcdGet32 (PcdOvmfConfidentialComputingWorkAreaHeader) == -+ sizeof(CONFIDENTIAL_COMPUTING_WORK_AREA_HEADER)); -+ -+ WorkArea = (OVMF_WORK_AREA *) FixedPcdGet32 (PcdOvmfWorkAreaBase); -+ -+ return ((WorkArea != NULL) && (WorkArea->Header.GuestType == GUEST_TYPE_AMD_SEV)); -+} -+ -+STATIC -+SEC_SEV_ES_WORK_AREA * -+GetSevEsWorkArea ( -+ VOID -+ ) -+{ -+ // -+ // Before accessing the Es workarea lets verify that its SEV guest -+ // -+ if (!IsSevGuest()) { -+ return NULL; -+ } -+ -+ return (SEC_SEV_ES_WORK_AREA *) FixedPcdGet32 (PcdSevEsWorkAreaBase); -+} -+ - /** - Reads and sets the status of SEV features. - -@@ -35,7 +81,8 @@ InternalMemEncryptSevStatus ( - - ReadSevMsr = FALSE; - -- SevEsWorkArea = (SEC_SEV_ES_WORK_AREA *) FixedPcdGet32 (PcdSevEsWorkAreaBase); -+ -+ SevEsWorkArea = GetSevEsWorkArea (); - if (SevEsWorkArea != NULL && SevEsWorkArea->EncryptionMask != 0) { - // - // The MSR has been read before, so it is safe to read it again and avoid -@@ -115,7 +162,14 @@ MemEncryptSevGetEncryptionMask ( - SEC_SEV_ES_WORK_AREA *SevEsWorkArea; - UINT64 EncryptionMask; - -- SevEsWorkArea = (SEC_SEV_ES_WORK_AREA *) FixedPcdGet32 (PcdSevEsWorkAreaBase); -+ // -+ // Before accessing the Es workarea lets verify that its SEV guest -+ // -+ if (!IsSevGuest()) { -+ return 0; -+ } -+ -+ SevEsWorkArea = GetSevEsWorkArea (); - if (SevEsWorkArea != NULL) { - EncryptionMask = SevEsWorkArea->EncryptionMask; - } else { --- -2.33.1 - diff --git a/edk2.spec b/edk2.spec index 8435e86..17f8e0c 100644 --- a/edk2.spec +++ b/edk2.spec @@ -12,9 +12,9 @@ ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ExclusiveArch: x86_64 aarch64 %endif -# edk2-stable202111 -%define GITDATE 20211126 -%define GITCOMMIT bb1bba3d7767 +# edk2-stable202202 +%define GITDATE 20220221 +%define GITCOMMIT b24306f15daa %define TOOLCHAIN GCC5 %define OPENSSL_VER 1.1.1k @@ -83,31 +83,27 @@ Source58: edk2-ovmf-nosb.json Source59: 70-edk2-arm-verbose.json Source60: edk2-microvm.json -Patch0008: 0008-BaseTools-do-not-build-BrotliCompress-RH-only.patch -Patch0009: 0009-MdeModulePkg-remove-package-private-Brotli-include-p.patch -Patch0011: 0011-OvmfPkg-increase-max-debug-message-length-to-512-RHE.patch -Patch0012: 0012-MdeModulePkg-TerminalDxe-add-other-text-resolutions-.patch -Patch0013: 0013-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch -Patch0014: 0014-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch -Patch0015: 0015-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch -Patch0016: 0016-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch -Patch0017: 0017-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch -Patch0018: 0018-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch -Patch0019: 0019-ArmVirtPkg-set-early-hello-message-RH-only.patch -Patch0020: 0020-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch -Patch0021: 0021-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch -Patch0022: 0022-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch -Patch0023: 0023-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch -Patch0024: 0024-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch -Patch0025: 0025-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch -Patch0026: 0026-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch -Patch0027: 0027-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch -Patch0028: 0028-OvmfPkg-MemEncryptSevLib-Check-the-guest-type-before.patch -Patch0029: 0029-OvmfPkg-Microvm-take-PcdResizeXterm-from-the-QEMU-co.patch - -# Fedora specific -Patch1000: fedora-Tweak-the-tools_def-to-support-cross-compiling.patch - +Patch0001: 0001-BaseTools-do-not-build-BrotliCompress-RH-only.patch +Patch0002: 0002-MdeModulePkg-remove-package-private-Brotli-include-p.patch +Patch0003: 0003-OvmfPkg-increase-max-debug-message-length-to-512-RHE.patch +Patch0004: 0004-MdeModulePkg-TerminalDxe-add-other-text-resolutions-.patch +Patch0005: 0005-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch +Patch0006: 0006-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch +Patch0007: 0007-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch +Patch0008: 0008-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch +Patch0009: 0009-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch +Patch0010: 0010-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch +Patch0011: 0011-ArmVirtPkg-set-early-hello-message-RH-only.patch +Patch0012: 0012-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch +Patch0013: 0013-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch +Patch0014: 0014-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch +Patch0015: 0015-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch +Patch0016: 0016-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch +Patch0017: 0017-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch +Patch0018: 0018-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch +Patch0019: 0019-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch +Patch0020: 0020-OvmfPkg-Microvm-take-PcdResizeXterm-from-the-QEMU-co.patch +Patch0021: 0021-Tweak-the-tools_def-to-support-cross-compiling.patch # python3-devel and libuuid-devel are required for building tools. # python3-devel is also needed for varstore template generation and @@ -761,6 +757,9 @@ KERNEL_IMG=$(rpm -q -l $KERNEL_PKG | egrep '^/lib/modules/[^/]+/vmlinuz$') %changelog +* Wed Mar 23 2022 Gerd Hoffmann - 20220221gitb24306f15daa-1 +- Update to edk2-stable202202 + * Thu Jan 20 2022 Fedora Release Engineering - 20211126gitbb1bba3d7767-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index ee8fe13..5601f16 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (softfloat-20180726-gitb64af41.tar.xz) = f079debd1bfcc0fe64329a8947b0689ef49246793edcdd28a2879f6550c652b0cf0f53ac4f6f5ab61ac4f7933972e0019d0ab63eb9931b6884c2909f3a5ead30 SHA512 (openssl-rhel-bdd048e929dcfcf2f046d74e812e0e3d5fc58504.tar.xz) = d6c0be28cefaa7993f479aecf45f5523e10aab388a92c3e4add55d6ff8483cc01fba367be62f6e9a23bfad7b46986befd3eca0d0e89b984049719645e37d52df -SHA512 (edk2-bb1bba3d7767.tar.xz) = 069227bdc24e5d19874e37fec75b1147c050679e6c21721f2137f3adcf49e07c003af2c27b954708b7e61b4d55ba7d1ce69ce9ffddefc706490b7ea678cfe335 +SHA512 (edk2-b24306f15daa.tar.xz) = f05b558818b873ac65804b9d57f32f3ecbe2d1a450acad15ec34a083c600374f01ed1f874055dbef7aa95c6b22639552cc2d01e915d8016d5aa9437bde10c6b6