Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

efi_loader: disk: not create BLK device for BLK(IF_TYPE_EFI_LOADER) devices

Browse source 
When we create an efi_disk device with an UEFI application using driver
binding protocol, the 'efi_driver' framework tries to create
a corresponding block device(UCLASS_BLK/IF_TYPE_EFI). This will lead to
calling a PROBE callback, efi_disk_probe().
In this case, however, we don't need to create another "efi_disk" device
as we already have this device instance.

So we should avoid recursively invoke further processing in the callback
function.

Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
AKASHI Takahiro 2022-04-19 10:05:13 +09:00 committed by Heinrich Schuchardt
parent a9bf024b29
commit 3c809dfed7
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/efi_loader/efi_disk.c
View file

@ -604,6 +604,7 @@ static int efi_disk_probe(void *ctx, struct event *event)
{
struct udevice *dev;
enum uclass_id id;
struct blk_desc *desc;
struct udevice *child;
int ret;
@ -614,9 +615,16 @@ static int efi_disk_probe(void *ctx, struct event *event)
if (id != UCLASS_BLK)
return 0;
ret = efi_disk_create_raw(dev);
if (ret)
return -1;
/*
* avoid creating duplicated objects now that efi_driver
* has already created an efi_disk at this moment.
*/
desc = dev_get_uclass_plat(dev);
if (desc->if_type != IF_TYPE_EFI_LOADER) {
ret = efi_disk_create_raw(dev);
if (ret)
return -1;
}
device_foreach_child(child, dev) {
ret = efi_disk_create_part(child);