From: Greg Kroah-Hartman Date: Tue, 22 Apr 2025 08:06:22 +0000 (+0200) Subject: 6.12-stable patches X-Git-Tag: v6.1.135~83 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=76701d0877ed840304cfce9223afa5d141d60385;p=thirdparty%2Fkernel%2Fstable-queue.git 6.12-stable patches added patches: efi-libstub-bump-up-efi_mmap_nr_slack_slots-to-32.patch --- diff --git a/queue-6.12/efi-libstub-bump-up-efi_mmap_nr_slack_slots-to-32.patch b/queue-6.12/efi-libstub-bump-up-efi_mmap_nr_slack_slots-to-32.patch new file mode 100644 index 0000000000..6f26baada5 --- /dev/null +++ b/queue-6.12/efi-libstub-bump-up-efi_mmap_nr_slack_slots-to-32.patch @@ -0,0 +1,35 @@ +From ec4696925da6b9baec38345184403ce9e29a2e48 Mon Sep 17 00:00:00 2001 +From: Hamza Mahfooz +Date: Mon, 9 Dec 2024 13:20:39 -0500 +Subject: efi/libstub: Bump up EFI_MMAP_NR_SLACK_SLOTS to 32 + +From: Hamza Mahfooz + +commit ec4696925da6b9baec38345184403ce9e29a2e48 upstream. + +Recent platforms require more slack slots than the current value of +EFI_MMAP_NR_SLACK_SLOTS, otherwise they fail to boot. The current +workaround is to append `efi=disable_early_pci_dma` to the kernel's +cmdline. So, bump up EFI_MMAP_NR_SLACK_SLOTS to 32 to allow those +platforms to boot with the aforementioned workaround. + +Signed-off-by: Hamza Mahfooz +Acked-by: Ard Biesheuvel +Reviewed-by: Allen Pais +Signed-off-by: Ard Biesheuvel +Signed-off-by: Greg Kroah-Hartman +--- + drivers/firmware/efi/libstub/efistub.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/firmware/efi/libstub/efistub.h ++++ b/drivers/firmware/efi/libstub/efistub.h +@@ -171,7 +171,7 @@ void efi_set_u64_split(u64 data, u32 *lo + * the EFI memory map. Other related structures, e.g. x86 e820ext, need + * to factor in this headroom requirement as well. + */ +-#define EFI_MMAP_NR_SLACK_SLOTS 8 ++#define EFI_MMAP_NR_SLACK_SLOTS 32 + + typedef struct efi_generic_dev_path efi_device_path_protocol_t; + diff --git a/queue-6.12/series b/queue-6.12/series index e7cf1389fb..7eb646d486 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -199,3 +199,4 @@ md-fix-mddev-uaf-while-iterating-all_mddevs-list.patch selftests-bpf-fix-raw_tp-null-handling-test.patch misc-pci_endpoint_test-avoid-issue-of-interrupts-remaining-after-request_irq-error.patch misc-pci_endpoint_test-fix-irq_type-to-convey-the-correct-type.patch +efi-libstub-bump-up-efi_mmap_nr_slack_slots-to-32.patch