diff --git a/0306-Correction-in-vector-5-values.patch b/0306-Correction-in-vector-5-values.patch deleted file mode 100644 index 54dfc3d..0000000 --- a/0306-Correction-in-vector-5-values.patch +++ /dev/null @@ -1,31 +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) ---- - 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/0307-ppc64le-signed-boot-media-changes.patch b/0306-ppc64le-signed-boot-media-changes.patch similarity index 100% rename from 0307-ppc64le-signed-boot-media-changes.patch rename to 0306-ppc64le-signed-boot-media-changes.patch diff --git a/0308-mm-Clarify-grub_real_malloc.patch b/0307-mm-Clarify-grub_real_malloc.patch similarity index 100% rename from 0308-mm-Clarify-grub_real_malloc.patch rename to 0307-mm-Clarify-grub_real_malloc.patch diff --git a/0309-mm-grub_real_malloc-Make-small-allocs-comment-match-.patch b/0308-mm-grub_real_malloc-Make-small-allocs-comment-match-.patch similarity index 100% rename from 0309-mm-grub_real_malloc-Make-small-allocs-comment-match-.patch rename to 0308-mm-grub_real_malloc-Make-small-allocs-comment-match-.patch diff --git a/0310-mm-Document-grub_free.patch b/0309-mm-Document-grub_free.patch similarity index 100% rename from 0310-mm-Document-grub_free.patch rename to 0309-mm-Document-grub_free.patch diff --git a/0311-mm-Document-grub_mm_init_region.patch b/0310-mm-Document-grub_mm_init_region.patch similarity index 100% rename from 0311-mm-Document-grub_mm_init_region.patch rename to 0310-mm-Document-grub_mm_init_region.patch diff --git a/0312-mm-Document-GRUB-internal-memory-management-structur.patch b/0311-mm-Document-GRUB-internal-memory-management-structur.patch similarity index 100% rename from 0312-mm-Document-GRUB-internal-memory-management-structur.patch rename to 0311-mm-Document-GRUB-internal-memory-management-structur.patch diff --git a/0313-mm-Assert-that-we-preserve-header-vs-region-alignmen.patch b/0312-mm-Assert-that-we-preserve-header-vs-region-alignmen.patch similarity index 100% rename from 0313-mm-Assert-that-we-preserve-header-vs-region-alignmen.patch rename to 0312-mm-Assert-that-we-preserve-header-vs-region-alignmen.patch diff --git a/0314-mm-When-adding-a-region-merge-with-region-after-as-w.patch b/0313-mm-When-adding-a-region-merge-with-region-after-as-w.patch similarity index 100% rename from 0314-mm-When-adding-a-region-merge-with-region-after-as-w.patch rename to 0313-mm-When-adding-a-region-merge-with-region-after-as-w.patch diff --git a/0315-mm-Debug-support-for-region-operations.patch b/0314-mm-Debug-support-for-region-operations.patch similarity index 100% rename from 0315-mm-Debug-support-for-region-operations.patch rename to 0314-mm-Debug-support-for-region-operations.patch diff --git a/0316-mm-Drop-unused-unloading-of-modules-on-OOM.patch b/0315-mm-Drop-unused-unloading-of-modules-on-OOM.patch similarity index 100% rename from 0316-mm-Drop-unused-unloading-of-modules-on-OOM.patch rename to 0315-mm-Drop-unused-unloading-of-modules-on-OOM.patch diff --git a/0317-mm-Allow-dynamically-requesting-additional-memory-re.patch b/0316-mm-Allow-dynamically-requesting-additional-memory-re.patch similarity index 100% rename from 0317-mm-Allow-dynamically-requesting-additional-memory-re.patch rename to 0316-mm-Allow-dynamically-requesting-additional-memory-re.patch diff --git a/0318-kern-efi-mm-Always-request-a-fixed-number-of-pages-o.patch b/0317-kern-efi-mm-Always-request-a-fixed-number-of-pages-o.patch similarity index 100% rename from 0318-kern-efi-mm-Always-request-a-fixed-number-of-pages-o.patch rename to 0317-kern-efi-mm-Always-request-a-fixed-number-of-pages-o.patch diff --git a/0319-kern-efi-mm-Extract-function-to-add-memory-regions.patch b/0318-kern-efi-mm-Extract-function-to-add-memory-regions.patch similarity index 100% rename from 0319-kern-efi-mm-Extract-function-to-add-memory-regions.patch rename to 0318-kern-efi-mm-Extract-function-to-add-memory-regions.patch diff --git a/0320-kern-efi-mm-Pass-up-errors-from-add_memory_regions.patch b/0319-kern-efi-mm-Pass-up-errors-from-add_memory_regions.patch similarity index 100% rename from 0320-kern-efi-mm-Pass-up-errors-from-add_memory_regions.patch rename to 0319-kern-efi-mm-Pass-up-errors-from-add_memory_regions.patch diff --git a/0321-kern-efi-mm-Implement-runtime-addition-of-pages.patch b/0320-kern-efi-mm-Implement-runtime-addition-of-pages.patch similarity index 100% rename from 0321-kern-efi-mm-Implement-runtime-addition-of-pages.patch rename to 0320-kern-efi-mm-Implement-runtime-addition-of-pages.patch diff --git a/0322-efi-Increase-default-memory-allocation-to-32-MiB.patch b/0321-efi-Increase-default-memory-allocation-to-32-MiB.patch similarity index 100% rename from 0322-efi-Increase-default-memory-allocation-to-32-MiB.patch rename to 0321-efi-Increase-default-memory-allocation-to-32-MiB.patch diff --git a/0323-mm-Try-invalidate-disk-caches-last-when-out-of-memor.patch b/0322-mm-Try-invalidate-disk-caches-last-when-out-of-memor.patch similarity index 100% rename from 0323-mm-Try-invalidate-disk-caches-last-when-out-of-memor.patch rename to 0322-mm-Try-invalidate-disk-caches-last-when-out-of-memor.patch diff --git a/0323-Enable-shared-processor-mode-in-vector-5.patch b/0323-Enable-shared-processor-mode-in-vector-5.patch new file mode 100644 index 0000000..e92340a --- /dev/null +++ b/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 +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) +--- + 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 + } + }; + diff --git a/grub.patches b/grub.patches index 11b5828..f7d861d 100644 --- a/grub.patches +++ b/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 diff --git a/grub2.spec b/grub2.spec index 07f599e..eaa1578 100644 --- a/grub2.spec +++ b/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 - 2.06-58 +- ppc64le: cas5, take 3 +- Resolves: #2153071 + * Wed Feb 01 2023 Robbie Harwood - 2.06-57 - Pull in allocator fixes from upstream - Resolves: #2156419