[kvm-unit-tests PATCH] riscv: efi: Bump number of memregions

Andrew Jones andrew.jones at linux.dev
Wed Jan 29 08:51:32 PST 2025


There may be a bunch of EFI memory regions in the EFI memory map,
which we convert to k-u-t memregions. Bump the number we allow to
ensure we don't hit the assert in memregions_add().

Signed-off-by: Andrew Jones <andrew.jones at linux.dev>
---

I noticed that the gitlab CI started failing the riscv EFI tests. It
looks like the edk2 used by CI has been updated to a version later than
what I was using locally and the newer one has several more memory
regions.

 lib/riscv/setup.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/riscv/setup.c b/lib/riscv/setup.c
index 211945448b0f..a30aa0c4cb80 100644
--- a/lib/riscv/setup.c
+++ b/lib/riscv/setup.c
@@ -31,7 +31,11 @@
 #endif
 
 #define MAX_DT_MEM_REGIONS	16
+#ifdef CONFIG_EFI
+#define NR_MEM_REGIONS		(MAX_DT_MEM_REGIONS + 128)
+#else
 #define NR_MEM_REGIONS		(MAX_DT_MEM_REGIONS + 16)
+#endif
 
 extern unsigned long _etext;
 
-- 
2.48.1




More information about the kvm-riscv mailing list