mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: Bastian Krause <bst@pengutronix.de>, barebox@lists.infradead.org
Subject: Re: [PATCH] clk: handle NULL args in clk_set_parent()
Date: Wed, 11 May 2022 12:27:10 +0200	[thread overview]
Message-ID: <5a88da68-e5a4-2435-2800-47ea8fa927fc@pengutronix.de> (raw)
In-Reply-To: <20220511100911.2009482-1-bst@pengutronix.de>

Hello Bastian,

On 11.05.22 12:09, Bastian Krause wrote:
> NULL struct clk pointers should be treated just as the Linux kernel clk
> driver does [1]. The reasoning should also apply to the parent clk
> argument.
> 
> A NULL struct clk pointer can happen for example on the Freescale i.MX6
> SABRE Smart Device Board if CONFIG_DRIVER_VIDEO_IMX_IPUV3 is disabled,
> leading to assigned-clocks IMX6QDL_CLK_LDB_DI0_SEL and
> IMX6QDL_CLK_LDB_DI1_SEL [2] being unavailable. Without this patch, the
> board hangs while setting those assigned clock configurations since [3].
> 
> [1] 89ac8d7ae1cd ("clk: handle NULL struct clk gracefully")
> [2] dts/src/arm/imx6qdl-sabresd.dtsi
> [3] f5eb5fddb4 ("clk: fix of clk set defaults when dev is a clk provider")

Thanks for your patch.

> 
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> ---
>  drivers/clk/clk.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
> index 8e317b4b05..efb5d4ad4a 100644
> --- a/drivers/clk/clk.c
> +++ b/drivers/clk/clk.c
> @@ -230,7 +230,10 @@ int clk_set_parent(struct clk *clk, struct clk *newparent)
>  {
>  	struct clk_hw *hw;
>  	int i, ret;
> -	struct clk *curparent = clk_get_parent(clk);

Linux clk_get_parent returns NULL if clk is NULL.
Can you teach barebox to do the same?

Linux clk_set_parent accepts a NULL parent to add a clock
to the orphan list. We don't seem to maintain an orphan
list in barebox, so early exist with return value zero
seems okay.

> +	struct clk *curparent;
> +
> +	if (!clk || !newparent)
> +		return 0;
>  
>  	if (IS_ERR(clk))
>  		return PTR_ERR(clk);
> @@ -254,6 +257,8 @@ int clk_set_parent(struct clk *clk, struct clk *newparent)
>  	if (i == clk->num_parents)
>  		return -EINVAL;
>  
> +	curparent = clk_get_parent(clk);
> +

With early-exiting clk_get_parent, you won't need to shift this code around.

Cheers,
Ahmad

>  	if (clk->enable_count)
>  		clk_enable(newparent);
>  


-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox


  reply	other threads:[~2022-05-11 10:28 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-11 10:09 Bastian Krause
2022-05-11 10:27 ` Ahmad Fatoum [this message]
2022-05-12  7:03 ` Sascha Hauer
2022-05-12  8:54   ` Bastian Krause
2022-05-12  9:19     ` Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5a88da68-e5a4-2435-2800-47ea8fa927fc@pengutronix.de \
    --to=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=bst@pengutronix.de \
    --subject='Re: [PATCH] clk: handle NULL args in clk_set_parent()' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox