This is also handy for debugging. Signed-off-by: Daniel Axtens <d...@axtens.net> --- grub-core/kern/ieee1275/init.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c index 0fb7bae280df..f70cb134178b 100644 --- a/grub-core/kern/ieee1275/init.c +++ b/grub-core/kern/ieee1275/init.c @@ -243,6 +243,7 @@ regions_claim (grub_uint64_t addr, grub_uint64_t len, grub_memory_type_t type, */ if (rmo_top > RUNTIME_MIN_SPACE) { + grub_printf ("was %llx - %llx, ", addr, addr + len); linux_rmo_save = grub_min (0x30000000, rmo_top) - RUNTIME_MIN_SPACE; if ((addr < linux_rmo_save) && ((addr + len) > linux_rmo_save)) len = linux_rmo_save - addr; @@ -253,6 +254,7 @@ regions_claim (grub_uint64_t addr, grub_uint64_t len, grub_memory_type_t type, addr = 0x30000000; len -= RUNTIME_MIN_SPACE; } + grub_printf ("now %llx - %llx (vs %x)\n", addr, addr + len, linux_rmo_save); } if (flags & GRUB_MM_ADD_REGION_CONSECUTIVE) @@ -315,7 +317,12 @@ static grub_err_t grub_ieee1275_mm_add_region (grub_size_t size, unsigned int fl /* Ensure we leave enough space to boot (be careful of underflow here) */ if (free_memory <= RUNTIME_MIN_SPACE) - return GRUB_ERR_OUT_OF_MEMORY; + { + grub_printf ("Giving up, already at/over limit\n"); + return GRUB_ERR_OUT_OF_MEMORY; + } + + grub_printf ("ieee1275: free = 0x%x, allocated = 0x%x\n", free_memory, allocated_memory); if (size > free_memory - RUNTIME_MIN_SPACE) return GRUB_ERR_OUT_OF_MEMORY; @@ -324,8 +331,10 @@ static grub_err_t grub_ieee1275_mm_add_region (grub_size_t size, unsigned int fl total = grub_max(ALIGN_UP(size, 1024 * 1024) + 1024 * 1024, 32 * 1024 * 1024); total = grub_min(free_memory - RUNTIME_MIN_SPACE, total); } + grub_printf ("ieee1275: looking for %x bytes of memory (%x requested)\n", total, size); grub_machine_mmap_iterate (region_claim, &total); + grub_printf ("ieee1275: get memory from fw %s\n", total == 0 ? "succeeded" : "failed"); } else grub_machine_mmap_iterate (heap_init, &total); -- 2.30.2 _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel