Skip to content
Snippets Groups Projects
Commit 7657152b authored by Heinrich Schuchardt's avatar Heinrich Schuchardt Committed by Alexander Graf
Browse files

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: default avatarSimon Glass <sjg@chromium.org>
Signed-off-by: default avatarHeinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent 1914e5b5
No related branches found
No related tags found
No related merge requests found
...@@ -189,7 +189,7 @@ int efi_net_register(void); ...@@ -189,7 +189,7 @@ int efi_net_register(void);
/* Called by bootefi to make the watchdog available */ /* Called by bootefi to make the watchdog available */
int efi_watchdog_register(void); int efi_watchdog_register(void);
/* Called by bootefi to make SMBIOS tables available */ /* 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 * struct efi_simple_file_system_protocol *
efi_fs_from_path(struct efi_device_path *fp); efi_fs_from_path(struct efi_device_path *fp);
......
...@@ -13,20 +13,27 @@ ...@@ -13,20 +13,27 @@
static const efi_guid_t smbios_guid = SMBIOS_TABLE_GUID; 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 */ /* Map within the low 32 bits, to allow for 32bit SMBIOS tables */
uint64_t dmi = 0xffffffff; u64 dmi = U32_MAX;
/* Reserve 4kb for SMBIOS */ efi_status_t ret;
uint64_t pages = 1;
int memtype = EFI_RUNTIME_SERVICES_DATA;
if (efi_allocate_pages(1, memtype, pages, &dmi) != EFI_SUCCESS) /* Reserve 4kiB page for SMBIOS */
return; ret = efi_allocate_pages(EFI_ALLOCATE_MAX_ADDRESS,
EFI_RUNTIME_SERVICES_DATA, 1, &dmi);
if (ret != EFI_SUCCESS)
return ret;
/* Generate SMBIOS tables */ /* Generate SMBIOS tables */
write_smbios_table(dmi); write_smbios_table(dmi);
/* And expose them to our EFI payload */ /* 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);
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment