[PATCH 18/19] efi_loader: disk: not create BLK device for BLK(IF_TYPE_EFI_LOADER) devices

[AKASHI Takahiro]

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.aka...@linaro.org>
Reviewed-by: Simon Glass <s...@chromium.org>
---
 lib/efi_loader/efi_disk.c | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c
index 8e33af76711f..0ee892c95bf0 100644
--- a/lib/efi_loader/efi_disk.c
+++ b/lib/efi_loader/efi_disk.c
@@ -603,6 +603,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;
 
@@ -616,9 +617,16 @@ static int efi_disk_probe(void *ctx, struct event *event)
                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);
@@ -642,13 +650,17 @@ static int efi_disk_probe(void *ctx, struct event *event)
 static int efi_disk_delete_raw(struct udevice *dev)
 {
        efi_handle_t handle;
+       struct blk_desc *desc;
        struct efi_disk_obj *diskobj;
 
        if (dev_tag_get_ptr(dev, DM_TAG_EFI, (void **)&handle))
                return -1;
 
-       diskobj = container_of(handle, struct efi_disk_obj, header);
-       efi_free_pool(diskobj->dp);
+       desc = dev_get_uclass_plat(dev);
+       if (desc->if_type != IF_TYPE_EFI_LOADER) {
+               diskobj = container_of(handle, struct efi_disk_obj, header);
+               efi_free_pool(diskobj->dp);
+       }
 
        efi_delete_handle(handle);
        dev_tag_del(dev, DM_TAG_EFI);
-- 
2.33.0