From 640411d9177196eadb4eb76d19627d7e8483ca81 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Wed, 8 Feb 2023 14:14:07 +0000 Subject: [PATCH] import grub2-2.02-148.el8 --- .../0574-Correction-in-vector-5-values.patch | 32 ------------------- ...le-TDX-measurement-to-RTMR-register.patch} | 0 ...le-shared-processor-mode-in-vector-5.patch | 28 ++++++++++++++++ SOURCES/grub.patches | 4 +-- SPECS/grub2.spec | 6 +++- 5 files changed, 35 insertions(+), 35 deletions(-) delete mode 100644 SOURCES/0574-Correction-in-vector-5-values.patch rename SOURCES/{0575-Enable-TDX-measurement-to-RTMR-register.patch => 0574-Enable-TDX-measurement-to-RTMR-register.patch} (100%) create mode 100644 SOURCES/0575-Enable-shared-processor-mode-in-vector-5.patch diff --git a/SOURCES/0574-Correction-in-vector-5-values.patch b/SOURCES/0574-Correction-in-vector-5-values.patch deleted file mode 100644 index 5e9f581..0000000 --- a/SOURCES/0574-Correction-in-vector-5-values.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Avnish Chouhan -Date: Tue, 22 Nov 2022 08:01:47 -0500 -Subject: [PATCH] Correction in vector 5 values - -This patch is to update the vector 5 values which is troubling some -machines to bootup properly. Max out the values of all the properties of -Vector 5 (similar to vector 2) except max cpu property, which were set -as 0 earlier. - -Signed-off-by: Avnish Chouhan -[rharwood: rewrap comit message] -Signed-off-by: Robbie Harwood -(cherry picked from commit c2e640266247e3e0d3268f5ef20a734f5800f577) -(cherry picked from commit 6cb67ffc4beda2dcbaa93fa1fdd79b108f248a30) ---- - grub-core/kern/ieee1275/init.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c -index 37f3098c39..11bd102d02 100644 ---- a/grub-core/kern/ieee1275/init.c -+++ b/grub-core/kern/ieee1275/init.c -@@ -372,7 +372,7 @@ grub_ieee1275_ibm_cas (void) - .vec4 = 0x0001, // set required minimum capacity % to the lowest value - .vec5_size = 1 + sizeof(struct option_vector5) - 2, - .vec5 = { -- 0, 0, 0, 0, 0, 0, 0, 0, 256 -+ -1, -1, -1, -1, -1, -1, -1, -1, 256 - } - }; - diff --git a/SOURCES/0575-Enable-TDX-measurement-to-RTMR-register.patch b/SOURCES/0574-Enable-TDX-measurement-to-RTMR-register.patch similarity index 100% rename from SOURCES/0575-Enable-TDX-measurement-to-RTMR-register.patch rename to SOURCES/0574-Enable-TDX-measurement-to-RTMR-register.patch diff --git a/SOURCES/0575-Enable-shared-processor-mode-in-vector-5.patch b/SOURCES/0575-Enable-shared-processor-mode-in-vector-5.patch new file mode 100644 index 0000000..b7563d7 --- /dev/null +++ b/SOURCES/0575-Enable-shared-processor-mode-in-vector-5.patch @@ -0,0 +1,28 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Avnish Chouhan +Date: Tue, 24 Jan 2023 08:01:47 -0500 +Subject: [PATCH] Enable shared processor mode in vector 5 + +This patch is to update the vector 5 which is troubling some +machines to bootup properly in shared processor mode. + +Signed-off-by: Avnish Chouhan +(cherry picked from commit 30d2ee836649386a336f9437c8a149c8e642a46b) +(cherry picked from commit 7e309d139c5eca1f03659e612a14499213e79c95) +--- + grub-core/kern/ieee1275/init.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c +index 37f3098c39..3ea9b73b2a 100644 +--- a/grub-core/kern/ieee1275/init.c ++++ b/grub-core/kern/ieee1275/init.c +@@ -372,7 +372,7 @@ grub_ieee1275_ibm_cas (void) + .vec4 = 0x0001, // set required minimum capacity % to the lowest value + .vec5_size = 1 + sizeof(struct option_vector5) - 2, + .vec5 = { +- 0, 0, 0, 0, 0, 0, 0, 0, 256 ++ 0, 192, 0, 128, 0, 0, 0, 0, 256 + } + }; + diff --git a/SOURCES/grub.patches b/SOURCES/grub.patches index 3bb2f5d..3eacbac 100644 --- a/SOURCES/grub.patches +++ b/SOURCES/grub.patches @@ -571,5 +571,5 @@ Patch0570: 0570-font-Fix-an-integer-underflow-in-blit_comb.patch Patch0571: 0571-font-Harden-grub_font_blit_glyph-and-grub_font_blit_.patch Patch0572: 0572-font-Assign-null_font-to-glyphs-in-ascii_font_glyph.patch Patch0573: 0573-normal-charset-Fix-an-integer-overflow-in-grub_unico.patch -Patch0574: 0574-Correction-in-vector-5-values.patch -Patch0575: 0575-Enable-TDX-measurement-to-RTMR-register.patch +Patch0574: 0574-Enable-TDX-measurement-to-RTMR-register.patch +Patch0575: 0575-Enable-shared-processor-mode-in-vector-5.patch diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec index 6dde9f3..64bb124 100644 --- a/SPECS/grub2.spec +++ b/SPECS/grub2.spec @@ -7,7 +7,7 @@ Name: grub2 Epoch: 1 Version: 2.02 -Release: 147%{?dist} +Release: 148%{?dist} Summary: Bootloader with support for Linux, Multiboot and more Group: System Environment/Base License: GPLv3+ @@ -510,6 +510,10 @@ fi %endif %changelog +* Mon Feb 06 2023 Robbie Harwood - 2.02-148 +- ppc64le: cas5, take 3 +- Resolves: #2139508 + * Tue Jan 10 2023 Robbie Harwood - 2.02-147 - Enable TDX measurement to RTMR register - Resolves: #1981485