dm: Remove children when parent is removed by flags

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 <[email protected]>

1 files changed, 10 insertions, 1 deletions

diff --git a/drivers/core/device-remove.c b/drivers/core/device-remove.c
index 03ef49c4db0..557afb8d817 100644
--- a/drivers/core/device-remove.c
+++ b/drivers/core/device-remove.c
@@ -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;