Re: [U-Boot] [PATCH v2 1/1] efi_loader: efi_smbios_register should have a return value

[Alexander Graf]

On 31.01.18 00:19, Heinrich Schuchardt wrote:
> Errors may occur inside efi_smbios_register().
> 
> - Return a status code.
> - Remove unused variables.
> - Use constants where applicable.
> 
> Suggested-by: Simon Glass 
> Signed-off-by: Heinrich Schuchardt 
> ---
> v2
>   remove a change in unrelated code

Ah, I should've read v2 first :)


Alex
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

[U-Boot] [PATCH v2 1/1] efi_loader: efi_smbios_register should have a return value

[Heinrich Schuchardt]

Errors may occur inside efi_smbios_register().

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

Suggested-by: Simon Glass 
Signed-off-by: Heinrich Schuchardt 
---
v2
remove a change in unrelated code
---
 include/efi_loader.h|  2 +-
 lib/efi_loader/efi_smbios.c | 23 +++
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/include/efi_loader.h b/include/efi_loader.h
index 21c03c5c28..eb86853924 100644
--- a/include/efi_loader.h
+++ b/include/efi_loader.h
@@ -185,7 +185,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 ac412e7362..9ff7651683 100644
--- 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 = 0x;
-   /* 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, ) != EFI_SUCCESS)
-   return;
+   /* Reserve 4kiB page for SMBIOS */
+   ret = efi_allocate_pages(EFI_ALLOCATE_MAX_ADDRESS,
+EFI_RUNTIME_SERVICES_DATA, 1, );
+   if (ret != EFI_SUCCESS)
+   return ret;
 
/* Generate SMBIOS tables */
write_smbios_table(dmi);
 
/* And expose them to our EFI payload */
-   efi_install_configuration_table(_guid, (void*)(uintptr_t)dmi);
+   return efi_install_configuration_table(_guid,
+  (void *)(uintptr_t)dmi);
 }
-- 
2.15.1

___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot