From b52dceb838116391996909ff50b49f950ee01f48 Mon Sep 17 00:00:00 2001 From: Shawn Anastasio Date: Tue, 27 Feb 2024 14:40:50 -0500 Subject: [PATCH] powerpc: Bump maximum number of FDT reserved mem entries Newer firmware on POWER systems, including v2.10 of the Talos II and Blackbird firmware can end up reserving more than 32 memory regions in the device tree, which exceeded an assumption made by ofw_machdep.c's excise_fdt_reserved(). Bump the maximum number of FDT reservations to the next power of 2 in order to fix booting on newer firmware. PR: 277097 Reviewed by: jhibbits Differential Revision: https://reviews.freebsd.org/D44015 --- sys/powerpc/ofw/ofw_machdep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/powerpc/ofw/ofw_machdep.c b/sys/powerpc/ofw/ofw_machdep.c index f850efa6c713..6d7b0b01fc84 100644 --- a/sys/powerpc/ofw/ofw_machdep.c +++ b/sys/powerpc/ofw/ofw_machdep.c @@ -426,7 +426,7 @@ excise_msi_region(struct mem_region *avail, int asz) static int excise_fdt_reserved(struct mem_region *avail, int asz) { - struct mem_region fdtmap[32]; + struct mem_region fdtmap[64]; ssize_t fdtmapsize; phandle_t chosen; int j, fdtentries;