Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-21 20:34:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "bootdev: avoid infinite probe loop"

Browse source 
This turns out to be insufficient to fix the problem, since when
bootdev_next_prio() exits, the caller has no idea that this really
is the end. Nor is it, since there may be other devices which should
be checked.

The caller iterates which calls iter_incr() which calls
bootdev_next_prio() again, which finds the same device and the loop
continues.

We never did create a test for this[1], which makes it hard to be
sure which problem was fixed.

The original code had the virtue of staying in the loop looking for a
bootdev, so let's go back to that and try to fix this another way.

A future patch will make bootdev_next_prio() continue after failure
which should provide same effect.

This reverts commit 9d92c418ac.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2024-08-15 14:30:21 -06:00 • committed by Tom Rini
parent 90270e0f71
commit aad8b18a52
1 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
boot/bootdev-uclass.c
View file

@ -632,7 +632,7 @@ int bootdev_next_label(struct bootflow_iter *iter, struct udevice **devp,
int bootdev_next_prio(struct bootflow_iter *iter, struct udevice **devp)
{
struct udevice *dev = *devp, *last_dev = NULL;
struct udevice *dev = *devp;
bool found;
int ret;
@ -682,19 +682,9 @@ int bootdev_next_prio(struct bootflow_iter *iter, struct udevice **devp)
}
} else {
ret = device_probe(dev);
if (!ret)
last_dev = dev;
if (ret) {
log_warning("Device '%s' failed to probe\n",
log_debug("Device '%s' failed to probe\n",
dev->name);
if (last_dev == dev) {
/*
* We have already tried this device
* and it failed to probe. Give up.
*/
return log_msg_ret("probe", ret);
}
last_dev = dev;
dev = NULL;
}
}