qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

efi_loader: Improve install_configuration_table 

The INSTALL_CONFIGURATION_TABLE callback also provides the ability to
remove table entries. This patch adds that functionality.

Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Alexander Graf 2017-07-26 13:41:04 +02:00
parent 3304990ba4
commit d98cdf6a92
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/efi_loader/efi_boottime.c
View File

@ -630,6 +630,17 @@ static efi_status_t EFIAPI efi_locate_device_path(efi_guid_t *protocol,
return EFI_EXIT(EFI_NOT_FOUND); return EFI_EXIT(EFI_NOT_FOUND);
} }
/* Collapses configuration table entries, removing index i */
static void efi_remove_configuration_table(int i)
{
struct efi_configuration_table *this = &efi_conf_table[i];
struct efi_configuration_table *next = &efi_conf_table[i+1];
struct efi_configuration_table *end = &efi_conf_table[systab.nr_tables];
memmove(this, next, (ulong)end - (ulong)next);
systab.nr_tables--;
}
efi_status_t efi_install_configuration_table(const efi_guid_t *guid, void *table) efi_status_t efi_install_configuration_table(const efi_guid_t *guid, void *table)
{ {
int i; int i;
@ -637,11 +648,17 @@ efi_status_t efi_install_configuration_table(const efi_guid_t *guid, void *table
/* Check for guid override */ /* Check for guid override */
for (i = 0; i < systab.nr_tables; i++) { for (i = 0; i < systab.nr_tables; i++) {
if (!guidcmp(guid, &efi_conf_table[i].guid)) { if (!guidcmp(guid, &efi_conf_table[i].guid)) {
if (table)
efi_conf_table[i].table = table; efi_conf_table[i].table = table;
else
efi_remove_configuration_table(i);
return EFI_SUCCESS; return EFI_SUCCESS;
} }
} }
if (!table)
return EFI_NOT_FOUND;
/* No override, check for overflow */ /* No override, check for overflow */
if (i >= ARRAY_SIZE(efi_conf_table)) if (i >= ARRAY_SIZE(efi_conf_table))
return EFI_OUT_OF_RESOURCES; return EFI_OUT_OF_RESOURCES;