git: 44aac9115f75 - stable/14 - powerpc: Bump maximum number of FDT reserved mem entries
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 02 Apr 2024 02:19:22 UTC
The branch stable/14 has been updated by jhibbits:
URL: https://cgit.FreeBSD.org/src/commit/?id=44aac9115f75fc98c955758c202e0025ae4a0876
commit 44aac9115f75fc98c955758c202e0025ae4a0876
Author: Shawn Anastasio <sanastasio@raptorengineering.com>
AuthorDate: 2024-02-27 19:40:50 +0000
Commit: Justin Hibbits <jhibbits@FreeBSD.org>
CommitDate: 2024-04-02 02:09:57 +0000
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
(cherry picked from commit b52dceb838116391996909ff50b49f950ee01f48)
---
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;