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

dm: core: Add dm_remove_devices_flags() and hook it into device_remove()

Browse Source 
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 <sr@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Stefan Roese 2017-03-27 10:58:53 +02:00 committed by Simon Glass
parent 706865afe5
commit bc85aa4030
3 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;

9
drivers/core/root.c
View File

@ -184,6 +184,15 @@ int dm_uninit(void)
return 0;
}
#if CONFIG_IS_ENABLED(DM_DEVICE_REMOVE)
int dm_remove_devices_flags(uint flags)
{
device_remove(dm_root(), flags);
return 0;
}
#endif
int dm_scan_platdata(bool pre_reloc_only)
{
int ret;

16
include/dm/root.h
View File

@ -115,4 +115,20 @@ int dm_init(void);
*/
int dm_uninit(void);
#if CONFIG_IS_ENABLED(DM_DEVICE_REMOVE)
/**
* dm_remove_devices_flags - Call remove function of all drivers with
* specific removal flags set to selectively
* remove drivers
*
* All devices with the matching flags set will be removed
*
* @flags: Flags for selective device removal
* @return 0 if OK, -ve on error
*/
int dm_remove_devices_flags(uint flags);
#else
static inline int dm_remove_devices_flags(uint flags) { return 0; }
#endif
#endif