efi_loader: efi_smbios_register should have a return value

Errors may occur inside efi_smbios_register().

- Return a status code.
- Remove unused variables.
- Use constants where applicable.

Suggested-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Alexander Graf <agraf@suse.de>

diff --git a/include/efi_loader.h b/include/efi_loader.h
index 39d02669524d65478542c25e0d2ebff99af3e6a6..c686cd3b02b205595794a4e2de85d304a73709de 100644 (file)
--- a/include/efi_loader.h
+++ b/include/efi_loader.h
@@ -189,7 +189,7 @@ int efi_net_register(void);
 /* Called by bootefi to make the watchdog available */
 int efi_watchdog_register(void);
 /* Called by bootefi to make SMBIOS tables available */
-void efi_smbios_register(void);
+efi_status_t efi_smbios_register(void);
 
 struct efi_simple_file_system_protocol *
 efi_fs_from_path(struct efi_device_path *fp);

diff --git a/lib/efi_loader/efi_smbios.c b/lib/efi_loader/efi_smbios.c
index ac412e7362a95e8fb62eb86cf67d53a38df6bc12..62e96979021d51c5b8e9488a107411a40f3ab662 100644 (file)
--- a/lib/efi_loader/efi_smbios.c
+++ b/lib/efi_loader/efi_smbios.c
@@ -13,20 +13,27 @@
 
 static const efi_guid_t smbios_guid = SMBIOS_TABLE_GUID;
 
-void efi_smbios_register(void)
+/*
+ * Install the SMBIOS table as a configuration table.
+ *
+ * @return     status code
+ */
+efi_status_t efi_smbios_register(void)
 {
        /* Map within the low 32 bits, to allow for 32bit SMBIOS tables */
-       uint64_t dmi = 0xffffffff;
-       /* Reserve 4kb for SMBIOS */
-       uint64_t pages = 1;
-       int memtype = EFI_RUNTIME_SERVICES_DATA;
+       u64 dmi = U32_MAX;
+       efi_status_t ret;
 
-       if (efi_allocate_pages(1, memtype, pages, &dmi) != EFI_SUCCESS)
-               return;
+       /* 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;
 
        /* Generate SMBIOS tables */
        write_smbios_table(dmi);
 
        /* And expose them to our EFI payload */
-       efi_install_configuration_table(&smbios_guid, (void*)(uintptr_t)dmi);
+       return efi_install_configuration_table(&smbios_guid,
+                                              (void *)(uintptr_t)dmi);
 }