efi_loader: enable EFI driver provided block device
Subsystems (2)
v3 cover efi_loader: enable EFI driver provided block device
With this patch series an EFI application or driver can supply a block device which in turn can be used to download an image.
E.g. we can load iPXE, connect iSCSI drives, download grub from the SAN and afterwards with grub download and run an EFI application. Booting Linux from an iSCSI drive was successful on arm64.
v3:
Provide two separate test cases for StartImage. Initialize EFI driver uclass from bootefi command. Add check_tpl parameter to efi_signal_event.
Remove accepted patch for file2include.
v2:
Add an additional patch to fix ExitBootServices. Provide comments for EFI block driver.
Avoid printing when not in debug mode
Add product tools/file2include to .gitignore.
Put the patch with the test for block io after the patch for the driver.
Heinrich Schuchardt (18):
efi_loader: return NULL from device path functions
efi_loader: address of the simple file system protocol
efi_loader: correct find simple file system protocol
efi_loader: print device path when entering efi_load_image
efi_loader: allocate correct memory type for EFI image
efi_loader: check tables in helloworld.efi
efi_loader: fix StartImage bootservice
efi_loader: efi_disk_register: correctly determine if_type_name
efi_loader: make efi_block_io_guid a global symbol
efi_loader: provide a function to create a partition node
efi_loader: make efi_disk_create_partitions a global symbol
efi_loader: correct EFI_BLOCK_IO_PROTOCOL definitions
efi_loader: provide function to get last node of a device path
efi_loader: provide link between devices and EFI handles
efi_loader: add check_tpl parameter to efi_signal_event
efi_loader: fix ExitBootServices
efi_driver: EFI block driver
efi_selftest: provide a test for block io
cmd/bootefi.c | 3 + drivers/block/blk-uclass.c | 4 +- include/blk.h | 1 + include/config_fallbacks.h | 1 + include/dm/uclass-id.h | 1 + include/efi_api.h | 18 +- include/efi_driver.h | 30 ++ include/efi_loader.h | 23 +- lib/Makefile | 1 + lib/efi_driver/Makefile | 13 + lib/efi_driver/efi_block_device.c | 175 ++++++++++++ lib/efi_driver/efi_uclass.c | 330 ++++++++++++++++++++++ lib/efi_loader/efi_boottime.c | 55 +++- lib/efi_loader/efi_console.c | 14 +- lib/efi_loader/efi_device_path.c | 168 +++++++++--- lib/efi_loader/efi_disk.c | 137 +++++++--- lib/efi_loader/efi_image_loader.c | 64 +++-- lib/efi_loader/helloworld.c | 26 ++ lib/efi_selftest/Makefile | 4 + lib/efi_selftest/efi_selftest_block_device.c | 395 +++++++++++++++++++++++++++ lib/efi_selftest/efi_selftest_disk_image.h | 69 +++++ 21 files changed, 1398 insertions(+), 134 deletions(-) create mode 100644 include/efi_driver.h create mode 100644 lib/efi_driver/Makefile create mode 100644 lib/efi_driver/efi_block_device.c create mode 100644 lib/efi_driver/efi_uclass.c create mode 100644 lib/efi_selftest/efi_selftest_block_device.c create mode 100644 lib/efi_selftest/efi_selftest_disk_image.h
Signature · 1 line
2.14.2
PATCH v3 1/18 efi_loader: return NULL from device path functions
For the construction of device paths we need to call the AllocatePool service. We should not ignore if it fails due to an out of memory situation.
This patch changes the device path functions to return NULL if the memory allocation fails.
Additional patches will be needed to fix the callers.
---
v3
no change
v2
no change
--- include/efi_loader.h | 6 +++--- lib/efi_loader/efi_device_path.c | 42 ++++++++++++++++++++++++++++++++++------ 2 files changed, 39 insertions(+), 9 deletions(-)
include/efi_loader.h +3 -3
@@ -302,9 +302,9 @@ struct efi_device_path *efi_dp_from_eth(void);struct efi_device_path *efi_dp_from_mem (uint32_t mem_type,uint64_t start_address,uint64_t end_address); -void efi_dp_split_file_path (struct efi_device_path *full_path, -struct efi_device_path **device_path, -struct efi_device_path **file_path); +efi_status_t efi_dp_split_file_path (struct efi_device_path *full_path, +struct efi_device_path **device_path, +struct efi_device_path **file_path);#define EFI_DP_TYPE (_dp, _type, _subtype) \ (((_dp)->type == DEVICE_PATH_TYPE_##_type) && \
lib/efi_loader/efi_device_path.c +36 -6
120 lines not on this page · raw message
Signature · 1 line
2.14.2
PATCH v3 2/18 efi_loader: address of the simple file system protocol
In reply to Heinrich SchuchardtWhen installing the the simple file system protocol we have to path the address of the structure and not the address of a pointer to the structure.
---
v3
no change
v2
no change
--- lib/efi_loader/efi_disk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/efi_loader/efi_disk.c +1 -1
@@ -242,7 +242,7 @@ static void efi_disk_add_dev(const char *name, diskobj->dp); ret =efi_add_protocol (diskobj->parent.handle, &efi_simple_file_system_protocol_guid, - &diskobj->volume); + diskobj->volume);if (ret !=EFI_SUCCESS ) goto out_of_memory; }
Signature · 1 line
2.14.2
PATCH v3 3/18 efi_loader: correct find simple file system protocol
In reply to Heinrich SchuchardtIn contrast to the description the code did not split the device path into device part and file part.
The code should use the installed protocol and not refer to the internal structure of the the disk object.
---
v3
no change
v2
no change
--- lib/efi_loader/efi_disk.c | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-)
lib/efi_loader/efi_disk.c +29 -10
@@ -175,25 +175,44 @@ static const struct efi_block_io block_io_disk_template = { };/* -* Find filesystem from a device-path. The passed in path 'p' probably -* contains one or more /File(name) nodes, so the comparison stops at -* the first /File() node, and returns the pointer to that via 'rp'. -* This is mostly intended to be a helper to map a device-path to an -* efi_file_handle object. +* Get the simple file system protocol for a file device path. +* +* The full path provided is split into device part and into a file +* part. The device part is used to find the handle on which the +* simple file system protocol is installed. +* +* @full_path device path including device and file +* @return simple file system protocol */ struct efi_simple_file_system_protocol * -efi_fs_from_path (struct efi_device_path *fp) +efi_fs_from_path (struct efi_device_path *full_path) {struct efi_object *efiobj; -struct efi_disk_obj *diskobj; +struct efi_handler *handler; +struct efi_device_path *device_path; +struct efi_device_path *file_path; +efi_status_t ret; - efiobj =efi_dp_find_obj (fp,NULL ); +/* Split the path into a device part and a file part */ + ret =efi_dp_split_file_path (full_path, &device_path, &file_path); +if (ret !=EFI_SUCCESS ) +return NULL ; +efi_free_pool (file_path); + +/* Get the EFI object for the partition */ + efiobj =efi_dp_find_obj (device_path,NULL ); +efi_free_pool (device_path);if (!efiobj)return NULL ; - diskobj = container_of(efiobj, struct efi_disk_obj, parent); +/* Find the simple file system protocol */ + ret =efi_search_protocol (efiobj, &efi_simple_file_system_protocol_guid, + &handler); +if (ret !=EFI_SUCCESS ) +return NULL ; -return diskobj->volume; +/* Return the simple file system protocol for the partition */ +return handler->protocol_interface; }/*
Signature · 1 line
2.14.2
PATCH v3 4/18 efi_loader: print device path when entering efi_load_image
In reply to Heinrich SchuchardtUse %pD to print the device path instead of its address when entering efi_load_image.
---
v3
no change
v2
no change
--- lib/efi_loader/efi_boottime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/efi_loader/efi_boottime.c +1 -1
@@ -1471,7 +1471,7 @@ static efi_status_t EFIAPI efi_load_image(bool boot_policy,struct efi_object *obj;efi_status_t ret; -EFI_ENTRY ("%d, %p, %p, %p, %ld, %p" , boot_policy, parent_image, +EFI_ENTRY ("%d, %p, %pD, %p, %ld, %p" , boot_policy, parent_image, file_path, source_buffer, source_size, image_handle); info =calloc (1 ,sizeof (*info));
Signature · 1 line
2.14.2
PATCH v3 5/18 efi_loader: allocate correct memory type for EFI image
In reply to Heinrich SchuchardtThe category of memory allocated for an EFI image should depend on its type (application, bootime service driver, runtime service driver).
Our helloworld.efi built on arm64 has an illegal image type. Treat it like an EFI application.
---
v3
no change
v2
no change
--- lib/efi_loader/efi_image_loader.c | 64 ++++++++++++++++++++++++--------------- 1 file changed, 40 insertions(+), 24 deletions(-)
lib/efi_loader/efi_image_loader.c +40 -24
@@ -73,6 +73,40 @@ void __weak invalidate_icache_all(void)/* If the system doesn't support icache_all flush, cross our fingers */ } +/* +* Determine the memory types to be used for code and data. +* +* @loaded_image_info image descriptor +* @image_type field Subsystem of the optional header for +* Windows specific field +*/ +static void efi_set_code_and_data_type ( +struct efi_loaded_image *loaded_image_info, +uint16_t image_type) +{ +switch (image_type) { +case IMAGE_SUBSYSTEM_EFI_APPLICATION : + loaded_image_info->image_code_type =EFI_LOADER_CODE ; + loaded_image_info->image_data_type =EFI_LOADER_DATA ; +break ; +case IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER : + loaded_image_info->image_code_type =EFI_BOOT_SERVICES_CODE ; + loaded_image_info->image_data_type =EFI_BOOT_SERVICES_DATA ; +break ; +case IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER : +case IMAGE_SUBSYSTEM_SAL_RUNTIME_DRIVER : + loaded_image_info->image_code_type =EFI_RUNTIME_SERVICES_CODE ; + loaded_image_info->image_data_type =EFI_RUNTIME_SERVICES_DATA ; +break ; +default : +printf ("%s: invalid image type: %u\n" , __func__, image_type); +/* Let's assume it is an application */ + loaded_image_info->image_code_type =EFI_LOADER_CODE ; + loaded_image_info->image_data_type =EFI_LOADER_DATA ; +break ; + } +} +/* * This function loads all sections from a PE binary into a newly reserved * piece of memory. On successful load it then returns the entry point for
@@ -94,7 +128,6 @@ void *efi_load_pe(void *efi, struct efi_loaded_image *loaded_image_info)unsigned long virt_size =0 ;bool can_run_nt64 = true;bool can_run_nt32 = true; -uint16_t image_type;#if defined(CONFIG_ARM64 ) can_run_nt32 = false;
@@ -131,7 +164,9 @@ void *efi_load_pe(void *efi, struct efi_loaded_image *loaded_image_info)IMAGE_NT_HEADERS64 *nt64 = (void *)nt;IMAGE_OPTIONAL_HEADER64 *opt = &nt64->OptionalHeader; image_size = opt->SizeOfImage; - efi_reloc =efi_alloc (virt_size,EFI_LOADER_DATA ); +efi_set_code_and_data_type (loaded_image_info, opt->Subsystem); + efi_reloc =efi_alloc (virt_size, + loaded_image_info->image_code_type);if (!efi_reloc) {printf ("%s: Could not allocate %lu bytes\n" , __func__, virt_size);
@@ -140,12 +175,13 @@ void *efi_load_pe(void *efi, struct efi_loaded_image *loaded_image_info) entry = efi_reloc + opt->AddressOfEntryPoint; rel_size = opt->DataDirectory[rel_idx].Size; rel = efi_reloc + opt->DataDirectory[rel_idx].VirtualAddress; - image_type = opt->Subsystem; }else if (can_run_nt32 && (nt->OptionalHeader.Magic ==IMAGE_NT_OPTIONAL_HDR32_MAGIC )) {IMAGE_OPTIONAL_HEADER32 *opt = &nt->OptionalHeader; image_size = opt->SizeOfImage; - efi_reloc =efi_alloc (virt_size,EFI_LOADER_DATA ); +efi_set_code_and_data_type (loaded_image_info, opt->Subsystem); + efi_reloc =efi_alloc (virt_size, + loaded_image_info->image_code_type);if (!efi_reloc) {printf ("%s: Could not allocate %lu bytes\n" , __func__, virt_size);
@@ -154,32 +190,12 @@ void *efi_load_pe(void *efi, struct efi_loaded_image *loaded_image_info) entry = efi_reloc + opt->AddressOfEntryPoint; rel_size = opt->DataDirectory[rel_idx].Size; rel = efi_reloc + opt->DataDirectory[rel_idx].VirtualAddress; - image_type = opt->Subsystem; }else {printf ("%s: Invalid optional header magic %x\n" , __func__, nt->OptionalHeader.Magic);return NULL ; } -switch (image_type) { -case IMAGE_SUBSYSTEM_EFI_APPLICATION : - loaded_image_info->image_code_type =EFI_LOADER_CODE ; - loaded_image_info->image_data_type =EFI_LOADER_DATA ; -break ; -case IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER : - loaded_image_info->image_code_type =EFI_BOOT_SERVICES_CODE ; - loaded_image_info->image_data_type =EFI_BOOT_SERVICES_DATA ; -break ; -case IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER : -case IMAGE_SUBSYSTEM_SAL_RUNTIME_DRIVER : - loaded_image_info->image_code_type =EFI_RUNTIME_SERVICES_CODE ; - loaded_image_info->image_data_type =EFI_RUNTIME_SERVICES_DATA ; -break ; -default : -printf ("%s: invalid image type: %u\n" , __func__, image_type); -break ; - } -/* Load sections into RAM */ for (i = num_sections -1 ; i >=0 ; i--) {IMAGE_SECTION_HEADER *sec = §ions[i];
Signature · 1 line
2.14.2
PATCH v3 6/18 efi_loader: check tables in helloworld.efi
In reply to Heinrich SchuchardtCheck if the device tree and the SMBIOS table are available.
---
v3
no change
v2
no change
--- lib/efi_loader/helloworld.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
lib/efi_loader/helloworld.c +26 -0
@@ -14,6 +14,22 @@#include <efi_api.h> static const efi_guid_t loaded_image_guid =LOADED_IMAGE_GUID ; +static const efi_guid_t fdt_guid =EFI_FDT_GUID ; +static const efi_guid_t smbios_guid =SMBIOS_TABLE_GUID ; + +static int hw_memcmp (const void *buf1,const void *buf2,size_t length) +{ +const u8 *pos1 = buf1; +const u8 *pos2 = buf2; + +for (; length; --length) { +if (*pos1 != *pos2) +return *pos1 - *pos2; + ++pos1; + ++pos2; + } +return 0 ; +}/* * Entry point of the EFI application.
@@ -29,6 +45,7 @@ efi_status_t EFIAPI efi_main(efi_handle_t handle,struct efi_boot_services *boottime = systable->boottime;struct efi_loaded_image *loaded_image;efi_status_t ret; +efi_uintn_t i; con_out->output_string (con_out,L"Hello, world!\n" );
@@ -40,6 +57,15 @@ efi_status_t EFIAPI efi_main(efi_handle_t handle, L"Cannot open loaded image protocol\n"); goto out; } +/* Find configuration tables */ +for (i =0 ; i < systable->nr_tables; ++i) { +if (!hw_memcmp (&systable->tables[i].guid, &fdt_guid, +sizeof (efi_guid_t))) + con_out->output_string (con_out,L"Have device tree\n" ); +if (!hw_memcmp (&systable->tables[i].guid, &smbios_guid, +sizeof (efi_guid_t))) + con_out->output_string (con_out,L"Have SMBIOS table\n" ); + }/* Output the load options */ con_out->output_string (con_out,L"Load options: " );if (loaded_image->load_options_size && loaded_image->load_options)
Signature · 1 line
2.14.2
PATCH v3 7/18 efi_loader: fix StartImage bootservice
In reply to Heinrich SchuchardtThe calling convention for the entry point of an EFI image is always 'asmlinkage'.
---
v3
Use efi_handle_t as type of the image handle.
v2
no change
--- lib/efi_loader/efi_boottime.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
lib/efi_loader/efi_boottime.c +2 -1
@@ -1530,7 +1530,8 @@ static efi_status_t EFIAPI efi_start_image(efi_handle_t image_handle,unsigned long *exit_data_size, s16 **exit_data) { - ulong (*entry)(void *image_handle, struct efi_system_table *st); + asmlinkage ulong (*entry)(efi_handle_t image_handle, +struct efi_system_table *st);struct efi_loaded_image *info = image_handle;efi_status_t ret;
Signature · 1 line
2.14.2
PATCH v3 8/18 efi_loader: efi_disk_register: correctly determine if_type_name
In reply to Heinrich SchuchardtThe interface type name can be used to look up the interface type. Don't confound it with the driver name which may be different.
---
v3
no change
v2
no change
--- lib/efi_loader/efi_disk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/efi_loader/efi_disk.c +1 -1
@@ -330,7 +330,7 @@ int efi_disk_register(void)dev ; uclass_next_device_check(&dev)) {struct blk_desc *desc =dev_get_uclass_platdata (dev); -const char *if_typename = dev->driver->name; +const char *if_typename =blk_get_if_type_name (desc->if_type);printf ("Scanning disk %s...\n" , dev->name);
Signature · 1 line
2.14.2
PATCH v3 9/18 efi_loader: make efi_block_io_guid a global symbol
In reply to Heinrich SchuchardtThe GUID of the EFI_BLOCK_IO_PROTOCOL is needed in different code parts. To avoid duplication make efi_block_io_guid a global symbol.
---
v3
no change
v2
no change
--- include/efi_loader.h | 2 ++ lib/efi_loader/efi_disk.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)
include/efi_loader.h +2 -0
@@ -86,6 +86,8 @@ extern const struct efi_device_path_to_text_protocol efi_device_path_to_text;uint16_t *efi_dp_str (struct efi_device_path *dp); +/* GUID of the EFI_BLOCK_IO_PROTOCOL */ +extern const efi_guid_t efi_block_io_guid;extern const efi_guid_t efi_global_variable_guid;extern const efi_guid_t efi_guid_console_control;extern const efi_guid_t efi_guid_device_path;
lib/efi_loader/efi_disk.c +1 -1
@@ -14,7 +14,7 @@#include <part.h> #include <malloc.h> -static const efi_guid_t efi_block_io_guid =BLOCK_IO_GUID ; +const efi_guid_t efi_block_io_guid =BLOCK_IO_GUID ;struct efi_disk_obj {/* Generic EFI object parent class data */
Signature · 1 line
2.14.2
PATCH v3 10/18 efi_loader: provide a function to create a partition node
In reply to Heinrich SchuchardtProvide new function efi_dp_part_node() to create a device node for a partition.
---
v3
no change
v2
no change
--- include/efi_loader.h | 2 + lib/efi_loader/efi_device_path.c | 106 ++++++++++++++++++++++++++------------- 2 files changed, 72 insertions(+), 36 deletions(-)
include/efi_loader.h +2 -0
@@ -298,6 +298,8 @@ struct efi_device_path *efi_dp_append_node(const struct efi_device_path *dp,struct efi_device_path *efi_dp_from_dev (struct udevice *dev);struct efi_device_path *efi_dp_from_part (struct blk_desc *desc,int part); +/* Create a device node for a block device partition. */ +struct efi_device_path *efi_dp_part_node (struct blk_desc *desc,int part);struct efi_device_path *efi_dp_from_file (struct blk_desc *desc,int part,const char *path);struct efi_device_path *efi_dp_from_eth (void );
lib/efi_loader/efi_device_path.c +70 -36
132 lines not on this page · raw message
Signature · 1 line
2.14.2
PATCH v3 11/18 efi_loader: make efi_disk_create_partitions a global symbol
In reply to Heinrich SchuchardtUp to now we have been using efi_disk_create_partitions() to create partitions for block devices that existed before starting an EFI application.
We need to call it for block devices created by EFI applications at run time. The EFI application will define the handle for the block device and install a device path protocol on it. We have to use this device path as stem for the partition device paths.
---
v3
fix typos in comments
v2
no change
--- include/efi_loader.h | 4 +++ lib/efi_loader/efi_disk.c | 84 +++++++++++++++++++++++++++++++++-------------- 2 files changed, 64 insertions(+), 24 deletions(-)
include/efi_loader.h +4 -0
@@ -174,6 +174,10 @@ extern struct list_head efi_obj_list;int efi_console_register (void );/* Called by bootefi to make all disk storage accessible as EFI objects */ int efi_disk_register (void ); +/* Create handles and protocols for the partitions of a block device */ +int efi_disk_create_partitions (efi_handle_t parent,struct blk_desc *desc, +const char *if_typename,int diskid, +const char *pdevname);/* Called by bootefi to make GOP (graphical) interface available */ int efi_gop_register (void );/* Called by bootefi to make the network interface available */
lib/efi_loader/efi_disk.c +60 -24
153 lines not on this page · raw message
Signature · 1 line
2.14.2
PATCH v3 11/18 efi_loader: make efi_disk_create_partitions a global symbol
Quoted 10 lines · Heinrich Schuchardt
Up to now we have been using
efi_disk_create_partitions()to create partitions for block devices that existed before starting an EFI application.We need to call it for block devices created by EFI applications at run time. The EFI application will define the handle for the block device and install a device path protocol on it. We have to use this device path as stem for the partition device paths.
Quoted 6 lines
Signed-off-by Heinrich Schuchardt <[email protected]>---
v3
fix typos in comments
v2
no change
breakage on mx6cuboxi with OpenBSD bootarm.efi, bisects to
commit 64e4db0f119151a1345e1da19d152eda550394e7
Author: Heinrich Schuchardt <[email protected]> AuthorDate: Fri Jan 19 20:24:47 2018 +0100 Commit: Alexander Graf <[email protected]> CommitDate: Mon Jan 22 23:09:14 2018 +0100
efi_loader: make efi_disk_create_partitions a global symbol
Up to now we have been using efi_disk_create_partitions() to create partitions for block devices that existed before starting an EFI application.
We need to call it for block devices created by EFI applications at run time. The EFI application will define the handle for the block device and install a device path protocol on it. We have to use this device path as stem for the partition device paths.
with master as of e24bd1e79e223aa89854c0be95a53e2d538144a5
U-Boot SPL 2018.03-rc1-00185-g1e19c70639 (Feb 09 2018 - 11:43:18 +1300) Trying to boot from MMC1
U-Boot 2018.03-rc1-00185-g1e19c70639 (Feb 09 2018 - 11:43:18 +1300)
CPU: Freescale i.MX6Q rev1.5 996 MHz (running at 792 MHz) CPU: Extended Commercial temperature grade (-20C to 105C) at 24C Reset cause: POR Board: MX6 Cubox-i DRAM: 2 GiB MMC: FSL_SDHC: 0 Loading Environment from MMC... OK No panel detected: default to HDMI Display: HDMI (1024x768) In: serial Out: serial Err: serial Net: FEC Hit any key to stop autoboot: 0
switch to partitions #0, OK
mmc0 is current device
Scanning mmc 0:1...
37503 bytes read in 17 ms (2.1 MiB/s)
Found EFI removable media binary efi/boot/bootarm.efi Scanning disks on usb...
76528 bytes read in 31 ms (2.4 MiB/s)
## Starting EFI application at 12000000 ... BS->LocateHandle() returns -2147483634 undefined instruction
pc : [<8e560348>] lr : [<8e56444c>]
reloc pc : [<15de4348>] lr : [<15de844c>]
sp : 8f57af10 ip : 8ffc2474 fp : 8f57af1c
r10: 0000b000 r9 : 8f57bee0 r8 : 0000000b
r7 : 8ffa1a9d r6 : 8ffa16ad r5 : 8e56f0d0 r4 : 8e56e88a
r3 : 8e56dac8 r2 : 00000001 r1 : 00000000 r0 : 00000000
Flags: nZCv IRQs off FIQs off Mode SVC_32
Resetting CPU ...
resetting ...
(undefined instruction is used to reset as efi reset was not present in earlier U-Boot versions).
PATCH v3 11/18 efi_loader: make efi_disk_create_partitions a global symbol
Quoted 63 lines · Jonathan Gray
Quoted 10 lines · Heinrich Schuchardt
Up to now we have been using
efi_disk_create_partitions()to create partitions for block devices that existed before starting an EFI application.We need to call it for block devices created by EFI applications at run time. The EFI application will define the handle for the block device and install a device path protocol on it. We have to use this device path as stem for the partition device paths.
Quoted 6 lines
Signed-off-by Heinrich Schuchardt <[email protected]>---
v3
fix typos in comments
v2
no changebreakage on mx6cuboxi with OpenBSD bootarm.efi, bisects to
commit
64e4db0f119151a1345e1da19d152eda550394e7Author: Heinrich Schuchardt <[email protected]> AuthorDate: Fri Jan 19 20:24:47 2018 +0100 Commit: Alexander Graf <[email protected]> CommitDate: Mon Jan 22 23:09:14 2018 +0100
efi_loader: makeefi_disk_create_partitionsa global symbolUp to now we have been using
efi_disk_create_partitions()to create partitions for block devices that existed before starting an EFI application.We need to call it for block devices created by EFI applications at run time. The EFI application will define the handle for the block device and install a device path protocol on it. We have to use this device path as stem for the partition device paths.
Signed-off-by Heinrich Schuchardt <[email protected]>Signed-off-by Alexander Graf <[email protected]>with master as of
e24bd1e79e223aa89854c0be95a53e2d538144a5U-Boot SPL 2018.03-rc1-00185-g1e19c70639 (Feb 09 2018 - 11:43:18 +1300) Trying to boot from MMC1
U-Boot 2018.03-rc1-00185-g1e19c70639 (Feb 09 2018 - 11:43:18 +1300)
CPU: Freescale i.MX6Q rev1.5 996 MHz (running at 792 MHz) CPU: Extended Commercial temperature grade (-20C to 105C) at 24C Reset cause: POR Board: MX6 Cubox-i DRAM: 2 GiB MMC: FSL_SDHC: 0 Loading Environment from MMC... OK No panel detected: default to HDMI Display: HDMI (1024x768) In: serial Out: serial Err: serial Net: FEC Hit any key to stop autoboot: 0
Quoted 9 lines
switch to partitions #0, OK
mmc0 is current device
Scanning mmc 0:1...
37503 bytes read in 17 ms (2.1 MiB/s)
Found EFI removable media binary efi/boot/bootarm.efi Scanning disks on usb...
76528 bytes read in 31 ms (2.4 MiB/s)
## Starting EFI application at 12000000 ...BS->LocateHandle()returns -2147483634
-2147483634 == EFI_NOT_FOUND
Without debug output it is impossible to understand what is going wrong. Please, insert
#define DEBUG 1
at the top of lib/efi_loader/efi_boottime.c
I assume you are again trying to boot OpenBSD.
Does this image reproduce the error:
https://ftp.eu.openbsd.org/pub/OpenBSD/6.2/armv7/miniroot-cubox-62.fs
Otherwise provide a disk image that can be used for testing.
I only have a Wandboard Quad. But that has the same i.MX6Q processor. So once I know which image to use I could run a test.
Best regards
Heinrich
Quoted 15 lines
undefined instruction
pc : [<8e560348>] lr : [<8e56444c>]reloc pc : [<
15de4348>] lr : [<15de844c>]
sp :8f57af10ip :8ffc2474fp :8f57af1c
r10:0000b000r9 :8f57bee0r8 :0000000b
r7 :8ffa1a9dr6 :8ffa16adr5 :8e56f0d0r4 :8e56e88a
r3 :8e56dac8r2 : 00000001 r1 : 00000000 r0 : 00000000
Flags: nZCv IRQs off FIQs off ModeSVC_32
Resetting CPU ...resetting ...
(undefined instruction is used to reset as efi reset was not present in earlier U-Boot versions).
PATCH v3 11/18 efi_loader: make efi_disk_create_partitions a global symbol
Quoted 85 lines · Heinrich Schuchardt
Quoted 60 lines · Jonathan Gray
Quoted 10 lines · Heinrich Schuchardt
Up to now we have been using
efi_disk_create_partitions()to create partitions for block devices that existed before starting an EFI application.We need to call it for block devices created by EFI applications at run time. The EFI application will define the handle for the block device and install a device path protocol on it. We have to use this device path as stem for the partition device paths.
Quoted 6 lines
Signed-off-by Heinrich Schuchardt <[email protected]>---
v3
fix typos in comments
v2
no changebreakage on mx6cuboxi with OpenBSD bootarm.efi, bisects to
commit
64e4db0f119151a1345e1da19d152eda550394e7Author: Heinrich Schuchardt <[email protected]> AuthorDate: Fri Jan 19 20:24:47 2018 +0100 Commit: Alexander Graf <[email protected]> CommitDate: Mon Jan 22 23:09:14 2018 +0100
efi_loader: makeefi_disk_create_partitionsa global symbol Up to now we have been usingefi_disk_create_partitions()to create partitions for block devices that existed before starting an EFI application.
We need to call it for block devices created by EFI applications at run time. The EFI application will define the handle for the block device and install a device path protocol on it. We have to use this device path as stem for the partition device paths.Signed-off-by Heinrich Schuchardt <[email protected]>Signed-off-by Alexander Graf <[email protected]>with master as of
e24bd1e79e223aa89854c0be95a53e2d538144a5U-Boot SPL 2018.03-rc1-00185-g1e19c70639 (Feb 09 2018 - 11:43:18 +1300) Trying to boot from MMC1
U-Boot 2018.03-rc1-00185-g1e19c70639 (Feb 09 2018 - 11:43:18 +1300)
CPU: Freescale i.MX6Q rev1.5 996 MHz (running at 792 MHz) CPU: Extended Commercial temperature grade (-20C to 105C) at 24C Reset cause: POR Board: MX6 Cubox-i DRAM: 2 GiB MMC: FSL_SDHC: 0 Loading Environment from MMC... OK No panel detected: default to HDMI Display: HDMI (1024x768) In: serial Out: serial Err: serial Net: FEC Hit any key to stop autoboot: 0Quoted 9 lines
switch to partitions #0, OK
mmc0 is current device
Scanning mmc 0:1...
37503 bytes read in 17 ms (2.1 MiB/s)
Found EFI removable media binary efi/boot/bootarm.efi Scanning disks on usb...
76528 bytes read in 31 ms (2.4 MiB/s)
## Starting EFI application at 12000000 ...BS->LocateHandle()returns -2147483634-2147483634 ==
EFI_NOT_FOUNDWithout debug output it is impossible to understand what is going wrong. Please, insert
#define DEBUG 1
at the top of
lib/efi_loader/efi_boottime.cI assume you are again trying to boot OpenBSD.
Does this image reproduce the error:
https://ftp.eu.openbsd.org/pub/OpenBSD/6.2/armv7/miniroot-cubox-62.fs
Quoted 9 lines
Otherwise provide a disk image that can be used for testing.
I only have a Wandboard Quad. But that has the same i.MX6Q processor. So once I know which image to use I could run a test.
Best regards
Heinrich
Hi,
you could try this:
http://ftp.eu.openbsd.org/pub/OpenBSD/snapshots/armv7/miniroot-wandboard-62.fs
-Artturi
Quoted 20 lines
Quoted 10 lines
undefined instruction
pc : [<8e560348>] lr : [<8e56444c>]reloc pc : [<
15de4348>] lr : [<15de844c>]
sp :8f57af10ip :8ffc2474fp :8f57af1c
r10:0000b000r9 :8f57bee0r8 :0000000b
r7 :8ffa1a9dr6 :8ffa16adr5 :8e56f0d0r4 :8e56e88a
r3 :8e56dac8r2 : 00000001 r1 : 00000000 r0 : 00000000
Flags: nZCv IRQs off FIQs off ModeSVC_32
Resetting CPU ...Quoted 5 lines
resetting ...
(undefined instruction is used to reset as efi reset was not present in earlier U-Boot versions).
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-boot
PATCH v3 11/18 efi_loader: make efi_disk_create_partitions a global symbol
Quoted 40 lines · Artturi Alm
Quoted 39 lines · Heinrich Schuchardt
Quoted 38 lines · Jonathan Gray
Quoted 10 lines · Heinrich Schuchardt
Up to now we have been using
efi_disk_create_partitions()to create partitions for block devices that existed before starting an EFI application.We need to call it for block devices created by EFI applications at run time. The EFI application will define the handle for the block device and install a device path protocol on it. We have to use this device path as stem for the partition device paths.
Quoted 6 lines
Signed-off-by Heinrich Schuchardt <[email protected]>---
v3
fix typos in comments
v2
no changebreakage on mx6cuboxi with OpenBSD bootarm.efi, bisects to
commit
64e4db0f119151a1345e1da19d152eda550394e7Author: Heinrich Schuchardt <[email protected]> AuthorDate: Fri Jan 19 20:24:47 2018 +0100 Commit: Alexander Graf <[email protected]> CommitDate: Mon Jan 22 23:09:14 2018 +0100
efi_loader: makeefi_disk_create_partitionsa global symbol Up to now we have been usingefi_disk_create_partitions()to create partitions for block devices that existed before starting an EFI application.
We need to call it for block devices created by EFI applications at run time. The EFI application will define the handle for the block device and install a device path protocol on it. We have to use this device path as stem for the partition device paths.Signed-off-by Heinrich Schuchardt <[email protected]>Signed-off-by Alexander Graf <[email protected]>
Quoted 1 line
Quoted 1 line
Quoted 1 line
with master as of
e24bd1e79e223aa89854c0be95a53e2d538144a5
Resolved with patchefi_loader: correct efi_disk_register
https://lists.denx.de/pipermail/u-boot/2018-February/320035.html
Thanks for reporting the problem.
Could you, please, confirm the fix works for you.
Best regards
Heinrich
PATCH v3 12/18 efi_loader: correct EFI_BLOCK_IO_PROTOCOL definitions
In reply to Heinrich SchuchardtAdd the revision constants.
Depending on the revision additional fields are needed in the media descriptor.
Use efi_uintn_t for number of bytes to read or write.
---
v3
add more comments for struct efi_block_io_media
v2
no change
--- include/efi_api.h | 12 ++++++++++-- lib/efi_loader/efi_disk.c | 8 ++++---- 2 files changed, 14 insertions(+), 6 deletions(-)
include/efi_api.h +10 -2
@@ -422,18 +422,26 @@ struct efi_block_io_mediau32 io_align;u8 pad2[4 ];u64 last_block; +/* Added in revision 2 of the protocol */ +u64 lowest_aligned_lba; +u32 logical_blocks_per_physical_block; +/* Added in revision 3 of the protocol */ +u32 optimal_transfer_length_granualarity; }; +#define EFI_BLOCK_IO_PROTOCOL_REVISION2 0x00020001 +#define EFI_BLOCK_IO_PROTOCOL_REVISION3 0x0002001f +struct efi_block_io {u64 revision;struct efi_block_io_media *media; efi_status_t (EFIAPI *reset)(struct efi_block_io *this, char extended_verification); efi_status_t (EFIAPI *read_blocks)(struct efi_block_io *this, - u32 media_id, u64 lba, unsigned long buffer_size, + u32 media_id, u64 lba, efi_uintn_t buffer_size, void *buffer); efi_status_t (EFIAPI *write_blocks)(struct efi_block_io *this, - u32 media_id, u64 lba, unsigned long buffer_size, + u32 media_id, u64 lba, efi_uintn_t buffer_size, void *buffer); efi_status_t (EFIAPI *flush_blocks)(struct efi_block_io *this); };
lib/efi_loader/efi_disk.c +4 -4
@@ -91,7 +91,7 @@ static efi_status_t efi_disk_rw_blocks(struct efi_block_io *this, } static efi_status_t EFIAPI efi_disk_read_blocks(struct efi_block_io *this, -u32 media_id,u64 lba,unsigned long buffer_size, +u32 media_id,u64 lba,efi_uintn_t buffer_size,void *buffer) {void *real_buffer = buffer;
@@ -112,7 +112,7 @@ static efi_status_t EFIAPI efi_disk_read_blocks(struct efi_block_io *this, real_buffer = efi_bounce_buffer;#endif -EFI_ENTRY ("%p, %x, %" PRIx64", %lx, %p" , this, media_id, lba, +EFI_ENTRY ("%p, %x, %" PRIx64", %zx, %p" , this, media_id, lba, buffer_size, buffer); r = efi_disk_rw_blocks(this, media_id, lba, buffer_size, real_buffer,
@@ -126,7 +126,7 @@ static efi_status_t EFIAPI efi_disk_read_blocks(struct efi_block_io *this, } static efi_status_t EFIAPI efi_disk_write_blocks(struct efi_block_io *this, -u32 media_id,u64 lba,unsigned long buffer_size, +u32 media_id,u64 lba,efi_uintn_t buffer_size,void *buffer) {void *real_buffer = buffer;
@@ -147,7 +147,7 @@ static efi_status_t EFIAPI efi_disk_write_blocks(struct efi_block_io *this, real_buffer = efi_bounce_buffer;#endif -EFI_ENTRY ("%p, %x, %" PRIx64", %lx, %p" , this, media_id, lba, +EFI_ENTRY ("%p, %x, %" PRIx64", %zx, %p" , this, media_id, lba, buffer_size, buffer);/* Populate bounce buffer if necessary */
Signature · 1 line
2.14.2
PATCH v3 13/18 efi_loader: provide function to get last node of a device path
In reply to Heinrich SchuchardtOn a block device and its partitions the same protocols can be installed. To tell the apart we can use the type of the last node of the device path which is not the end node.
The patch provides a utility function to find this last node.
---
v3
no change
v2
no change
--- include/efi_loader.h | 3 +++ lib/efi_loader/efi_device_path.c | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+)
include/efi_loader.h +3 -0
@@ -310,6 +310,9 @@ struct efi_device_path *efi_dp_from_eth(void);struct efi_device_path *efi_dp_from_mem (uint32_t mem_type,uint64_t start_address,uint64_t end_address); +/* Determine the last device path node that is not the end node. */ +const struct efi_device_path *efi_dp_last_node ( +const struct efi_device_path *dp);efi_status_t efi_dp_split_file_path (struct efi_device_path *full_path,struct efi_device_path **device_path,struct efi_device_path **file_path);
lib/efi_loader/efi_device_path.c +20 -0
@@ -208,6 +208,26 @@ struct efi_object *efi_dp_find_obj(struct efi_device_path *dp,return efiobj; } +/* +* Determine the last device path node that is not the end node. +* +* @dp device path +* @return last node before the end node if it exists +* otherwise NULL +*/ +const struct efi_device_path *efi_dp_last_node (const struct efi_device_path *dp) +{ +struct efi_device_path *ret; + +if (!dp || dp->type ==DEVICE_PATH_TYPE_END ) +return NULL ; +while (dp) { + ret = (struct efi_device_path *)dp; + dp =efi_dp_next (dp); + } +return ret; +} +/* return size not including End node: */ unsigned efi_dp_size (const struct efi_device_path *dp) {
Signature · 1 line
2.14.2
PATCH v3 14/18 efi_loader: provide link between devices and EFI handles
In reply to Heinrich SchuchardtU-Boot devices and EFI handles can be related, e.g. an IDE disk relates to a handle with the EFI_BLOCK_IO_PROTOCOL. Provide a pointer to store this link.
---
v3
Don't add an unused handle field to struct udevice.
v2
no change
--- include/efi_loader.h | 2 ++ lib/efi_loader/efi_boottime.c | 1 + 2 files changed, 3 insertions(+)
include/efi_loader.h +2 -0
@@ -139,6 +139,8 @@ struct efi_object {struct list_head protocols;/* The object spawner can either use this for data or as identifier */ void *handle; +/* Device */ +struct udevice *dev; };/**
lib/efi_loader/efi_boottime.c +1 -0
@@ -361,6 +361,7 @@ efi_status_t efi_create_handle(void **handle) (void **)&obj);if (r !=EFI_SUCCESS )return r; +memset (obj,0 ,sizeof (struct efi_object ));efi_add_handle (obj); *handle = obj->handle;return r;
Signature · 1 line
2.14.2
PATCH v3 14/18 efi_loader: provide link between devices and EFI handles
Quoted 20 lines · Heinrich Schuchardt
U-Boot devices and EFI handles can be related, e.g. an IDE disk relates to a handle with the
EFI_BLOCK_IO_PROTOCOL. Provide a pointer to store this link.Signed-off-by Heinrich Schuchardt <[email protected]>---
v3
Don't add an unused handle field to struct udevice.
v2
no change--- include/efi_loader.h | 2 ++ lib/efi_loader/efi_boottime.c | 1 + 2 files changed, 3 insertions(+)include/efi_loader.h +0
-0
include/efi_loader.h struct efi_object { · line 143
Quoted 5 lines
include/efi_loader.h +2
-0@@ -139,6 +139,8 @@ struct efi_object {struct list_head protocols;/* The object spawner can either use this for data or as identifier */ void *handle; +/* Device */ +struct udevice *dev;
I still don't think you need this.
lib/efi_loader/efi_boottime.c efi_status_t efi_create_handle(void **handle) · line 364
Quoted 12 lines
include/efi_loader.h +0
-0};/** lib/efi_loader/efi_boottime.c +1
-0@@ -361,6 +361,7 @@ efi_status_t efi_create_handle(void **handle) (void **)&obj);if (r !=EFI_SUCCESS )return r; +memset (obj,0 ,sizeof (struct efi_object ));
And without change you don't need the memset either :)
Alex
Quoted 4 lines
lib/efi_loader/efi_boottime.c +0
-0efi_add_handle (obj); *handle = obj->handle;return r;
PATCH v3 14/18 efi_loader: provide link between devices and EFI handles
Quoted 18 lines · Alexander Graf
Quoted 15 lines · Heinrich Schuchardt
U-Boot devices and EFI handles can be related, e.g. an IDE disk relates to a handle with the
EFI_BLOCK_IO_PROTOCOL. Provide a pointer to store this link.Signed-off-by Heinrich Schuchardt <[email protected]>---
v3
Don't add an unused handle field to struct udevice.
v2
no change--- include/efi_loader.h | 2 ++ lib/efi_loader/efi_boottime.c | 1 + 2 files changed, 3 insertions(+)
Quoted 12 lines
include/efi_loader.h struct efi_object { · line 143
Quoted 10 lines
include/efi_loader.h +2
-0@@ -139,6 +139,8 @@ struct efi_object {struct list_head protocols;/* The object spawner can either use this for data or as identifier */ void *handle; +/* Device */ +struct udevice *dev;I still don't think you need this.
The stop method of the driver binding protocol we will call the unbind function of the EFI block driver. In the unbind function we need the the reference to delete the driver.
On use case is calling sanunhook for an iSCSI device in the iPXE application.
I must admit that I have not yet implemented the unbinding.
Best regards
Heinrich
Quoted 24 lines
lib/efi_loader/efi_boottime.c efi_status_t efi_create_handle(void **handle) · line 364
Quoted 13 lines
include/efi_loader.h +0
-0};/** lib/efi_loader/efi_boottime.c +1
-0@@ -361,6 +361,7 @@ efi_status_t efi_create_handle(void **handle) (void **)&obj);if (r !=EFI_SUCCESS )return r; +memset (obj,0 ,sizeof (struct efi_object ));And without change you don't need the memset either :)
Alex
Quoted 4 lines
lib/efi_loader/efi_boottime.c +0
-0efi_add_handle (obj); *handle = obj->handle;return r;
PATCH v3 14/18 efi_loader: provide link between devices and EFI handles
Quoted 33 lines · Heinrich Schuchardt
Quoted 18 lines · Alexander Graf
Quoted 15 lines · Heinrich Schuchardt
U-Boot devices and EFI handles can be related, e.g. an IDE disk relates to a handle with the
EFI_BLOCK_IO_PROTOCOL. Provide a pointer to store this link.Signed-off-by Heinrich Schuchardt <[email protected]>---
v3
Don't add an unused handle field to struct udevice. v2
no change
---
include/efi_loader.h | 2 ++lib/efi_loader/efi_boottime.c| 1 +2 files changed, 3 insertions(+)Quoted 13 lines
Quoted 11 lines
include/efi_loader.h +0
-0@@ -139,6 +139,8 @@ struct efi_object { struct list_head protocols; /* The object spawner can either use this for data or asidentifier */
void *handle;
+ /* Device */
+ struct udevice *dev;I still don't think you need this.
Quoted 8 lines
The stop method of the driver binding protocol we will call the unbind function of the EFI block driver. In the unbind function we need the the reference to delete the driver.
On use case is calling sanunhook for an iSCSI device in the iPXE application.
I must admit that I have not yet implemented the unbinding.
Unbinding is such an unusual slow-path that I think it's perfectly reasonable to just loop through all udevices and just search for the one you're looking for.
So I'll just drop this patch for now.
Alex
PATCH v3 15/18 efi_loader: add check_tpl parameter to efi_signal_event
In reply to Heinrich SchuchardtIn ExitBootServices we need to signal events irrespective of the current TPL level. A new parameter check_tpl is added to efi_signal_event().
Function efi_console_timer_notify() gets some comments.
---
v3
new patch
--- include/efi_loader.h | 2 +- lib/efi_loader/efi_boottime.c | 15 ++++++++------- lib/efi_loader/efi_console.c | 14 +++++++++++--- 3 files changed, 20 insertions(+), 11 deletions(-)
include/efi_loader.h +1 -1
@@ -240,7 +240,7 @@ efi_status_t efi_create_event(uint32_t type, efi_uintn_t notify_tpl,efi_status_t efi_set_timer (struct efi_event *event,enum efi_timer_delay type,uint64_t trigger_time);/* Call this to signal an event */ -void efi_signal_event (struct efi_event *event); +void efi_signal_event (struct efi_event *event,bool check_tpl);/* open file system: */ struct efi_simple_file_system_protocol *efi_simple_file_system(
lib/efi_loader/efi_boottime.c +8 -7
@@ -148,13 +148,14 @@ const char *__efi_nesting_dec(void)* For the SignalEvent service see efi_signal_event_ext. * * @event event to signal +* @check_tpl check the TPL level */ -void efi_signal_event (struct efi_event *event) +void efi_signal_event (struct efi_event *event,bool check_tpl) {if (event->notify_function) { event->is_queued = true;/* Check TPL */ -if (efi_tpl >= event->notify_tpl) +if (check_tpl && efi_tpl >= event->notify_tpl)return ;EFI_CALL_VOID (event->notify_function (event, event->notify_context));
@@ -564,7 +565,7 @@ void efi_timer_check(void)if (!efi_events[i].type)continue ;if (efi_events[i].is_queued) -efi_signal_event (&efi_events[i]); +efi_signal_event (&efi_events[i], true);if (!(efi_events[i].type &EVT_TIMER ) || now < efi_events[i].trigger_next)continue ;
@@ -580,7 +581,7 @@ void efi_timer_check(void)continue ; } efi_events[i].is_signaled = true; -efi_signal_event (&efi_events[i]); +efi_signal_event (&efi_events[i], true); }WATCHDOG_RESET (); }
@@ -689,7 +690,7 @@ known_event:if (!event[i]->type || event[i]->type &EVT_NOTIFY_SIGNAL )return EFI_EXIT (EFI_INVALID_PARAMETER );if (!event[i]->is_signaled) -efi_signal_event (event[i]); +efi_signal_event (event[i], true); }/* Wait for signal */
@@ -739,7 +740,7 @@ static efi_status_t EFIAPI efi_signal_event_ext(struct efi_event *event)break ; event->is_signaled = true;if (event->type &EVT_NOTIFY_SIGNAL ) -efi_signal_event (event); +efi_signal_event (event, true);break ; }return EFI_EXIT (EFI_SUCCESS );
@@ -796,7 +797,7 @@ static efi_status_t EFIAPI efi_check_event(struct efi_event *event)if (!event->type || event->type &EVT_NOTIFY_SIGNAL )break ;if (!event->is_signaled) -efi_signal_event (event); +efi_signal_event (event, true);if (event->is_signaled)return EFI_EXIT (EFI_SUCCESS );return EFI_EXIT (EFI_NOT_READY );
lib/efi_loader/efi_console.c +11 -3
@@ -482,18 +482,26 @@ static void EFIAPI efi_key_notify(struct efi_event *event, void *context) { } +/* +* Notification function of the console timer event. +* +* event: console timer event +* context: not used +*/ static void EFIAPI efi_console_timer_notify(struct efi_event *event,void *context) {EFI_ENTRY ("%p, %p" , event, context); + +/* Check if input is available */ if (tstc ()) { +/* Queue the wait for key event */ efi_con_in.wait_for_key->is_signaled = true; -efi_signal_event (efi_con_in.wait_for_key); - } +efi_signal_event (efi_con_in.wait_for_key, true); + }EFI_EXIT (EFI_SUCCESS ); } -/* This gets called from do_bootefi_exec(). */ int efi_console_register (void ) {
Signature · 1 line
2.14.2
PATCH v3 16/18 efi_loader: fix ExitBootServices
In reply to Heinrich SchuchardtThis patch lets the implementation of ExitBootServices conform to the UEFI standard.
The timer events must be disabled before calling the notification functions of the exit boot services events.
The boot services must be disabled in the system table.
The handles in the system table should be defined as efi_handle_t.
---
v3
Use efi_signal_event() to signal ExitBootServices event.
v2
new patch
--- include/efi_api.h | 6 +++--- lib/efi_loader/efi_boottime.c | 34 +++++++++++++++++++++++++++++----- 2 files changed, 32 insertions(+), 8 deletions(-)
include/efi_api.h +3 -3
@@ -245,11 +245,11 @@ struct efi_system_table {struct efi_table_hdr hdr;unsigned long fw_vendor;/* physical addr of wchar_t vendor string */ u32 fw_revision; -unsigned long con_in_handle; +efi_handle_t con_in_handle;struct efi_simple_input_interface *con_in; -unsigned long con_out_handle; +efi_handle_t con_out_handle;struct efi_simple_text_output_protocol *con_out; -unsigned long stderr_handle; +efi_handle_t stderr_handle;struct efi_simple_text_output_protocol *std_err;struct efi_runtime_services *runtime;struct efi_boot_services *boottime;
lib/efi_loader/efi_boottime.c +29 -5
@@ -1663,12 +1663,16 @@ static void efi_exit_caches(void) }/* -* Stop boot services. +* Stop all boot services. * * This function implements the ExitBootServices service. * See the Unified Extensible Firmware Interface (UEFI) specification * for details. * +* All timer events are disabled. +* For exit boot services events the notification function is called. +* The boot services are disabled in the system table. +* * @image_handle handle of the loaded image * @map_key key of the memory map * @return status code
@@ -1680,16 +1684,22 @@ static efi_status_t EFIAPI efi_exit_boot_services(void *image_handle,EFI_ENTRY ("%p, %ld" , image_handle, map_key); +/* Make sure that notification functions are not called anymore */ + efi_tpl =TPL_HIGH_LEVEL ; + +/* Check if ExitBootServices has already been called */ +if (!systab.boottime) +return EFI_EXIT (EFI_SUCCESS ); +/* Notify that ExitBootServices is invoked. */ for (i =0 ; i <ARRAY_SIZE (efi_events); ++i) {if (efi_events[i].type !=EVT_SIGNAL_EXIT_BOOT_SERVICES )continue ; -efi_signal_event (&efi_events[i]); + efi_events[i].is_signaled = true; +efi_signal_event (&efi_events[i], false); } -/* Make sure that notification functions are not called anymore */ - efi_tpl =TPL_HIGH_LEVEL ; -/* XXX Should persist EFI variables here */ +/* TODO Should persist EFI variables here */ board_quiesce_devices ();
@@ -1699,6 +1709,20 @@ static efi_status_t EFIAPI efi_exit_boot_services(void *image_handle,/* This stops all lingering devices */ bootm_disable_interrupts (); +/* Disable boottime services */ + systab.con_in_handle =NULL ; + systab.con_in =NULL ; + systab.con_out_handle =NULL ; + systab.con_out =NULL ; + systab.stderr_handle =NULL ; + systab.std_err =NULL ; + systab.boottime =NULL ; + +/* Recalculate CRC32 */ + systab.hdr.crc32 =0 ; + systab.hdr.crc32 =crc32 (0 , (const unsigned char *)&systab, +sizeof (struct efi_system_table )); +/* Give the payload some time to boot */ efi_set_watchdog (0 );WATCHDOG_RESET ();
Signature · 1 line
2.14.2
PATCH v3 17/18 efi_driver: EFI block driver
In reply to Heinrich SchuchardtThis patch provides
* a uclass for EFI drivers
* a EFI driver for block devices
For each EFI driver the uclass
* creates a handle
* adds the driver binding protocol
The uclass provides the bind, start, and stop entry points for the driver binding protocol.
In bind() and stop() it checks if the controller implements the protocol supported by the EFI driver. In the start() function it calls the bind() function of the EFI driver. In the stop() function it destroys the child controllers.
The EFI block driver binds to controllers implementing the block io protocol.
When the bind function of the EFI block driver is called it creates a new U-Boot block device. It installs child handles for all partitions and installs the simple file protocol on these.
The read and write functions of the EFI block driver delegate calls to the controller that it is bound to.
A usage example is as following:
U-Boot loads the iPXE snp.efi executable. iPXE connects an iSCSI drive and exposes a handle with the block IO protocol. It calls ConnectController.
Now the EFI block driver installs the partitions with the simple file protocol.
iPXE uses the simple file protocol to load Grub or the Linux Kernel.
---
v3
Initalize EFI uclass from bootefi command. Fix typos.
v2
Print to console only in debug mode. Provide more comments.
Add commit message.
--- cmd/bootefi.c | 3 + drivers/block/blk-uclass.c | 4 +- include/blk.h | 1 + include/config_fallbacks.h | 1 + include/dm/uclass-id.h | 1 + include/efi_driver.h | 30 ++++ include/efi_loader.h | 2 + lib/Makefile | 1 + lib/efi_driver/Makefile | 13 ++ lib/efi_driver/efi_block_device.c | 175 ++++++++++++++++++++ lib/efi_driver/efi_uclass.c | 330 ++++++++++++++++++++++++++++++++++++++ 11 files changed, 560 insertions(+), 1 deletion(-) create mode 100644 include/efi_driver.h create mode 100644 lib/efi_driver/Makefile create mode 100644 lib/efi_driver/efi_block_device.c create mode 100644 lib/efi_driver/efi_uclass.c
cmd/bootefi.c +3 -0
@@ -32,6 +32,9 @@ static void efi_init_obj_list(void) { efi_obj_list_initalized =1 ; +/* Initialize EFI driver uclass */ +efi_driver_init (); +efi_console_register ();#ifdef CONFIG_PARTITIONS efi_disk_register ();
drivers/block/blk-uclass.c +3 -1
@@ -24,6 +24,7 @@ static const char *if_typename_str[IF_TYPE_COUNT] = { [IF_TYPE_HOST] = "host", [IF_TYPE_SYSTEMACE] = "ace", [IF_TYPE_NVME] = "nvme", + [IF_TYPE_EFI] = "efi", };static enum uclass_id if_type_uclass_id[IF_TYPE_COUNT ] = {
@@ -36,8 +37,9 @@ static enum uclass_id if_type_uclass_id[IF_TYPE_COUNT] = { [IF_TYPE_SD] = UCLASS_INVALID, [IF_TYPE_SATA] = UCLASS_AHCI, [IF_TYPE_HOST] = UCLASS_ROOT, - [IF_TYPE_NVME] = UCLASS_NVME, [IF_TYPE_SYSTEMACE] = UCLASS_INVALID, + [IF_TYPE_NVME] = UCLASS_NVME, + [IF_TYPE_EFI] = UCLASS_EFI, };static enum if_type if_typename_to_iftype (const char *if_typename)
include/blk.h +1 -0
@@ -34,6 +34,7 @@ enum if_type {IF_TYPE_HOST ,IF_TYPE_SYSTEMACE ,IF_TYPE_NVME , +IF_TYPE_EFI , IF_TYPE_COUNT, /* Number of interface types */ };
include/config_fallbacks.h +1 -0
@@ -52,6 +52,7 @@defined (CONFIG_MMC ) || \defined (CONFIG_NVME ) || \defined (CONFIG_SYSTEMACE ) || \ + (defined (CONFIG_EFI_LOADER ) && !defined (CONFIG_SPL_BUILD )) || \ defined(CONFIG_SANDBOX)#define HAVE_BLOCK_DEVICE #endif
include/dm/uclass-id.h +1 -0
@@ -34,6 +34,7 @@ enum uclass_id {UCLASS_CROS_EC ,/* Chrome OS EC */ UCLASS_DISPLAY ,/* Display (e.g. DisplayPort, HDMI) */ UCLASS_DMA ,/* Direct Memory Access */ +UCLASS_EFI ,/* EFI managed devices */ UCLASS_ETH ,/* Ethernet device */ UCLASS_GPIO ,/* Bank of general-purpose I/O pins */ UCLASS_FIRMWARE, /* Firmware */
include/efi_driver.h new file +30 -0
@@ -0,0 +1,30 @@ +/* +* EFI application loader +* +* Copyright (c) 2017 Heinrich Schuchardt +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +#ifndef _EFI_DRIVER_H +#define _EFI_DRIVER_H 1 + +#include <common.h> +#include <dm.h> +#include <efi_loader.h> + +struct efi_driver_ops { +const efi_guid_t *protocol; +const efi_guid_t *child_protocol; +int (*bind)(efi_handle_t handle,void *interface); +}; + +/* +* This structure adds internal fields to the driver binding protocol. +*/ +struct efi_driver_binding_extended_protocol { +struct efi_driver_binding_protocol bp; +const struct efi_driver_ops *ops; +}; + +#endif /* _EFI_DRIVER_H */
include/efi_loader.h +2 -0
@@ -271,6 +271,8 @@ efi_status_t efi_get_memory_map(efi_uintn_t *memory_map_size,/* Adds a range into the EFI memory map */ uint64_t efi_add_memory_map (uint64_t start,uint64_t pages,int memory_type,bool overlap_only_ram); +/* Called by board init to initialize the EFI drivers */ +int efi_driver_init (void );/* Called by board init to initialize the EFI memory map */ int efi_memory_init (void );/* Adds new or overrides configuration table entry to the system table */
lib/Makefile +1 -0
@@ -8,6 +8,7 @@ ifndef CONFIG_SPL_BUILD obj-$(CONFIG_EFI) += efi/ +obj-$(CONFIG_EFI_LOADER) += efi_driver/ obj-$(CONFIG_EFI_LOADER) += efi_loader/ obj-$(CONFIG_EFI_LOADER) += efi_selftest/ obj-$(CONFIG_LZMA) += lzma/
lib/efi_driver/Makefile new file +13 -0
@@ -0,0 +1,13 @@ +# +# (C) Copyright 2017 Heinrich Schuchardt +# +# SPDX-License-Identifier: GPL-2.0+ +# + +# This file only gets included with CONFIG_EFI_LOADER set, so all +# object inclusion implicitly depends on it + +obj-y += efi_uclass.o +ifeq ($(CONFIG_BLK)$(CONFIG_PARTITIONS),yy) +obj-y += efi_block_device.o +endif
lib/efi_driver/efi_block_device.c new file +175 -0
175 lines not on this page · raw message
lib/efi_driver/efi_uclass.c new file +330 -0
330 lines not on this page · raw message
Signature · 1 line
2.14.2
PATCH v3 17/18 efi_driver: EFI block driver
Quoted 342 lines · Heinrich Schuchardt
This patch provides
* a uclass for EFI drivers
* a EFI driver for block devicesFor each EFI driver the uclass
* creates a handle
* adds the driver binding protocolThe uclass provides the bind, start, and stop entry points for the driver binding protocol.
In
bind()andstop()it checks if the controller implements the protocol supported by the EFI driver. In thestart()function it calls thebind()function of the EFI driver. In thestop()function it destroys the child controllers.The EFI block driver binds to controllers implementing the block io protocol.
When the bind function of the EFI block driver is called it creates a new U-Boot block device. It installs child handles for all partitions and installs the simple file protocol on these.
The read and write functions of the EFI block driver delegate calls to the controller that it is bound to.
A usage example is as following:
U-Boot loads the iPXE snp.efi executable. iPXE connects an iSCSI drive and exposes a handle with the block IO protocol. It calls ConnectController.
Now the EFI block driver installs the partitions with the simple file protocol.
iPXE uses the simple file protocol to load Grub or the Linux Kernel.
Signed-off-by Heinrich Schuchardt <[email protected]>---
v3
Initalize EFI uclass from bootefi command. Fix typos.
v2
Print to console only in debug mode. Provide more comments.
Add commit message.--- cmd/bootefi.c | 3 + drivers/block/blk-uclass.c | 4 +- include/blk.h | 1 + include/config_fallbacks.h | 1 + include/dm/uclass-id.h | 1 + include/efi_driver.h | 30 ++++ include/efi_loader.h | 2 + lib/Makefile | 1 + lib/efi_driver/Makefile | 13 ++ lib/efi_driver/efi_block_device.c | 175 ++++++++++++++++++++ lib/efi_driver/efi_uclass.c | 330 ++++++++++++++++++++++++++++++++++++++ 11 files changed, 560 insertions(+), 1 deletion(-) create mode 100644 include/efi_driver.h create mode 100644 lib/efi_driver/Makefile create mode 100644 lib/efi_driver/efi_block_device.c create mode 100644 lib/efi_driver/efi_uclass.ccmd/bootefi.c +3
-0@@ -32,6 +32,9 @@ static void efi_init_obj_list(void) { efi_obj_list_initalized =1 ; +/* Initialize EFI driver uclass */ +efi_driver_init (); +efi_console_register ();#ifdef CONFIG_PARTITIONS efi_disk_register ();drivers/block/blk-uclass.c +3
-1@@ -24,6 +24,7 @@ static const char *if_typename_str[IF_TYPE_COUNT] = { [IF_TYPE_HOST] = "host", [IF_TYPE_SYSTEMACE] = "ace", [IF_TYPE_NVME] = "nvme", + [IF_TYPE_EFI] = "efi", };static enum uclass_id if_type_uclass_id[IF_TYPE_COUNT ] = {@@ -36,8 +37,9 @@ static enum uclass_id if_type_uclass_id[IF_TYPE_COUNT] = { [IF_TYPE_SD] = UCLASS_INVALID, [IF_TYPE_SATA] = UCLASS_AHCI, [IF_TYPE_HOST] = UCLASS_ROOT, - [IF_TYPE_NVME] = UCLASS_NVME, [IF_TYPE_SYSTEMACE] = UCLASS_INVALID, + [IF_TYPE_NVME] = UCLASS_NVME, + [IF_TYPE_EFI] = UCLASS_EFI, };static enum if_type if_typename_to_iftype (const char *if_typename)include/blk.h +1
-0@@ -34,6 +34,7 @@ enum if_type {IF_TYPE_HOST ,IF_TYPE_SYSTEMACE ,IF_TYPE_NVME , +IF_TYPE_EFI , IF_TYPE_COUNT, /* Number of interface types */ };include/config_fallbacks.h +1
-0@@ -52,6 +52,7 @@defined (CONFIG_MMC ) || \defined (CONFIG_NVME ) || \defined (CONFIG_SYSTEMACE ) || \ + (defined (CONFIG_EFI_LOADER ) && !defined (CONFIG_SPL_BUILD )) || \ defined(CONFIG_SANDBOX)#define HAVE_BLOCK_DEVICE #endif include/dm/uclass-id.h +1
-0@@ -34,6 +34,7 @@ enum uclass_id {UCLASS_CROS_EC ,/* Chrome OS EC */ UCLASS_DISPLAY ,/* Display (e.g. DisplayPort, HDMI) */ UCLASS_DMA ,/* Direct Memory Access */ +UCLASS_EFI ,/* EFI managed devices */ UCLASS_ETH ,/* Ethernet device */ UCLASS_GPIO ,/* Bank of general-purpose I/O pins */ UCLASS_FIRMWARE, /* Firmware */include/efi_driver.h new file +30
-0@@ -0,0 +1,30 @@ +/* +* EFI application loader +* +* Copyright (c) 2017 Heinrich Schuchardt +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +#ifndef _EFI_DRIVER_H +#define _EFI_DRIVER_H 1 + +#include <common.h> +#include <dm.h> +#include <efi_loader.h> + +struct efi_driver_ops { +const efi_guid_t *protocol; +const efi_guid_t *child_protocol; +int (*bind)(efi_handle_t handle,void *interface); +}; + +/* +* This structure adds internal fields to the driver binding protocol. +*/ +struct efi_driver_binding_extended_protocol { +struct efi_driver_binding_protocol bp; +const struct efi_driver_ops *ops; +}; + +#endif /* _EFI_DRIVER_H */ include/efi_loader.h +2
-0@@ -271,6 +271,8 @@ efi_status_t efi_get_memory_map(efi_uintn_t *memory_map_size,/* Adds a range into the EFI memory map */ uint64_t efi_add_memory_map (uint64_t start,uint64_t pages,int memory_type,bool overlap_only_ram); +/* Called by board init to initialize the EFI drivers */ +int efi_driver_init (void );/* Called by board init to initialize the EFI memory map */ int efi_memory_init (void );/* Adds new or overrides configuration table entry to the system table */ lib/Makefile +1
-0@@ -8,6 +8,7 @@ ifndef CONFIG_SPL_BUILD obj-$(CONFIG_EFI) += efi/ +obj-$(CONFIG_EFI_LOADER) += efi_driver/ obj-$(CONFIG_EFI_LOADER) += efi_loader/ obj-$(CONFIG_EFI_LOADER) += efi_selftest/ obj-$(CONFIG_LZMA) += lzma/lib/efi_driver/Makefile new file +13
-0@@ -0,0 +1,13 @@ +# +# (C) Copyright 2017 Heinrich Schuchardt +# +# SPDX-License-Identifier: GPL-2.0+ +# + +# This file only gets included with CONFIG_EFI_LOADER set, so all +# object inclusion implicitly depends on it + +obj-y += efi_uclass.o +ifeq ($(CONFIG_BLK)$(CONFIG_PARTITIONS),yy) +obj-y += efi_block_device.o +endiflib/efi_driver/efi_block_device.c new file +120
-0@@ -0,0 +1,175 @@ +/* +* EFI block driver +* +* Copyright (c) 2017 Heinrich Schuchardt +* +* SPDX-License-Identifier: GPL-2.0+ +* +* The EFI uclass creates a handle for this driver and installs the +* driver binding protocol on it. +* +* The EFI block driver binds to controllers implementing the block io +* protocol. +* +* When the bind function of the EFI block driver is called it creates a +* new U-Boot block device. It installs child handles for all partitions and +* installs the simple file protocol on these. +* +* The read and write functions of the EFI block driver delegate calls to the +* controller that it is bound to. +* +* A usage example is as following: +* +* U-Boot loads the iPXE snp.efi executable. iPXE connects an iSCSI drive and +* exposes a handle with the block IO protocol. It calls ConnectController. +* +* Now the EFI block driver installs the partitions with the simple file +* protocol. +* +* iPXE uses the simple file protocol to load Grub or the Linux Kernel. +*/ + +#include <efi_driver.h> +#include <dm/root.h> + +static int efi_blk_max_devnum; + +/* +* Read from block device +* +* @dev device +* @blknr first block to be read +* @blkcnt number of blocks to read +* @buffer output buffer +* @return number of blocks transferred +*/ +static ulong efi_bl_read (struct udevice *dev,lbaint_t blknr,lbaint_t blkcnt, +void *buffer) +{ +struct efi_block_io *io = dev->platdata; +efi_status_t ret; + +EFI_PRINT ("%s: read '%s', from block " LBAFU ", " LBAFU " blocks\n" , + __func__, dev->name, blknr, blkcnt); + ret =EFI_CALL (io->read_blocks ( + io, io->media->media_id, (u64 )blknr, + (efi_uintn_t )blkcnt * + (efi_uintn_t )io->media->block_size, buffer)); +EFI_PRINT ("%s: r = %u\n" , __func__, + (unsigned int )(ret & ~EFI_ERROR_MASK )); +if (ret !=EFI_SUCCESS ) +return 0 ; +return blkcnt; +} + +/* +* Write to block device +* +* @dev device +* @blknr first block to be write +* @blkcnt number of blocks to write +* @buffer input buffer +* @return number of blocks transferred +*/ +static ulong efi_bl_write (struct udevice *dev,lbaint_t blknr,lbaint_t blkcnt, +const void *buffer) +{ +struct efi_block_io *io = dev->platdata; +efi_status_t ret; + +EFI_PRINT ("%s: write '%s', from block " LBAFU ", " LBAFU " blocks\n" , + __func__, dev->name, blknr, blkcnt); + ret =EFI_CALL (io->write_blocks ( + io, io->media->media_id, (u64 )blknr, + (efi_uintn_t )blkcnt * + (efi_uintn_t )io->media->block_size, + (void *)buffer)); +EFI_PRINT ("%s: r = %u\n" , __func__, + (unsigned int )(ret & ~EFI_ERROR_MASK )); +if (ret !=EFI_SUCCESS ) +return 0 ; +return blkcnt; +} + +static int efi_bl_bind_partitions (efi_handle_t handle) +{ +struct efi_object *obj =efi_search_obj (handle); +struct blk_desc *desc; +const char *if_typename; + +if (!obj || !obj->dev) +return -ENOENT ; + desc =dev_get_uclass_platdata (obj->dev); + if_typename =blk_get_if_type_name (desc->if_type); + +return efi_disk_create_partitions (handle, desc, if_typename, + desc->devnum, obj->dev->name); +} + +/* +* Create a block device for a handle +* +* @handle handle +* @interface block io protocol +* @return 0 = success +*/ +static int efi_bl_bind (efi_handle_t handle,void *interface) +{ +struct udevice *bdev, *parent =dm_root (); +int ret, devnum; +char name[20 ];
lib/efi_driver/efi_block_device.c line 130
Quoted 10 lines
lib/efi_driver/efi_block_device.c new file +10
-0+struct efi_object *obj =efi_search_obj (handle); +struct efi_block_io *io = interface; +int disks; + +EFI_PRINT ("%s: handle %p, interface %p\n" , __func__, handle, io); + +if (!obj) +return -ENOENT ; + + devnum = efi_blk_max_devnum++;
Can you store this in the "EFI block driver" instance? Maybe you want to pass a pointer to that to the bind function anyway?
lib/efi_driver/efi_block_device.c line 132
Quoted 2 lines
lib/efi_driver/efi_block_device.c new file +2
-0+sprintf (name,"efi#%d" , devnum); +
/* Create U-Boot DM device for the EFI block backing device */
lib/efi_driver/efi_block_device.c line 139
Quoted 7 lines
lib/efi_driver/efi_block_device.c new file +7
-0+ ret =blk_create_device (parent,"efi_blk" , name,IF_TYPE_EFI , devnum, + io->media->block_size, + (lbaint_t )io->media->last_block, &bdev); +if (ret) +return ret; +EFI_PRINT ("%s: block device '%s' created\n" , __func__, bdev->name); + bdev->platdata = interface;
Can you instead create a priv struct that contains the pointer to interface as a member? Then use that instead of platdata.
Platdata really is supposed to store information that lives in device tree these days. Parameters to your device basically.
lib/efi_driver/efi_block_device.c line 140
Quoted 1 line
lib/efi_driver/efi_block_device.c new file +1
-0+ obj->dev = bdev;
Please integrate my patches to remove all references to obj->dev.
lib/efi_driver/efi_block_device.c line 143
Quoted 3 lines
lib/efi_driver/efi_block_device.c new file +3
-0+ + ret =blk_prepare_device (bdev); +
/* Also create EFI devices for all partitions on top of the EFI block device */
lib/efi_driver/efi_block_device.c line 147
Quoted 4 lines
lib/efi_driver/efi_block_device.c new file +4
-0+ disks =efi_bl_bind_partitions (handle); +EFI_PRINT ("Found %d partitions\n" , disks); + +return 0 ;
Alex
PATCH v3 18/18 efi_selftest: provide a test for block io
In reply to Heinrich Schuchardt---
v3
Provide two separate unit tests. One using Exit to return from an image, the other using return.
v2
no change
--- lib/efi_selftest/Makefile | 4 + lib/efi_selftest/efi_selftest_block_device.c | 395 +++++++++++++++++++++++++++ lib/efi_selftest/efi_selftest_disk_image.h | 69 +++++ 3 files changed, 468 insertions(+) create mode 100644 lib/efi_selftest/efi_selftest_block_device.c create mode 100644 lib/efi_selftest/efi_selftest_disk_image.h
lib/efi_selftest/Makefile +4 -0
@@ -21,3 +21,7 @@ efi_selftest_textoutput.o \ efi_selftest_tpl.o \ efi_selftest_util.o \ efi_selftest_watchdog.o + +ifeq ($(CONFIG_BLK)$(CONFIG_PARTITIONS),yy) +obj-$(CONFIG_CMD_BOOTEFI_SELFTEST) += efi_selftest_block_device.o +endif
lib/efi_selftest/efi_selftest_block_device.c new file +395 -0
395 lines not on this page · raw message
lib/efi_selftest/efi_selftest_disk_image.h new file +69 -0
69 lines not on this page · raw message
Signature · 1 line
2.14.2