ppc64le: cas5, take 3

Resolves: #2153071
Signed-off-by: Robbie Harwood <rharwood@redhat.com>

0306-Correction-in-vector-5-values.patch

@@ -1,31 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Avnish Chouhan <avnish.chouhan@ibm.com>
-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 <avnish.chouhan@ibm.com>
-[rharwood: rewrap comit message]
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
-(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
-     }
-   };
- 

0323-Enable-shared-processor-mode-in-vector-5.patch

@@ -0,0 +1,27 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Avnish Chouhan <avnish@linux.vnet.ibm.com>
+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 <avnish@linux.vnet.ibm.com>
+(cherry picked from commit 30d2ee836649386a336f9437c8a149c8e642a46b)
+---
+ 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..7c8b6facec 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
++	0, 192, 0, 128, 0, 0, 0, 0, 256
+     }
+   };
+ 

grub.patches

@@ -303,21 +303,21 @@ Patch0302: 0302-font-Fix-an-integer-underflow-in-blit_comb.patch
 Patch0303: 0303-font-Harden-grub_font_blit_glyph-and-grub_font_blit_.patch
 Patch0304: 0304-font-Assign-null_font-to-glyphs-in-ascii_font_glyph.patch
 Patch0305: 0305-normal-charset-Fix-an-integer-overflow-in-grub_unico.patch
-Patch0306: 0306-Correction-in-vector-5-values.patch
-Patch0307: 0307-ppc64le-signed-boot-media-changes.patch
-Patch0308: 0308-mm-Clarify-grub_real_malloc.patch
-Patch0309: 0309-mm-grub_real_malloc-Make-small-allocs-comment-match-.patch
-Patch0310: 0310-mm-Document-grub_free.patch
-Patch0311: 0311-mm-Document-grub_mm_init_region.patch
-Patch0312: 0312-mm-Document-GRUB-internal-memory-management-structur.patch
-Patch0313: 0313-mm-Assert-that-we-preserve-header-vs-region-alignmen.patch
-Patch0314: 0314-mm-When-adding-a-region-merge-with-region-after-as-w.patch
-Patch0315: 0315-mm-Debug-support-for-region-operations.patch
-Patch0316: 0316-mm-Drop-unused-unloading-of-modules-on-OOM.patch
-Patch0317: 0317-mm-Allow-dynamically-requesting-additional-memory-re.patch
-Patch0318: 0318-kern-efi-mm-Always-request-a-fixed-number-of-pages-o.patch
-Patch0319: 0319-kern-efi-mm-Extract-function-to-add-memory-regions.patch
-Patch0320: 0320-kern-efi-mm-Pass-up-errors-from-add_memory_regions.patch
-Patch0321: 0321-kern-efi-mm-Implement-runtime-addition-of-pages.patch
-Patch0322: 0322-efi-Increase-default-memory-allocation-to-32-MiB.patch
-Patch0323: 0323-mm-Try-invalidate-disk-caches-last-when-out-of-memor.patch
+Patch0306: 0306-ppc64le-signed-boot-media-changes.patch
+Patch0307: 0307-mm-Clarify-grub_real_malloc.patch
+Patch0308: 0308-mm-grub_real_malloc-Make-small-allocs-comment-match-.patch
+Patch0309: 0309-mm-Document-grub_free.patch
+Patch0310: 0310-mm-Document-grub_mm_init_region.patch
+Patch0311: 0311-mm-Document-GRUB-internal-memory-management-structur.patch
+Patch0312: 0312-mm-Assert-that-we-preserve-header-vs-region-alignmen.patch
+Patch0313: 0313-mm-When-adding-a-region-merge-with-region-after-as-w.patch
+Patch0314: 0314-mm-Debug-support-for-region-operations.patch
+Patch0315: 0315-mm-Drop-unused-unloading-of-modules-on-OOM.patch
+Patch0316: 0316-mm-Allow-dynamically-requesting-additional-memory-re.patch
+Patch0317: 0317-kern-efi-mm-Always-request-a-fixed-number-of-pages-o.patch
+Patch0318: 0318-kern-efi-mm-Extract-function-to-add-memory-regions.patch
+Patch0319: 0319-kern-efi-mm-Pass-up-errors-from-add_memory_regions.patch
+Patch0320: 0320-kern-efi-mm-Implement-runtime-addition-of-pages.patch
+Patch0321: 0321-efi-Increase-default-memory-allocation-to-32-MiB.patch
+Patch0322: 0322-mm-Try-invalidate-disk-caches-last-when-out-of-memor.patch
+Patch0323: 0323-Enable-shared-processor-mode-in-vector-5.patch

grub2.spec

@@ -14,7 +14,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.06
-Release:	57%{?dist}
+Release:	58%{?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
+* Mon Feb 06 2023 Robbie Harwood <rharwood@redhat.com> - 2.06-58
+- ppc64le: cas5, take 3
+- Resolves: #2153071
+
 * Wed Feb 01 2023 Robbie Harwood <rharwood@redhat.com> - 2.06-57
 - Pull in allocator fixes from upstream
 - Resolves: #2156419