[U-Boot] [PATCH v3 8/8] efi_loader: Capture efi_add_memory_map() result efi_add_runtime_mmio()

Bryan O'Donoghue pure.logic at nexus-software.ie
Sun Jul 14 23:01:08 UTC 2019


efi_add_runtime_mmio() does an efi_add_memory_map() call. We have recently
changed the return value of efi_add_memory_map() to return an efi_status_t
code.

This patch captures the result code of efi_add_memory_map() and if that
result code is not EFI_SUCCESS returns EFI_OUT_OF_RESOURCES;

Signed-off-by: Bryan O'Donoghue <pure.logic at nexus-software.ie>
---
 lib/efi_loader/efi_runtime.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/efi_loader/efi_runtime.c b/lib/efi_loader/efi_runtime.c
index 40fdc0ea92..12ee6faadd 100644
--- a/lib/efi_loader/efi_runtime.c
+++ b/lib/efi_loader/efi_runtime.c
@@ -659,10 +659,10 @@ efi_status_t efi_add_runtime_mmio(void *mmio_ptr, u64 len)
 	struct efi_runtime_mmio_list *newmmio;
 	u64 pages = (len + EFI_PAGE_MASK) >> EFI_PAGE_SHIFT;
 	uint64_t addr = *(uintptr_t *)mmio_ptr;
-	uint64_t retaddr;
+	efi_status_t ret;
 
-	retaddr = efi_add_memory_map(addr, pages, EFI_MMAP_IO, false);
-	if (retaddr != addr)
+	ret = efi_add_memory_map(addr, pages, EFI_MMAP_IO, false);
+	if (ret != EFI_SUCCESS)
 		return EFI_OUT_OF_RESOURCES;
 
 	newmmio = calloc(1, sizeof(*newmmio));
-- 
2.22.0



More information about the U-Boot mailing list