GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-06-21 22:21:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

x86: Show some EFI info with the bdinfo command

Browse source 
It is useful to see some basic EFI info with the command as it forms part
of the information about a board.

Add a hook for this and show the table address as a start.

While here, fix an invalid cast in setup_efi_info(). Note that this
function is using a data structure defined by Linux so we cannot change
it. Also note that ulong is used since this is the standard in U-Boot
(>6k uses), despite there being quite a bit of the more verbose uintptr_t
(930 uses).

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
Simon Glass 2021-09-24 18:30:21 -06:00 • committed by Heinrich Schuchardt
parent e70be676eb
commit 567dfef2fe
4 changed files with 41 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
arch/x86/cpu/efi/payload.c
View file

@ -280,15 +280,24 @@ void setup_efi_info(struct efi_info *efi_info)
}
efi_info->efi_memdesc_size = map->desc_size;
efi_info->efi_memdesc_version = map->version;
efi_info->efi_memmap = (u32)(map->desc);
efi_info->efi_memmap = (ulong)(map->desc);
efi_info->efi_memmap_size = size - sizeof(struct efi_entry_memmap);
#ifdef CONFIG_EFI_STUB_64BIT
efi_info->efi_systab_hi = table->sys_table >> 32;
efi_info->efi_memmap_hi = (u64)(u32)(map->desc) >> 32;
efi_info->efi_memmap_hi = (u64)(ulong)map->desc >> 32;
signature = EFI64_LOADER_SIGNATURE;
#else
signature = EFI32_LOADER_SIGNATURE;
#endif
memcpy(&efi_info->efi_loader_signature, signature, 4);
}
void efi_show_bdinfo(void)
{
struct efi_entry_systable *table = NULL;
int size, ret;
ret = efi_info_get(EFIET_SYS_TABLE, (void **)&table, &size);
bdinfo_print_num_l("efi_table", (ulong)table);
}

7
arch/x86/include/asm/efi.h
View file

@ -29,4 +29,11 @@ void setup_video(struct screen_info *screen_info);
*/
void setup_efi_info(struct efi_info *efi_info);
/**
* efi_show_bdinfo() - Show information about EFI for the 'bdinfo' command
*
* This looks up the EFI table pointer and shows related info
*/
void efi_show_bdinfo(void);
#endif

1
arch/x86/lib/Makefile
View file

@ -3,6 +3,7 @@
# (C) Copyright 2002-2006
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
obj-y += bdinfo.o
ifndef CONFIG_X86_64
ifndef CONFIG_TPL_BUILD
obj-y += bios.o

22
arch/x86/lib/bdinfo.c Normal file
View file

@ -0,0 +1,22 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* x86-specific information for the 'bd' command
*
* Copyright 2021 Google LLC
*/
#include <common.h>
#include <efi.h>
#include <init.h>
#include <asm/efi.h>
#include <asm/global_data.h>
DECLARE_GLOBAL_DATA_PTR;
void arch_print_bdinfo(void)
{
bdinfo_print_num_l("prev table", gd->arch.table);
if (IS_ENABLED(CONFIG_EFI_STUB))
efi_show_bdinfo();
}