leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pull request of efi-2022-10-rc4-2

Browse Source 
UEFI:
 * provide EFI Conformance Profile Table
 * fix display of NVMe EUI-64
 * fixes for Simple Text Input Ex Protocol
 * fix exception unit-test on non-x86 sandbox
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEbcT5xx8ppvoGt20zxIHbvCwFGsQFAmMTKL0ACgkQxIHbvCwF
 GsSv4RAAkgSZxo9o1pVMPpI/3EZ9OGRHIW0X5ya/6urKyKjHf61dhZRsYrvFO8zM
 JKatKLAgijnZmQaCH7oDu72+n9bdMau3ZnLP7DLp1BgCfcZZtwOA5NNzXuhm3wKG
 jhZg0CeSfKl07j4hGEqowTbcgZuqjlu2zGMvQlcDRTLH+fzTLJsXdrSx3AHVE25L
 OfTxe+8HaIDQFFXxIDerzYvN+SfULScTm/b5AyLqE5+qEFFZdlUFJoxdkLx2BCpB
 B2Xoj6yydy+QkQ/hUb8WGhI5ezOd/yHbKv351bAma3w1oi09tr/59Uyl2hCd/V5a
 TM55gnarC66b5QlvzSExOECXAeSy7NvngqYyFbgmRxzZ+yGKy/PQ33FZjOpOKVAk
 W0+vIGCY5g1t69/s7O3tXatYZmsSAuQ2Gvk6FkwCTeydRLjzkAOomzvnxzfdP5of
 UPi45X9fce7rAn3Z0jU+ufj8cpf4z823KkNXu9luBkmeVQphJo8MQSVWhdjU44Gg
 tj4OhOWKgEBwdb+ji8fgWhne/Mo59OF4Ba8WaKI4oyqnZpZvtJuxqnQIclM3yGrR
 sAPZMUJt9oNWV0nP61LH6i9LzfStMmka1JU1bz9tpXAuJuNRlt8gK1My//hDuDqe
 XZaMgS/h0CUNk305SAMzpKxFh6uJRjbDtxw67Ts5c7TeW4WER6I=
 =whvg
 -----END PGP SIGNATURE-----

Merge tag 'efi-2022-10-rc4-2' of https://source.denx.de/u-boot/custodians/u-boot-efi

Pull request of efi-2022-10-rc4-2

UEFI:
* provide EFI Conformance Profile Table
* fix display of NVMe EUI-64
* fixes for Simple Text Input Ex Protocol
* fix exception unit-test on non-x86 sandbox
This commit is contained in:
Tom Rini 2022-09-03 07:44:22 -04:00
commit 8710676635
11 changed files with 182 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/efi_api.h
View File

@ -226,6 +226,22 @@ enum efi_reset_type {
EFI_GUID(0x6dcbd5ed, 0xe82d, 0x4c44, 0xbd, 0xa1, \
0x71, 0x94, 0x19, 0x9a, 0xd9, 0x2a)
#define EFI_CONFORMANCE_PROFILES_TABLE_GUID \
EFI_GUID(0x36122546, 0xf7ef, 0x4c8f, 0xbd, 0x9b, \
0xeb, 0x85, 0x25, 0xb5, 0x0c, 0x0b)
#define EFI_CONFORMANCE_PROFILES_TABLE_VERSION 1
#define EFI_CONFORMANCE_PROFILE_EBBR_2_0_GUID \
EFI_GUID(0xcce33c35, 0x74ac, 0x4087, 0xbc, 0xe7, \
0x8b, 0x29, 0xb0, 0x2e, 0xeb, 0x27)
struct efi_conformance_profiles_table {
u16 version;
u16 number_of_profiles;
efi_guid_t conformance_profiles[];
} __packed;
struct efi_capsule_header {
efi_guid_t capsule_guid;
u32 header_size;

7
include/efi_loader.h
View File

@ -1052,6 +1052,13 @@ extern u8 num_image_type_guids;
*/
efi_status_t efi_esrt_register(void);
/**
* efi_ecpt_register() - Install the ECPT system table.
*
* Return: status code
*/
efi_status_t efi_ecpt_register(void);
/**
* efi_esrt_populate() - Populates the ESRT entries from the FMP instances
* present in the system.

17
lib/efi_loader/Kconfig
View File

@ -385,6 +385,23 @@ config EFI_ESRT
help
Enabling this option creates the ESRT UEFI system table.
config EFI_ECPT
bool "Enable the UEFI ECPT generation"
default y
help
Enabling this option created the ECPT UEFI table.
config EFI_EBBR_2_0_CONFORMANCE
bool "Add the EBBRv2.0 conformance entry to the ECPT table"
depends on EFI_ECPT
depends on EFI_LOADER_HII
depends on EFI_RISCV_BOOT_PROTOCOL || !RISCV
depends on EFI_RNG_PROTOCOL || !DM_RNG
depends on EFI_UNICODE_COLLATION_PROTOCOL2
default y
help
Enabling this option adds the EBBRv2.0 conformance entry to the ECPT UEFI table.
config EFI_RISCV_BOOT_PROTOCOL
bool "RISCV_EFI_BOOT_PROTOCOL support"
default y

1
lib/efi_loader/Makefile
View File

@ -76,6 +76,7 @@ obj-$(CONFIG_EFI_TCG2_PROTOCOL) += efi_tcg2.o
obj-$(CONFIG_EFI_RISCV_BOOT_PROTOCOL) += efi_riscv.o
obj-$(CONFIG_EFI_LOAD_FILE2_INITRD) += efi_load_initrd.o
obj-$(CONFIG_EFI_SIGNATURE_SUPPORT) += efi_signature.o
obj-$(CONFIG_EFI_ECPT) += efi_conformance.o
EFI_VAR_SEED_FILE := $(subst $\",,$(CONFIG_EFI_VAR_SEED_FILE))
$(obj)/efi_var_seed.o: $(srctree)/$(EFI_VAR_SEED_FILE)

60
lib/efi_loader/efi_conformance.c Normal file
View File

@ -0,0 +1,60 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* EFI conformance profile table
*
* Copyright (C) 2022 Arm Ltd.
*/
#include <common.h>
#include <efi_loader.h>
#include <log.h>
#include <efi_api.h>
#include <malloc.h>
static const efi_guid_t efi_ecpt_guid = EFI_CONFORMANCE_PROFILES_TABLE_GUID;
static const efi_guid_t efi_ebbr_2_0_guid =
EFI_CONFORMANCE_PROFILE_EBBR_2_0_GUID;
/**
* efi_ecpt_register() - Install the ECPT system table.
*
* Return: status code
*/
efi_status_t efi_ecpt_register(void)
{
int num_entries = 0;
struct efi_conformance_profiles_table *ecpt;
efi_status_t ret;
size_t ecpt_size;
ecpt_size = num_entries * sizeof(efi_guid_t)
+ sizeof(struct efi_conformance_profiles_table);
ret = efi_allocate_pool(EFI_BOOT_SERVICES_DATA, ecpt_size,
(void **)&ecpt);
if (ret != EFI_SUCCESS) {
log_err("Out of memory\n");
return ret;
}
if (CONFIG_IS_ENABLED(EFI_EBBR_2_0_CONFORMANCE))
guidcpy(&ecpt->conformance_profiles[num_entries++],
&efi_ebbr_2_0_guid);
ecpt->version = EFI_CONFORMANCE_PROFILES_TABLE_VERSION;
ecpt->number_of_profiles = num_entries;
/* Install the ECPT in the system configuration table. */
ret = efi_install_configuration_table(&efi_ecpt_guid, (void *)ecpt);
if (ret != EFI_SUCCESS) {
log_err("Failed to install ECPT\n");
efi_free_pool(ecpt);
return ret;
}
log_debug("ECPT created\n");
return EFI_SUCCESS;
}

5
lib/efi_loader/efi_console.c
View File

@ -987,12 +987,14 @@ static efi_status_t EFIAPI efi_cin_read_key_stroke_ex(
efi_cin_check();
if (!key_available) {
memset(key_data, 0, sizeof(struct efi_key_data));
ret = EFI_NOT_READY;
goto out;
}
/*
* CTRL+A - CTRL+Z have to be signaled as a - z.
* SHIFT+CTRL+A - SHIFT+CTRL+Z have to be signaled as A - Z.
* CTRL+\ - CTRL+_ have to be signaled as \ - _.
*/
switch (next_key.key.unicode_char) {
case 0x01 ... 0x07:
@ -1005,6 +1007,9 @@ static efi_status_t EFIAPI efi_cin_read_key_stroke_ex(
next_key.key.unicode_char += 0x40;
else
next_key.key.unicode_char += 0x60;
break;
case 0x1c ... 0x1f:
next_key.key.unicode_char += 0x40;
}
*key_data = next_key;
key_available = false;

7
lib/efi_loader/efi_device_path_to_text.c
View File

@ -190,13 +190,14 @@ static char *dp_msging(char *s, struct efi_device_path *dp)
struct efi_device_path_nvme *ndp =
(struct efi_device_path_nvme *)dp;
u32 ns_id;
int i;
memcpy(&ns_id, &ndp->ns_id, sizeof(ns_id));
s += sprintf(s, "NVMe(0x%x,", ns_id);
for (i = 0; i < sizeof(ndp->eui64); ++i)
/* Display byte 7 first, byte 0 last */
for (int i = 0; i < 8; ++i)
s += sprintf(s, "%s%02x", i ? "-" : "",
ndp->eui64[i]);
ndp->eui64[i ^ 7]);
s += sprintf(s, ")");
break;

6
lib/efi_loader/efi_setup.c
View File

@ -274,6 +274,12 @@ efi_status_t efi_init_obj_list(void)
if (ret != EFI_SUCCESS)
goto out;
if (IS_ENABLED(CONFIG_EFI_ECPT)) {
ret = efi_ecpt_register();
if (ret != EFI_SUCCESS)
goto out;
}
if (IS_ENABLED(CONFIG_EFI_ESRT)) {
ret = efi_esrt_register();
if (ret != EFI_SUCCESS)

64
lib/efi_loader/helloworld.c
View File

@ -29,24 +29,66 @@ static struct efi_system_table *systable;
static struct efi_boot_services *boottime;
static struct efi_simple_text_output_protocol *con_out;
/*
* Print an unsigned 32bit value as decimal number to an u16 string
*
* @value: value to be printed
* @buf: pointer to buffer address
* on return position of terminating zero word
*/
static void uint2dec(u32 value, u16 **buf)
{
u16 *pos = *buf;
int i;
u16 c;
u64 f;
/*
* Increment by .5 and multiply with
* (2 << 60) / 1,000,000,000 = 0x44B82FA0.9B5A52CC
* to move the first digit to bit 60-63.
*/
f = 0x225C17D0;
f += (0x9B5A52DULL * value) >> 28;
f += 0x44B82FA0ULL * value;
for (i = 0; i < 10; ++i) {
/* Write current digit */
c = f >> 60;
if (c || pos != *buf)
*pos++ = c + '0';
/* Eliminate current digit */
f &= 0xfffffffffffffff;
/* Get next digit */
f *= 0xaULL;
}
if (pos == *buf)
*pos++ = '0';
*pos = 0;
*buf = pos;
}
/**
* print_uefi_revision() - print UEFI revision number
*/
static void print_uefi_revision(void)
{
u16 rev[] = u"0.0.0";
u16 rev[13] = {0};
u16 *buf = rev;
u16 digit;
rev[0] = (systable->hdr.revision >> 16) + '0';
rev[4] = systable->hdr.revision & 0xffff;
for (; rev[4] >= 10;) {
rev[4] -= 10;
++rev[2];
uint2dec(systable->hdr.revision >> 16, &buf);
*buf++ = '.';
uint2dec(systable->hdr.revision & 0xffff, &buf);
/* Minor revision is only to be shown if non-zero */
digit = *--buf;
if (digit == '0') {
*buf = 0;
} else {
*buf++ = '.';
*buf = digit;
}
/* Third digit is only to be shown if non-zero */
if (rev[4])
rev[4] += '0';
else
rev[3] = 0;
con_out->output_string(con_out, u"Running on UEFI ");
con_out->output_string(con_out, rev);

11
lib/efi_selftest/efi_selftest_miniapp_exception.c
View File

@ -9,6 +9,7 @@
#include <common.h>
#include <efi_api.h>
#include <host_arch.h>
/*
* Entry point of the EFI application.
@ -33,10 +34,16 @@ efi_status_t EFIAPI efi_main(efi_handle_t handle,
asm volatile (".word 0xe7f7defb\n");
#elif defined(CONFIG_RISCV)
asm volatile (".word 0xffffffff\n");
#elif defined(CONFIG_SANDBOX)
asm volatile (".word 0xffffffff\n");
#elif defined(CONFIG_X86)
asm volatile (".word 0xffff\n");
#elif defined(CONFIG_SANDBOX)
#if (HOST_ARCH == HOST_ARCH_ARM || HOST_ARCH == HOST_ARCH_AARCH64)
asm volatile (".word 0xe7f7defb\n");
#elif (HOST_ARCH == HOST_ARCH_RISCV32 || HOST_ARCH == HOST_ARCH_RISCV64)
asm volatile (".word 0xffffffff\n");
#elif (HOST_ARCH == HOST_ARCH_X86 || HOST_ARCH == HOST_ARCH_X86_64)
asm volatile (".word 0xffff\n");
#endif
#endif
con_out->output_string(con_out, u"Exception not triggered.\n");
return EFI_ABORTED;

4
lib/uuid.c
View File

@ -220,6 +220,10 @@ static const struct {
"TCG2 Final Events Table",
EFI_TCG2_FINAL_EVENTS_TABLE_GUID,
},
{
"EFI Conformance Profiles Table",
EFI_CONFORMANCE_PROFILES_TABLE_GUID,
},
#ifdef CONFIG_EFI_RISCV_BOOT_PROTOCOL
{
"RISC-V Boot",