[PATCH 0/2] soc: amlogic: meson-gx-pwrc-vpu: fix two issues

[PATCH 0/2] soc: amlogic: meson-gx-pwrc-vpu: fix two issues

[Heiner Kallweit]

This series fixes two issues, one being more cosmetic and the other one
causing errors during shutdown.

Heiner Kallweit (2):
  soc: amlogic: meson-gx-pwrc-vpu: don't print error message on probe deferral
  soc: amlogic: meson-gx-pwrc-vpu: fix error on shutdown when domain is powered off

 drivers/soc/amlogic/meson-gx-pwrc-vpu.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

-- 
2.15.1

[PATCH 1/2] soc: amlogic: meson-gx-pwrc-vpu: don't print error message on probe deferral

[Heiner Kallweit]

The error message may be misleading in case of probe deferral
(happens on my Odroid-C2). Therefore don't print it in this case.

Fixes: 75fcb5ca4b46 "soc: amlogic: add Meson GX VPU Domains driver"
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
 drivers/soc/amlogic/meson-gx-pwrc-vpu.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/soc/amlogic/meson-gx-pwrc-vpu.c b/drivers/soc/amlogic/meson-gx-pwrc-vpu.c
index 2bdeebc48..3adb2f2ec 100644
--- a/drivers/soc/amlogic/meson-gx-pwrc-vpu.c
+++ b/drivers/soc/amlogic/meson-gx-pwrc-vpu.c
@@ -184,7 +184,8 @@ static int meson_gx_pwrc_vpu_probe(struct platform_device *pdev)
 
 	rstc = devm_reset_control_array_get(&pdev->dev, false, false);
 	if (IS_ERR(rstc)) {
-		dev_err(&pdev->dev, "failed to get reset lines\n");
+		if (PTR_ERR(rstc) != -EPROBE_DEFER)
+			dev_err(&pdev->dev, "failed to get reset lines\n");
 		return PTR_ERR(rstc);
 	}
 
-- 
2.15.1

[PATCH 1/2] soc: amlogic: meson-gx-pwrc-vpu: don't print error message on probe deferral

[Neil Armstrong]

On 21/12/2017 20:40, Heiner Kallweit wrote:
> The error message may be misleading in case of probe deferral
> (happens on my Odroid-C2). Therefore don't print it in this case.
> 
> Fixes: 75fcb5ca4b46 "soc: amlogic: add Meson GX VPU Domains driver"
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
> ---
>  drivers/soc/amlogic/meson-gx-pwrc-vpu.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/soc/amlogic/meson-gx-pwrc-vpu.c b/drivers/soc/amlogic/meson-gx-pwrc-vpu.c
> index 2bdeebc48..3adb2f2ec 100644
> --- a/drivers/soc/amlogic/meson-gx-pwrc-vpu.c
> +++ b/drivers/soc/amlogic/meson-gx-pwrc-vpu.c
> @@ -184,7 +184,8 @@ static int meson_gx_pwrc_vpu_probe(struct platform_device *pdev)
>  
>  	rstc = devm_reset_control_array_get(&pdev->dev, false, false);
>  	if (IS_ERR(rstc)) {
> -		dev_err(&pdev->dev, "failed to get reset lines\n");
> +		if (PTR_ERR(rstc) != -EPROBE_DEFER)
> +			dev_err(&pdev->dev, "failed to get reset lines\n");
>  		return PTR_ERR(rstc);
>  	}
>  
> 

This will definitely help removing this useless message when booting nominally.

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

[PATCH 2/2] soc: amlogic: meson-gx-pwrc-vpu: fix error on shutdown when domain is powered off

[Heiner Kallweit]

When operating the system headless headless, the domain is never
powered on, leaving the clocks disabled. The shutdown function then
tries to disable the already disabled clocks, resulting in errors.
Therefore call meson_gx_pwrc_vpu_power_off() only if domain is
powered on.
This patch fixes the described issue on my system (Odorid-C2).

Fixes: 339cd0ea0822 "soc: amlogic: meson-gx-pwrc-vpu: fix power-off when powered by bootloader"
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
 drivers/soc/amlogic/meson-gx-pwrc-vpu.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/soc/amlogic/meson-gx-pwrc-vpu.c b/drivers/soc/amlogic/meson-gx-pwrc-vpu.c
index 3adb2f2ec..6289965c4 100644
--- a/drivers/soc/amlogic/meson-gx-pwrc-vpu.c
+++ b/drivers/soc/amlogic/meson-gx-pwrc-vpu.c
@@ -225,7 +225,11 @@ static int meson_gx_pwrc_vpu_probe(struct platform_device *pdev)
 
 static void meson_gx_pwrc_vpu_shutdown(struct platform_device *pdev)
 {
-	meson_gx_pwrc_vpu_power_off(&vpu_hdmi_pd.genpd);
+	bool powered_off;
+
+	powered_off = meson_gx_pwrc_vpu_get_power(&vpu_hdmi_pd);
+	if (!powered_off)
+		meson_gx_pwrc_vpu_power_off(&vpu_hdmi_pd.genpd);
 }
 
 static const struct of_device_id meson_gx_pwrc_vpu_match_table[] = {
-- 
2.15.1

[PATCH 2/2] soc: amlogic: meson-gx-pwrc-vpu: fix error on shutdown when domain is powered off

[Neil Armstrong]

On 21/12/2017 20:41, Heiner Kallweit wrote:
> When operating the system headless headless, the domain is never
> powered on, leaving the clocks disabled. The shutdown function then
> tries to disable the already disabled clocks, resulting in errors.
> Therefore call meson_gx_pwrc_vpu_power_off() only if domain is
> powered on.
> This patch fixes the described issue on my system (Odorid-C2).
> 
> Fixes: 339cd0ea0822 "soc: amlogic: meson-gx-pwrc-vpu: fix power-off when powered by bootloader"
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
> ---
>  drivers/soc/amlogic/meson-gx-pwrc-vpu.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/soc/amlogic/meson-gx-pwrc-vpu.c b/drivers/soc/amlogic/meson-gx-pwrc-vpu.c
> index 3adb2f2ec..6289965c4 100644
> --- a/drivers/soc/amlogic/meson-gx-pwrc-vpu.c
> +++ b/drivers/soc/amlogic/meson-gx-pwrc-vpu.c
> @@ -225,7 +225,11 @@ static int meson_gx_pwrc_vpu_probe(struct platform_device *pdev)
>  
>  static void meson_gx_pwrc_vpu_shutdown(struct platform_device *pdev)
>  {
> -	meson_gx_pwrc_vpu_power_off(&vpu_hdmi_pd.genpd);
> +	bool powered_off;
> +
> +	powered_off = meson_gx_pwrc_vpu_get_power(&vpu_hdmi_pd);
> +	if (!powered_off)
> +		meson_gx_pwrc_vpu_power_off(&vpu_hdmi_pd.genpd);
>  }
>  
>  static const struct of_device_id meson_gx_pwrc_vpu_match_table[] = {
> 

Ok, this occurs using mainline U-Boot, but with Meson DRM driver disabled,
this use case should be covered.

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

[PATCH 0/2] soc: amlogic: meson-gx-pwrc-vpu: fix two issues

[Kevin Hilman]

Hi Heiner,

Heiner Kallweit <hkallweit1@gmail.com> writes:

> This series fixes two issues, one being more cosmetic and the other one
> causing errors during shutdown.
>
> Heiner Kallweit (2):
>   soc: amlogic: meson-gx-pwrc-vpu: don't print error message on probe deferral
>   soc: amlogic: meson-gx-pwrc-vpu: fix error on shutdown when domain is powered off

Queued for v4.17 with Neil's tags.  (branch: v4.17/drivers)

Thanks for the cleanups!

Kevin