efi_loader: do not unnecessarily use EFI_CALL()

[oweals/u-boot.git] / lib / efi_loader / efi_smbios.c

diff --git a/lib/efi_loader/efi_smbios.c b/lib/efi_loader/efi_smbios.c
index 482436e2adb7c6469625238767eeb68176c0d178..a81488495e27f7f205a06719ea3d25abc6a6dbe5 100644 (file)
--- a/lib/efi_loader/efi_smbios.c
+++ b/lib/efi_loader/efi_smbios.c
@@ -7,7 +7,7 @@
 
 #include <common.h>
 #include <efi_loader.h>
-#include <inttypes.h>
+#include <mapmem.h>
 #include <smbios.h>
 
 static const efi_guid_t smbios_guid = SMBIOS_TABLE_GUID;
@@ -20,19 +20,36 @@ static const efi_guid_t smbios_guid = SMBIOS_TABLE_GUID;
 efi_status_t efi_smbios_register(void)
 {
        /* Map within the low 32 bits, to allow for 32bit SMBIOS tables */
-       u64 dmi = U32_MAX;
+       u64 dmi_addr = U32_MAX;
        efi_status_t ret;
+       void *dmi;
 
        /* Reserve 4kiB page for SMBIOS */
        ret = efi_allocate_pages(EFI_ALLOCATE_MAX_ADDRESS,
-                                EFI_RUNTIME_SERVICES_DATA, 1, &dmi);
-       if (ret != EFI_SUCCESS)
-               return ret;
+                                EFI_RUNTIME_SERVICES_DATA, 1, &dmi_addr);
 
-       /* Generate SMBIOS tables */
-       write_smbios_table(dmi);
+       if (ret != EFI_SUCCESS) {
+               /* Could not find space in lowmem, use highmem instead */
+               ret = efi_allocate_pages(EFI_ALLOCATE_ANY_PAGES,
+                                        EFI_RUNTIME_SERVICES_DATA, 1,
+                                        &dmi_addr);
+
+               if (ret != EFI_SUCCESS)
+                       return ret;
+       }
+
+       /*
+        * Generate SMBIOS tables - we know that efi_allocate_pages() returns
+        * a 4k-aligned address, so it is safe to assume that
+        * write_smbios_table() will write the table at that address.
+        *
+        * Note that on sandbox, efi_allocate_pages() unfortunately returns a
+        * pointer even though it uses a uint64_t type. Convert it.
+        */
+       assert(!(dmi_addr & 0xf));
+       dmi = (void *)(uintptr_t)dmi_addr;
+       write_smbios_table(map_to_sysmem(dmi));
 
        /* And expose them to our EFI payload */
-       return efi_install_configuration_table(&smbios_guid,
-                                              (void *)(uintptr_t)dmi);
+       return efi_install_configuration_table(&smbios_guid, dmi);
 }