From 1395eb50d11c63faa056c0071b0c8373513ac29e Mon Sep 17 00:00:00 2001 From: Robbie Harwood Date: Wed, 14 Dec 2022 19:37:46 +0000 Subject: [PATCH] ppc64le: fix lpar cas5 Resolves: #2153071 Signed-off-by: Robbie Harwood --- 0307-Correction-in-vector-5-values.patch | 31 ++++++++++++++++++++++++ grub.patches | 1 + grub2.spec | 6 ++++- 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 0307-Correction-in-vector-5-values.patch diff --git a/0307-Correction-in-vector-5-values.patch b/0307-Correction-in-vector-5-values.patch new file mode 100644 index 0000000..54dfc3d --- /dev/null +++ b/0307-Correction-in-vector-5-values.patch @@ -0,0 +1,31 @@ +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) +--- + 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 6a51c9efab..28a3bd4621 100644 +--- a/grub-core/kern/ieee1275/init.c ++++ b/grub-core/kern/ieee1275/init.c +@@ -376,7 +376,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/grub.patches b/grub.patches index e38c069..6b8adf0 100644 --- a/grub.patches +++ b/grub.patches @@ -304,3 +304,4 @@ Patch0303: 0303-font-Fix-an-integer-underflow-in-blit_comb.patch Patch0304: 0304-font-Harden-grub_font_blit_glyph-and-grub_font_blit_.patch Patch0305: 0305-font-Assign-null_font-to-glyphs-in-ascii_font_glyph.patch Patch0306: 0306-normal-charset-Fix-an-integer-overflow-in-grub_unico.patch +Patch0307: 0307-Correction-in-vector-5-values.patch diff --git a/grub2.spec b/grub2.spec index 2cf46fc..2c5dbb8 100644 --- a/grub2.spec +++ b/grub2.spec @@ -14,7 +14,7 @@ Name: grub2 Epoch: 1 Version: 2.06 -Release: 51%{?dist} +Release: 52%{?dist} Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -532,6 +532,10 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg %endif %changelog +* Wed Dec 14 2022 Robbie Harwood - 2.06-52 +- ppc64le: fix lpar cas5 +- Resolves: #2153071 + * Mon Nov 21 2022 Robbie Harwood - 1:2.06-51 - Bless the ofnet module down in ppc64le - Resolves: #2143420