Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-03 10:17:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Pull request efi-2023-07-rc7

Browse source 
Documentation:
 
 * Fix links to Linux kernel documentation
 
 UEFI:
 
 * Fix memory leak in efidebug dh subcommand
 * Fix underflow when calculating remaining variable store size
 * Increase default variable store size to 64 KiB
 * mkeficapsule: fix efi_firmware_management_capsule_header data type
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEbcT5xx8ppvoGt20zxIHbvCwFGsQFAmSqfx0ACgkQxIHbvCwF
 GsRFeA/+O4zGJ5HnHpJtGjmJzvEzQZFv65pr8y4I72wO9wwY8RhWeBnup39j5Tlm
 hMDLPptqoDw/3eFaDEhxW8Rbi6Pz3hizSg7RP/HNzj5Efrl8sFij2aDwKyTQr7jx
 yjJNuiQZHitWg9iOSHNDzVB79pT+abMNZmvk9ASRcDDtSuiwsy7MZGBxynmBRAJX
 UP8RKa0tmC6/d5DlLRvZtCtnQ5YI4IDMWoZsgIedt1SkIVVj9lZcanHWMOD6Lcrw
 PgLZZdy/cwbK8vl6sIqsJBVpSuZSbhL3yA5ZEAFWmIQWuogcbbaH8PMeYvoHlJPP
 f8mlCTnoF9vCc2LOFUog84KlwGrtQc+qSZMfOP+hBGBgpxf1MmPA7fhhRB6+lfrJ
 27TJUNf0+wnpeuDGtQ+qr6/PXP9fFgopvWMR/G/2XWjZK2xkqsVYK+BH55/V93By
 oZrRBlrBSre5uFZHcWYGAYP5Drddif7Ex++gUJhucbb9Bp6uqGVm2r/k3gscX4kk
 HkbCl9IwRasZCBOK+xCZulJ/OVF5bzV+8zQHtMo6cN8ilz830WyLAmiaFQxROXxN
 f6eXeYTSKQikKiZegFD4+/yG5XgxAezO9YkhJZwd082JcSFuF3RdwrHzk4mKxhRC
 9IVBt855sI4HxAE3V5JlbGgufxCro4wNU7Z6abrcNGI73UxqOSA=
 =p8s8
 -----END PGP SIGNATURE-----

Merge tag 'efi-2023-07-rc7' of https://source.denx.de/u-boot/custodians/u-boot-efi

Pull request efi-2023-07-rc7

Documentation:

* Fix links to Linux kernel documentation

UEFI:

* Fix memory leak in efidebug dh subcommand
* Fix underflow when calculating remaining variable store size
* Increase default variable store size to 64 KiB
* mkeficapsule: fix efi_firmware_management_capsule_header data type
This commit is contained in:
Tom Rini 2023-07-11 13:27:32 -04:00
commit 8e21064cb3
7 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/x86/include/asm/bootparam.h
View file

@ -62,7 +62,7 @@ struct setup_indirect {
/** /**
* struct setup_header - Information needed by Linux to boot * struct setup_header - Information needed by Linux to boot
* *
* See https://www.kernel.org/doc/html/latest/x86/boot.html * See https://www.kernel.org/doc/html/latest/arch/x86/boot.html
*/ */
struct setup_header { struct setup_header {
__u8 setup_sects; __u8 setup_sects;

1
cmd/efidebug.c
View file

@ -486,6 +486,7 @@ static int do_efi_show_handles(struct cmd_tbl *cmdtp, int flag,
if (guidcmp(guid[j], &efi_guid_device_path)) if (guidcmp(guid[j], &efi_guid_device_path))
printf(" %pUs\n", guid[j]); printf(" %pUs\n", guid[j]);
} }
efi_free_pool(guid);
} }
efi_free_pool(handles); efi_free_pool(handles);

2
doc/develop/docstyle.rst
View file

@ -20,7 +20,7 @@ We apply the following rules:
* For documentation we use reStructured text conforming to the requirements * For documentation we use reStructured text conforming to the requirements
of `Sphinx <https://www.sphinx-doc.org>`_. of `Sphinx <https://www.sphinx-doc.org>`_.
* For documentation within code we follow the Linux kernel guide * For documentation within code we follow the Linux kernel guide
`Writing kernel-doc comments <https://docs.kernel.org/doc-guide/kernel-doc.html>`_. `Writing kernel-doc comments <https://www.kernel.org/doc/html/latest/doc-guide/kernel-doc.html>`_.
* We try to stick to 80 columns per line in documents. * We try to stick to 80 columns per line in documents.
* For tables we prefer simple tables over grid tables. We avoid list tables * For tables we prefer simple tables over grid tables. We avoid list tables
as they make the reStructured text documents hard to read. as they make the reStructured text documents hard to read.

2
doc/usage/blkmap.rst
View file

@ -19,7 +19,7 @@ wherever they might be located.
The implementation is loosely modeled on Linux's "Device Mapper" The implementation is loosely modeled on Linux's "Device Mapper"
subsystem, see `kernel documentation`_ for more information. subsystem, see `kernel documentation`_ for more information.
.. _kernel documentation: https://docs.kernel.org/admin-guide/device-mapper/index.html .. _kernel documentation: https://www.kernel.org/doc/html/latest/admin-guide/device-mapper/index.html
Example: Netbooting an Ext4 Image Example: Netbooting an Ext4 Image

5
lib/efi_loader/Kconfig
View file

@ -96,7 +96,8 @@ endif
config EFI_VAR_BUF_SIZE config EFI_VAR_BUF_SIZE
int "Memory size of the UEFI variable store" int "Memory size of the UEFI variable store"
default 16384 default 16384 if EFI_MM_COMM_TEE
default 65536
range 4096 2147483647 range 4096 2147483647
help help
This defines the size in bytes of the memory area reserved for keeping This defines the size in bytes of the memory area reserved for keeping
@ -106,7 +107,7 @@ config EFI_VAR_BUF_SIZE
match the value of PcdFlashNvStorageVariableSize used to compile the match the value of PcdFlashNvStorageVariableSize used to compile the
StandAloneMM module. StandAloneMM module.
Minimum 4096, default 16384. Minimum 4096, default 65536, or 16384 when using StandAloneMM.
config EFI_GET_TIME config EFI_GET_TIME
bool "GetTime() runtime service" bool "GetTime() runtime service"

4
lib/efi_loader/efi_var_mem.c
View file

@ -177,6 +177,10 @@ efi_status_t __efi_runtime efi_var_mem_ins(
u64 __efi_runtime efi_var_mem_free(void) u64 __efi_runtime efi_var_mem_free(void)
{ {
if (efi_var_buf->length + sizeof(struct efi_var_entry) >=
EFI_VAR_BUF_SIZE)
return 0;
return EFI_VAR_BUF_SIZE - efi_var_buf->length - return EFI_VAR_BUF_SIZE - efi_var_buf->length -
sizeof(struct efi_var_entry); sizeof(struct efi_var_entry);
} }

2
tools/eficapsule.h
View file

@ -63,7 +63,7 @@ struct efi_firmware_management_capsule_header {
uint32_t version; uint32_t version;
uint16_t embedded_driver_count; uint16_t embedded_driver_count;
uint16_t payload_item_count; uint16_t payload_item_count;
uint32_t item_offset_list[]; uint64_t item_offset_list[];
} __packed; } __packed;
/* image_capsule_support */ /* image_capsule_support */