[PATCH 1/2] dm: core: Add a flag for power domain control on device removal

[PATCH 1/2] dm: core: Add a flag for power domain control on device removal

[Anatolij Gustschin]

In various cases a power domain must stay enabled after device
removal when booting OS (i.e. serial debug console or display).
Add a flag to selectively skip switching off a power domain.

Fixes: 52edfed65de9 ("dm: core: device: switch off power domain after device removal")
Signed-off-by: Anatolij Gustschin <agust@denx.de>
---
 drivers/core/device-remove.c | 5 +++--
 include/dm/device.h          | 6 ++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/core/device-remove.c b/drivers/core/device-remove.c
index 444e34b492..ff5b28cb6a 100644
--- a/drivers/core/device-remove.c
+++ b/drivers/core/device-remove.c
@@ -194,8 +194,9 @@ int device_remove(struct udevice *dev, uint flags)
 		}
 	}
 
-	if (!(drv->flags & DM_FLAG_DEFAULT_PD_CTRL_OFF) &&
-	    (dev != gd->cur_serial_dev))
+	if (!(drv->flags &
+	      (DM_FLAG_DEFAULT_PD_CTRL_OFF | DM_FLAG_REMOVE_WITH_PD_ON)) &&
+	    dev != gd->cur_serial_dev)
 		dev_power_domain_off(dev);
 
 	if (flags_remove(flags, drv->flags)) {
diff --git a/include/dm/device.h b/include/dm/device.h
index ab806d0b7e..a56164b19b 100644
--- a/include/dm/device.h
+++ b/include/dm/device.h
@@ -67,6 +67,12 @@ struct driver_info;
 /* Driver platdata has been read. Cleared when the device is removed */
 #define DM_FLAG_PLATDATA_VALID		(1 << 12)
 
+/*
+ * Device is removed without switching off its power domain. This might
+ * be required, i. e. for serial console (debug) output when booting OS.
+ */
+#define DM_FLAG_REMOVE_WITH_PD_ON	(1 << 13)
+
 /*
  * 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
-- 
2.17.1

[PATCH 2/2] video: meson: keep power domain up after booting

[Anatolij Gustschin]

Add driver flag to skip power domain disabling on device removal.

Fixes: 52edfed65de9 ("dm: core: device: switch off power domain after device removal")
Signed-off-by: Anatolij Gustschin <agust@denx.de>
---
 drivers/video/meson/meson_vpu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/video/meson/meson_vpu.c b/drivers/video/meson/meson_vpu.c
index 4eb66398d0..aa8c0a962f 100644
--- a/drivers/video/meson/meson_vpu.c
+++ b/drivers/video/meson/meson_vpu.c
@@ -210,5 +210,5 @@ U_BOOT_DRIVER(meson_vpu) = {
 	.probe = meson_vpu_probe,
 	.bind = meson_vpu_bind,
 	.priv_auto_alloc_size = sizeof(struct meson_vpu_priv),
-	.flags  = DM_FLAG_PRE_RELOC,
+	.flags  = DM_FLAG_PRE_RELOC | DM_FLAG_REMOVE_WITH_PD_ON,
 };
-- 
2.17.1

[PATCH 1/2] dm: core: Add a flag for power domain control on device removal

[Neil Armstrong]

On 17/02/2020 12:36, Anatolij Gustschin wrote:
> In various cases a power domain must stay enabled after device
> removal when booting OS (i.e. serial debug console or display).
> Add a flag to selectively skip switching off a power domain.
> 
> Fixes: 52edfed65de9 ("dm: core: device: switch off power domain after device removal")
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> ---
>  drivers/core/device-remove.c | 5 +++--
>  include/dm/device.h          | 6 ++++++
>  2 files changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/core/device-remove.c b/drivers/core/device-remove.c
> index 444e34b492..ff5b28cb6a 100644
> --- a/drivers/core/device-remove.c
> +++ b/drivers/core/device-remove.c
> @@ -194,8 +194,9 @@ int device_remove(struct udevice *dev, uint flags)
>  		}
>  	}
>  
> -	if (!(drv->flags & DM_FLAG_DEFAULT_PD_CTRL_OFF) &&
> -	    (dev != gd->cur_serial_dev))
> +	if (!(drv->flags &
> +	      (DM_FLAG_DEFAULT_PD_CTRL_OFF | DM_FLAG_REMOVE_WITH_PD_ON)) &&
> +	    dev != gd->cur_serial_dev)
>  		dev_power_domain_off(dev);
>  
>  	if (flags_remove(flags, drv->flags)) {
> diff --git a/include/dm/device.h b/include/dm/device.h
> index ab806d0b7e..a56164b19b 100644
> --- a/include/dm/device.h
> +++ b/include/dm/device.h
> @@ -67,6 +67,12 @@ struct driver_info;
>  /* Driver platdata has been read. Cleared when the device is removed */
>  #define DM_FLAG_PLATDATA_VALID		(1 << 12)
>  
> +/*
> + * Device is removed without switching off its power domain. This might
> + * be required, i. e. for serial console (debug) output when booting OS.
> + */
> +#define DM_FLAG_REMOVE_WITH_PD_ON	(1 << 13)
> +
>  /*
>   * 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
> 

Acked-by: Neil Armstrong <narmstrong@baylibre.com>

and

Tested-by: Guillaume La Roque <glaroque@baylibre.com>

Thanks,
Neil

[PATCH 2/2] video: meson: keep power domain up after booting

[Neil Armstrong]

On 17/02/2020 12:36, Anatolij Gustschin wrote:
> Add driver flag to skip power domain disabling on device removal.
> 
> Fixes: 52edfed65de9 ("dm: core: device: switch off power domain after device removal")
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> ---
>  drivers/video/meson/meson_vpu.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/video/meson/meson_vpu.c b/drivers/video/meson/meson_vpu.c
> index 4eb66398d0..aa8c0a962f 100644
> --- a/drivers/video/meson/meson_vpu.c
> +++ b/drivers/video/meson/meson_vpu.c
> @@ -210,5 +210,5 @@ U_BOOT_DRIVER(meson_vpu) = {
>  	.probe = meson_vpu_probe,
>  	.bind = meson_vpu_bind,
>  	.priv_auto_alloc_size = sizeof(struct meson_vpu_priv),
> -	.flags  = DM_FLAG_PRE_RELOC,
> +	.flags  = DM_FLAG_PRE_RELOC | DM_FLAG_REMOVE_WITH_PD_ON,
>  };
> 

Acked-by: Neil Armstrong <narmstrong@baylibre.com>

and

Tested-by: Guillaume La Roque <glaroque@baylibre.com>

Thanks,
Neil

[PATCH 1/2] dm: core: Add a flag for power domain control on device removal

[Simon Glass]

Hi Anatolij,

On Mon, 17 Feb 2020 at 04:36, Anatolij Gustschin <agust@denx.de> wrote:
>
> In various cases a power domain must stay enabled after device
> removal when booting OS (i.e. serial debug console or display).
> Add a flag to selectively skip switching off a power domain.
>
> Fixes: 52edfed65de9 ("dm: core: device: switch off power domain after device removal")
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> ---
>  drivers/core/device-remove.c | 5 +++--
>  include/dm/device.h          | 6 ++++++
>  2 files changed, 9 insertions(+), 2 deletions(-)

This seems OK. Should we add a device tree property for this? Or is
the driver-level side enough.

Regards,
Simon

[PATCH 1/2] dm: core: Add a flag for power domain control on device removal

[Anatolij Gustschin]

Hi Simon,

On Tue, 18 Feb 2020 11:31:26 -0700
Simon Glass sjg at chromium.org wrote:

> Hi Anatolij,
> 
> On Mon, 17 Feb 2020 at 04:36, Anatolij Gustschin <agust@denx.de> wrote:
> >
> > In various cases a power domain must stay enabled after device
> > removal when booting OS (i.e. serial debug console or display).
> > Add a flag to selectively skip switching off a power domain.
> >
> > Fixes: 52edfed65de9 ("dm: core: device: switch off power domain after device removal")
> > Signed-off-by: Anatolij Gustschin <agust@denx.de>
> > ---
> >  drivers/core/device-remove.c | 5 +++--
> >  include/dm/device.h          | 6 ++++++
> >  2 files changed, 9 insertions(+), 2 deletions(-)  
> 
> This seems OK. Should we add a device tree property for this? Or is
> the driver-level side enough.

For all potential users I'm currently aware of the driver-level
side is enough. Should this ever be required per device, then we
can add a property later.

--
Anatolij

[PATCH 1/2] dm: core: Add a flag for power domain control on device removal

[Simon Glass]

Hi Anatolij,

On Tue, 18 Feb 2020 at 12:42, Anatolij Gustschin <agust@denx.de> wrote:
>
> Hi Simon,
>
> On Tue, 18 Feb 2020 11:31:26 -0700
> Simon Glass sjg at chromium.org wrote:
>
> > Hi Anatolij,
> >
> > On Mon, 17 Feb 2020 at 04:36, Anatolij Gustschin <agust@denx.de> wrote:
> > >
> > > In various cases a power domain must stay enabled after device
> > > removal when booting OS (i.e. serial debug console or display).
> > > Add a flag to selectively skip switching off a power domain.
> > >
> > > Fixes: 52edfed65de9 ("dm: core: device: switch off power domain after device removal")
> > > Signed-off-by: Anatolij Gustschin <agust@denx.de>
> > > ---
> > >  drivers/core/device-remove.c | 5 +++--
> > >  include/dm/device.h          | 6 ++++++
> > >  2 files changed, 9 insertions(+), 2 deletions(-)
> >
> > This seems OK. Should we add a device tree property for this? Or is
> > the driver-level side enough.
>
> For all potential users I'm currently aware of the driver-level
> side is enough. Should this ever be required per device, then we
> can add a property later.

Reviewed-by: Simon Glass <sjg@chromium.org>

Thanks,
Simon

[PATCH 2/2] video: meson: keep power domain up after booting

[sjg at google.com]

On 17/02/2020 12:36, Anatolij Gustschin wrote:
> Add driver flag to skip power domain disabling on device removal.
>
> Fixes: 52edfed65de9 ("dm: core: device: switch off power domain after device removal")
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> ---
>  drivers/video/meson/meson_vpu.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
Applied to u-boot-dm, thanks!

[PATCH 1/2] dm: core: Add a flag for power domain control on device removal

[sjg at google.com]

Hi Anatolij,

On Tue, 18 Feb 2020 at 12:42, Anatolij Gustschin <agust@denx.de> wrote:
>
> Hi Simon,
>
> On Tue, 18 Feb 2020 11:31:26 -0700
> Simon Glass sjg at chromium.org wrote:
>
> > Hi Anatolij,
> >
> > On Mon, 17 Feb 2020 at 04:36, Anatolij Gustschin <agust@denx.de> wrote:
> > >
> > > In various cases a power domain must stay enabled after device
> > > removal when booting OS (i.e. serial debug console or display).
> > > Add a flag to selectively skip switching off a power domain.
> > >
> > > Fixes: 52edfed65de9 ("dm: core: device: switch off power domain after device removal")
> > > Signed-off-by: Anatolij Gustschin <agust@denx.de>
> > > ---
> > >  drivers/core/device-remove.c | 5 +++--
> > >  include/dm/device.h          | 6 ++++++
> > >  2 files changed, 9 insertions(+), 2 deletions(-)
> >
> > This seems OK. Should we add a device tree property for this? Or is
> > the driver-level side enough.
>
> For all potential users I'm currently aware of the driver-level
> side is enough. Should this ever be required per device, then we
> can add a property later.

Reviewed-by: Simon Glass <sjg@chromium.org>

Thanks,
Simon

Applied to u-boot-dm, thanks!