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

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>

diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c
index d4a0edb458b844c4faad2d1b7d229ebf0dae1825..037f8594a72772e3a42191e9d7450aed0fa6b389 100644 (file)
--- a/lib/efi_loader/efi_disk.c
+++ b/lib/efi_loader/efi_disk.c
@@ -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);