leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dm: fix probing of all devices that have u-boot, dm-pre-reloc in SPL/TPL

Browse Source 
Currently, dm_probe_devices checks that the flags of the device contains
DM_FLAG_PRE_RELOC. However DM_FLAG_PRE_RELOC is a driver - and not a
device - flag. This means that the check in pre_reloc_only mode would
always fail.

Instead, what was aimed to be checked is that either the driver of the
device has the flag set, or that the device has the u-boot,dm-pre-reloc
Device Tree property set.

So let's fix the check to allow u-boot,dm-pre-reloc devices to be
probed.

Cc: Quentin Schulz <foss+uboot@0leil.net>
Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
This commit is contained in:
Quentin Schulz 2022-09-22 17:53:25 +02:00 committed by Tom Rini
parent d0ba0ca45a
commit 942918f2ac
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/core/root.c
View File

@ -363,20 +363,22 @@ void *dm_priv_to_rw(void *priv)
static int dm_probe_devices(struct udevice *dev, bool pre_reloc_only) static int dm_probe_devices(struct udevice *dev, bool pre_reloc_only)
{ {
u32 mask = DM_FLAG_PROBE_AFTER_BIND; ofnode node = dev_ofnode(dev);
u32 flags = dev_get_flags(dev);
struct udevice *child; struct udevice *child;
int ret; int ret;
if (pre_reloc_only) if (pre_reloc_only &&
mask |= DM_FLAG_PRE_RELOC; (!ofnode_valid(node) || !ofnode_pre_reloc(node)) &&
!(dev->driver->flags & DM_FLAG_PRE_RELOC))
goto probe_children;
if ((flags & mask) == mask) { if (dev_get_flags(dev) & DM_FLAG_PROBE_AFTER_BIND) {
ret = device_probe(dev); ret = device_probe(dev);
if (ret) if (ret)
return ret; return ret;
} }
probe_children:
list_for_each_entry(child, &dev->child_head, sibling_node) list_for_each_entry(child, &dev->child_head, sibling_node)
dm_probe_devices(child, pre_reloc_only); dm_probe_devices(child, pre_reloc_only);