Skip to contentSkip to conversation

arm/arm64: efi: Bump number of memregions

PATCH In review Andrew Jones 1 participant 2 messages Apr 8, 2025 KVM arm64

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm/arm64: efi: Bump number of memregions

When using QEMU's 'max' cpu type additional EFI memory regions are present. Just like riscv's commit f35fe0ee486a ("riscv: efi: Bump number of memregions"), bump the number we allow to ensure we don't hit the assert in memregions_add().

---
 lib/arm/setup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/arm/setup.c +1 -1
index aaa0da9804a2..67b5db07ba8f 100644
@@ -31,7 +31,7 @@
 #include "io.h"
 
 #define MAX_DT_MEM_REGIONS	16
-#define NR_EXTRA_MEM_REGIONS	64
+#define NR_EXTRA_MEM_REGIONS	128
 #define NR_MEM_REGIONS		(MAX_DT_MEM_REGIONS + NR_EXTRA_MEM_REGIONS)
 
 extern unsigned long _text, _etext, _data, _edata;
Signature · 1 line
2.49.0
#1 lore raw
Quoted 26 lines · Andrew Jones

When using QEMU's 'max' cpu type additional EFI memory regions are present. Just like riscv's commit f35fe0ee486a ("riscv: efi: Bump number of memregions"), bump the number we allow to ensure we don't hit the assert in memregions_add().

---
 lib/arm/setup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/arm/setup.c +1 -1
index aaa0da9804a2..67b5db07ba8f 100644
@@ -31,7 +31,7 @@
 #include "io.h"
 
 #define MAX_DT_MEM_REGIONS	16
-#define NR_EXTRA_MEM_REGIONS	64
+#define NR_EXTRA_MEM_REGIONS	128
 #define NR_MEM_REGIONS		(MAX_DT_MEM_REGIONS + NR_EXTRA_MEM_REGIONS)
 
 extern unsigned long _text, _etext, _data, _edata;
Signature · 1 line
2.49.0

Merged through arm/queue.

Thanks,
drew