From 706865afe54eee83c1f3d7e9ea2f51db8e986d7b Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Mon, 20 Mar 2017 12:51:48 +0100 Subject: dm: core: Add flags parameter to device_remove() This patch adds the flags parameter to device_remove() and changes all calls to this function to provide the default value of DM_REMOVE_NORMAL for "normal" device removal. This is in preparation for the driver specific pre-OS (e.g. DMA cancelling) remove support. Signed-off-by: Stefan Roese Cc: Simon Glass Acked-by: Simon Glass --- drivers/core/device-remove.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'drivers/core/device-remove.c') diff --git a/drivers/core/device-remove.c b/drivers/core/device-remove.c index a7f77b4a21d..b80bf52320e 100644 --- a/drivers/core/device-remove.c +++ b/drivers/core/device-remove.c @@ -46,9 +46,10 @@ static int device_chld_unbind(struct udevice *dev) /** * device_chld_remove() - Stop all device's children * @dev: The device whose children are to be removed + * @pre_os_remove: Flag, if this functions is called in the pre-OS stage * @return 0 on success, -ve on error */ -static int device_chld_remove(struct udevice *dev) +static int device_chld_remove(struct udevice *dev, uint flags) { struct udevice *pos, *n; int ret; @@ -56,7 +57,7 @@ static int device_chld_remove(struct udevice *dev) assert(dev); list_for_each_entry_safe(pos, n, &dev->child_head, sibling_node) { - ret = device_remove(pos); + ret = device_remove(pos, flags); if (ret) return ret; } @@ -151,7 +152,7 @@ void device_free(struct udevice *dev) devres_release_probe(dev); } -int device_remove(struct udevice *dev) +int device_remove(struct udevice *dev, uint flags) { const struct driver *drv; int ret; @@ -169,7 +170,7 @@ int device_remove(struct udevice *dev) if (ret) return ret; - ret = device_chld_remove(dev); + ret = device_chld_remove(dev, flags); if (ret) goto err; -- cgit v1.2.3 From bc85aa4030ab9ccfc1349c320b085a8b792c602e Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Mon, 27 Mar 2017 10:58:53 +0200 Subject: dm: core: Add dm_remove_devices_flags() and hook it into device_remove() The new function dm_remove_devices_flags() is intented for driver specific last-stage cleanup operations before the OS is started. This patch adds this functionality and hooks it into the common device_remove() function. Drivers wanting to use this feature for some last-stage removal calls, need to add one of the DM_REMOVE_xx flags to their driver .flags. Signed-off-by: Stefan Roese Reviewed-by: Simon Glass --- drivers/core/device-remove.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'drivers/core/device-remove.c') diff --git a/drivers/core/device-remove.c b/drivers/core/device-remove.c index b80bf52320e..cc0043b990b 100644 --- a/drivers/core/device-remove.c +++ b/drivers/core/device-remove.c @@ -174,7 +174,13 @@ int device_remove(struct udevice *dev, uint flags) if (ret) goto err; - if (drv->remove) { + /* + * Remove the device if called with the "normal" remove flag set, + * or if the remove flag matches any of the drivers remove flags + */ + if (drv->remove && + ((flags & DM_REMOVE_NORMAL) || + (flags & (drv->flags & DM_FLAG_ACTIVE_DMA)))) { ret = drv->remove(dev); if (ret) goto err_remove; @@ -188,10 +194,13 @@ int device_remove(struct udevice *dev, uint flags) } } - device_free(dev); + if ((flags & DM_REMOVE_NORMAL) || + (flags & (drv->flags & DM_FLAG_ACTIVE_DMA))) { + device_free(dev); - dev->seq = -1; - dev->flags &= ~DM_FLAG_ACTIVATED; + dev->seq = -1; + dev->flags &= ~DM_FLAG_ACTIVATED; + } return ret; -- cgit v1.2.3