On 26/03/2014 21:14, Fabio Estevam wrote:
> On Wed, Mar 26, 2014 at 4:57 PM, Sylwester Nawrocki
> <sylvester.nawrocki@xxxxxxxxx> wrote:
>
>> Perhaps a change as below helps ?
>>
>> From 85ee85e4a92b42442354f3f2454be50c173e1c59 Mon Sep 17 00:00:00 2001
>> From: Sylwester Nawrocki <s.nawrocki@xxxxxxxxxxx>
>> Date: Wed, 26 Mar 2014 20:54:13 +0100
>> Subject: [PATCH] clk: reverse default clk provider initialization order in
>> of_clk_init()
>>
>>
>> Signed-off-by: Sylwester Nawrocki <s.nawrocki@xxxxxxxxxxx>
>> ---
>> drivers/clk/clk.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
>> index fb3c40b..d30809c 100644
>> --- a/drivers/clk/clk.c
>> +++ b/drivers/clk/clk.c
>> @@ -2608,7 +2608,7 @@ void __init of_clk_init(const struct of_device_id
>> *matches)
>>
>> parent->clk_init_cb = match->data;
>> parent->np = np;
>> - list_add(&parent->node, &clk_provider_list);
>> + list_add_tail(&parent->node, &clk_provider_list);
>> }
>>
>> while (!list_empty(&clk_provider_list)) {
>
> Thanks, Sylwester!
>
> This makes my imx6q-wandboard to boot again.
>
> Tested-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
>
Hi Fabio, Sylwester,
I am happy there was a solution!
However, Fabio, could you apply the following patch without the patch
"clk: reverse default clk provider initialization order in
of_clk_init()" and then sent me the traces. I would like to be sure
that there is not any side effect.
Thanks!
---
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index fb3c40b4fbe2..0824cf38f79a 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -2558,6 +2558,7 @@ static int parent_ready(struct device_node *np)
while (true) {
struct clk *clk = of_clk_get(np, i);
+ pr_warn("%s: Testing %s \n", __func__, np->name);
/* this parent is ready we can check the next one */
if (!IS_ERR(clk)) {
@@ -2567,8 +2568,10 @@ static int parent_ready(struct device_node *np)
}
/* at least one parent is not ready, we exit now */
- if (PTR_ERR(clk) == -EPROBE_DEFER)
+ if (PTR_ERR(clk) == -EPROBE_DEFER) {
+ pr_warn("%s: Not ready \n", __func__);
return 0;
+ }
/*
* Here we make assumption that the device tree is
@@ -2578,6 +2581,7 @@ static int parent_ready(struct device_node *np)
* parent, no need to wait for them, then we can
* consider their absence as being ready
*/
+ pr_warn("%s: Ready \n", __func__);
return 1;
}
}
@@ -2616,6 +2620,7 @@ void __init of_clk_init(const struct of_device_id *matches)
list_for_each_entry_safe(clk_provider, next,
&clk_provider_list, node) {
if (force || parent_ready(clk_provider->np)) {
+ pr_warn("%s: Initializing %s \n", __func__, clk_provider->np->name);
clk_provider->clk_init_cb(clk_provider->np);
list_del(&clk_provider->node);
kfree(clk_provider);
@@ -2629,8 +2634,10 @@ void __init of_clk_init(const struct of_device_id *matches)
* initialize all the remaining ones unconditionally
* in case the clock parent was not mandatory
*/
- if (!is_init_done)
+ if (!is_init_done) {
+ pr_warn("%s: Now force the initialization of the remaning clocks\n", __func__);
force = true;
+ }
}
}
--
1.8.1.2
--
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
