Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-12-01 08:59:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

bootstd: Probe the block device before use

Browse source 
In some cases the block device is obtained but is not probed, since it
is a sibling of the bootdev. Make sure it is probed, so it can be used
without any trouble.

This fixes a bug with virtio, where the device is accessed before it has
been set up by the virtio uclass.

Signed-off-by: Simon Glass <sjg@chromium.org>
Fixes: 201417d700 ("bootstd: Add the bootdev uclass")
Reported-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
This commit is contained in:
Simon Glass 2023-01-28 15:00:19 -07:00 committed by Tom Rini
parent 0041b1c09a
commit 965020c3f7
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
boot/bootdev-uclass.c
View file

@ -309,6 +309,9 @@ int bootdev_get_sibling_blk(struct udevice *dev, struct udevice **blkp)
if (ret) if (ret)
return log_msg_ret("find", ret); return log_msg_ret("find", ret);
} }
ret = device_probe(blk);
if (ret)
return log_msg_ret("act", ret);
*blkp = blk; *blkp = blk;
return 0; return 0;

4
boot/bootflow.c
View file

@ -270,6 +270,10 @@ static int iter_incr(struct bootflow_iter *iter)
if (ret) { if (ret) {
bootflow_iter_set_dev(iter, NULL, 0); bootflow_iter_set_dev(iter, NULL, 0);
} else { } else {
/*
* Probe the bootdev. This does not probe any attached
* block device, since they are siblings
*/
ret = device_probe(dev); ret = device_probe(dev);
log_debug("probe %s %d\n", dev->name, ret); log_debug("probe %s %d\n", dev->name, ret);
if (!log_msg_ret("probe", ret)) if (!log_msg_ret("probe", ret))