Hi Stefan, On 6 April 2017 at 07:29, Stefan Roese <[email protected]> wrote: > This new flag can be added to DM device drivers, which need to do some > final configuration before U-Boot exits and the OS (e.g. Linux) is > started. The remove functions of those drivers will get called at > this stage to do these last-stage configuration steps. > > Signed-off-by: Stefan Roese <[email protected]> > Cc: Simon Glass <[email protected]> > Cc: Bin Meng <[email protected]> > --- > drivers/core/device-remove.c | 17 ++++++++++++----- > include/dm/device.h | 11 ++++++++++- > 2 files changed, 22 insertions(+), 6 deletions(-)
Reviewed-by: Simon Glass <[email protected]> You could perhaps have a separate patch to move the code into flags_remove(), but I suppose it isn't important. nit below. > > diff --git a/drivers/core/device-remove.c b/drivers/core/device-remove.c > index 8b46f3343e..390be5a0d8 100644 > --- a/drivers/core/device-remove.c > +++ b/drivers/core/device-remove.c > @@ -148,6 +148,16 @@ void device_free(struct udevice *dev) > devres_release_probe(dev); > } > > +static int flags_remove(uint flags, uint drv_flags) Can this be bool, and return true/false? > +{ > + if ((flags & DM_REMOVE_NORMAL) || > + (flags & (drv_flags & > + (DM_FLAG_ACTIVE_DMA | DM_FLAG_PRE_OS_FINALIZE)))) What do you think about OS_PREPARE instead? It doesn't really finalize the OS... > + return 1; > + > + return 0; > +} > + > int device_remove(struct udevice *dev, uint flags) > { > const struct driver *drv; > @@ -174,9 +184,7 @@ int device_remove(struct udevice *dev, uint flags) > * 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)))) { > + if (drv->remove && flags_remove(flags, drv->flags)) { > ret = drv->remove(dev); > if (ret) > goto err_remove; > @@ -190,8 +198,7 @@ int device_remove(struct udevice *dev, uint flags) > } > } > > - if ((flags & DM_REMOVE_NORMAL) || > - (flags & (drv->flags & DM_FLAG_ACTIVE_DMA))) { > + if (flags_remove(flags, drv->flags)) { > device_free(dev); > > dev->seq = -1; > diff --git a/include/dm/device.h b/include/dm/device.h > index 079ec57003..c49b8e688e 100644 > --- a/include/dm/device.h > +++ b/include/dm/device.h > @@ -55,6 +55,12 @@ struct driver_info; > #define DM_FLAG_ACTIVE_DMA (1 << 9) > > /* > + * Call driver remove function to do some final configuration, before > + * U-Boot exits and the OS is started > + */ > +#define DM_FLAG_PRE_OS_FINALIZE (1 << 10) > + > +/* > * One or multiple of these flags are passed to device_remove() so that > * a selective device removal as specified by the remove-stage and the > * driver flags can be done. > @@ -66,10 +72,13 @@ enum { > /* Remove devices with active DMA */ > DM_REMOVE_ACTIVE_DMA = DM_FLAG_ACTIVE_DMA, > > + /* Remove devices which need some pre-OS finalization */ > + DM_REMOVE_PRE_OS_FINALIZE = DM_FLAG_PRE_OS_FINALIZE, > + > /* Add more use cases here */ > > /* Remove devices with any active flag */ > - DM_REMOVE_ACTIVE_ALL = DM_REMOVE_ACTIVE_DMA, > + DM_REMOVE_ACTIVE_ALL = DM_REMOVE_ACTIVE_DMA | > DM_REMOVE_PRE_OS_FINALIZE, > }; > > /** > -- > 2.12.2 > Regards, Simon _______________________________________________ U-Boot mailing list [email protected] https://lists.denx.de/listinfo/u-boot
