diff options
| author | Heinrich Schuchardt <xypron.glpk@gmx.de> | 2017-12-11 12:56:43 +0100 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2018-01-22 23:09:12 +0100 |
| commit | 2bc61b83522b021113028ee19bf4f2a460be4b44 (patch) | |
| tree | fbe96002f9aa74628cda14d29bff6ef376332cd5 | |
| parent | 485c13c7536731991c59f7b3432bc33c9dafb0f0 (diff) | |
efi_loader: create full device path for block devices
When creating the device path of a block device it has to
comprise the block device itself and should not end at
its parent.
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
| -rw-r--r-- | lib/efi_loader/efi_device_path.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c index ccb59337f1..3974fcc624 100644 --- a/lib/efi_loader/efi_device_path.c +++ b/lib/efi_loader/efi_device_path.c @@ -383,7 +383,14 @@ static unsigned dp_part_size(struct blk_desc *desc, int part) unsigned dpsize; #ifdef CONFIG_BLK - dpsize = dp_size(desc->bdev->parent); + { + struct udevice *dev; + int ret = blk_find_device(desc->if_type, desc->devnum, &dev); + + if (ret) + dev = desc->bdev->parent; + dpsize = dp_size(dev); + } #else dpsize = sizeof(ROOT) + sizeof(struct efi_device_path_usb); #endif @@ -411,7 +418,14 @@ static void *dp_part_fill(void *buf, struct blk_desc *desc, int part) disk_partition_t info; #ifdef CONFIG_BLK - buf = dp_fill(buf, desc->bdev->parent); + { + struct udevice *dev; + int ret = blk_find_device(desc->if_type, desc->devnum, &dev); + + if (ret) + dev = desc->bdev->parent; + buf = dp_fill(buf, dev); + } #else /* * We *could* make a more accurate path, by looking at if_type |