Mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-06-02 09:46:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

dm: Remove children when parent is removed by flags

Browse Source 
When dm_remove_devices_active() removes devices using specialised flags
like DM_REMOVE_ACTIVE_ALL, a parent device may match (e.g. MMC has
DM_FLAG_OS_PREPARE) while its children do not. This deactivates the
parent but leaves children activated, an inconsistent state.

Later, when uclass_destroy() calls device_remove() with DM_REMOVE_NORMAL
on the already-deactivated parent, it returns early without touching the
children. The subsequent device_unbind() then fails because the children
are still activated.

Fix this by dropping only the DM_REMOVE_ACTIVE_ALL requirement for child
removal when the parent is being removed. This ensures children are
removed along with their parent, while still preserving other flags like
DM_REMOVE_NON_VITAL so that vital devices remain protected.

Signed-off-by: Simon Glass <simon.glass@canonical.com>
This commit is contained in:
Simon Glass
2026-03-05 19:36:11 -07:00
committed by Tom Rini
parent 714dd2252d
commit 3632b5d63c
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/core/device-remove.c
View File

@@ -219,10 +219,19 @@ int device_remove(struct udevice *dev, uint flags)
cret = flags_remove(flags, drv->flags);
/*
* Remove all children. If this device is being removed due to
* active-DMA or OS-prepare flags, drop the active-flag requirement
* for children so they are removed even without matching active
* flags, since a deactivated device must not have activated
* children. Preserve other flags (e.g. DM_REMOVE_NON_VITAL) so
* that vital children are still protected.
*
* If the child returns EKEYREJECTED, continue. It just means that it
* didn't match the flags.
*/
ret = device_chld_remove(dev, NULL, flags);
ret = device_chld_remove(dev, NULL,
cret ? flags :
(flags & ~DM_REMOVE_ACTIVE_ALL));
if (ret && ret != -EKEYREJECTED)
return ret;