mm/efi: Fix issue where in-use bootloader memory may be erroneously allocated

common/lib/blib.c

@@ -213,8 +213,6 @@ retry:
 
     asm volatile ("cli" ::: "memory");
 
-    pmm_reclaim_uefi_mem();
-
     // Go through new EFI memmap and free up bootloader entries
     size_t entry_count = efi_mmap_size / efi_desc_size;
 

common/mm/pmm.s2.c

@@ -226,6 +226,9 @@ del_mm1:
 }
 
 struct e820_entry_t *get_memmap(size_t *entries) {
+#if uefi == 1
+    pmm_reclaim_uefi_mem();
+#endif
     sanitise_entries(memmap, &memmap_entries, true);
 
     *entries = memmap_entries;