x86: efi: Show the system-table revision

Show the revision of this table as it can be important.

Also update the 'efi table' entry to show the actual address of the EFI
table rather than our table that points to it. This saves a step and the
intermediate table has nothing else in it.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>

diff --git a/arch/x86/cpu/efi/payload.c b/arch/x86/cpu/efi/payload.c
index 3a9f7d72868863c73c967f7107742f0972cc5b46..04ce1880b4debfba202938a2bca2518d2bbb573d 100644 (file)
--- a/arch/x86/cpu/efi/payload.c
+++ b/arch/x86/cpu/efi/payload.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <efi.h>
+#include <efi_api.h>
 #include <errno.h>
 #include <init.h>
 #include <log.h>
@@ -296,8 +297,14 @@ void setup_efi_info(struct efi_info *efi_info)
 void efi_show_bdinfo(void)
 {
        struct efi_entry_systable *table = NULL;
+       struct efi_system_table *sys_table;
        int size, ret;
 
        ret = efi_info_get(EFIET_SYS_TABLE, (void **)&table, &size);
-       bdinfo_print_num_l("efi_table", (ulong)table);
+       if (!ret) {
+               bdinfo_print_num_l("efi_table", table->sys_table);
+               sys_table = (struct efi_system_table *)(uintptr_t)
+                       table->sys_table;
+               bdinfo_print_num_l(" revision", sys_table->fw_revision);
+       }
 }