[PATCH v3 05/16] ARM: mvebu: remove device tree parsing for cpu nodes

[Gregory CLEMENT]

On 05/08/2013 18:28, Sudeep KarkadaNagesha wrote:
> On 01/08/13 13:02, Jason Cooper wrote:
>> Sudeep,
>>
>> On Thu, Aug 01, 2013 at 10:54:44AM +0100, Sudeep KarkadaNagesha wrote:
>>> On 22/07/13 12:32, Sudeep KarkadaNagesha wrote:
>>>> From: Sudeep KarkadaNagesha <sudeep.karkadanagesha at arm.com>
>>>>
>>>> Currently set_secondary_cpus_clock assume the CPU logical ordering
>>>> and the MPDIR in DT are same, which is incorrect.
>>>>
>>>> Since the CPU device nodes can be retrieved in the logical ordering
>>>> using the DT helper, we can remove the devices tree parsing.
>>>>
>>>> This patch removes DT parsing by making use of of_get_cpu_node.
>>>>
>>>> Cc: Gregory Clement <gregory.clement at free-electrons.com>
>>>> Cc: Andrew Lunn <andrew at lunn.ch>
>>>> Cc: Jason Cooper <jason at lakedaemon.net>
>>>> Signed-off-by: Sudeep KarkadaNagesha <sudeep.karkadanagesha at arm.com>
>>>
>>> Hi Gregory/Andrew/Jason,
>>>
>>> Does this change look fine for mvebu?
>>> If yes, can I have your ACKs ?
>>
>> Gregory is the one best suited to review/Ack this.  He'll be back on
>> Monday.
>>
> Hi Gregory,
> 
> Can you please review this patch ?

Your patch is a nice improvement, I reviewed it and I also tested it on the
Armada XP DB board.

You can add my:
Acked-by: Gregory Clement <gregory.clement at free-electrons.com>

> 
> Regards,
> Sudeep
>>>> ---
>>>>  arch/arm/mach-mvebu/platsmp.c | 52 ++++++++++++++++++++-----------------------
>>>>  1 file changed, 24 insertions(+), 28 deletions(-)
>>>>
>>>> diff --git a/arch/arm/mach-mvebu/platsmp.c b/arch/arm/mach-mvebu/platsmp.c
>>>> index ce81d30..001dd42 100644
>>>> --- a/arch/arm/mach-mvebu/platsmp.c
>>>> +++ b/arch/arm/mach-mvebu/platsmp.c
>>>> @@ -23,51 +23,47 @@
>>>>  #include <linux/of.h>
>>>>  #include <linux/mbus.h>
>>>>  #include <asm/cacheflush.h>
>>>> +#include <asm/prom.h>
>>>>  #include <asm/smp_plat.h>
>>>>  #include "common.h"
>>>>  #include "armada-370-xp.h"
>>>>  #include "pmsu.h"
>>>>  #include "coherency.h"
>>>>  
>>>> +static struct clk *__init get_cpu_clk(int cpu)
>>>> +{
>>>> +	struct clk *cpu_clk;
>>>> +	struct device_node *np = of_get_cpu_node(cpu);
>>>> +
>>>> +	if (WARN(!np, "missing cpu node\n"))
>>>> +		return NULL;
>>>> +	cpu_clk = of_clk_get(np, 0);
>>>> +	if (WARN_ON(IS_ERR(cpu_clk)))
>>>> +		return NULL;
>>>> +	return cpu_clk;
>>>> +}
>>>> +
>>>>  void __init set_secondary_cpus_clock(void)
>>>>  {
>>>> -	int thiscpu;
>>>> +	int thiscpu, cpu;
>>>>  	unsigned long rate;
>>>> -	struct clk *cpu_clk = NULL;
>>>> -	struct device_node *np = NULL;
>>>> +	struct clk *cpu_clk;
>>>>  
>>>>  	thiscpu = smp_processor_id();
>>>> -	for_each_node_by_type(np, "cpu") {
>>>> -		int err;
>>>> -		int cpu;
>>>> -
>>>> -		err = of_property_read_u32(np, "reg", &cpu);
>>>> -		if (WARN_ON(err))
>>>> -			return;
>>>> -
>>>> -		if (cpu == thiscpu) {
>>>> -			cpu_clk = of_clk_get(np, 0);
>>>> -			break;
>>>> -		}
>>>> -	}
>>>> -	if (WARN_ON(IS_ERR(cpu_clk)))
>>>> +	cpu_clk = get_cpu_clk(thiscpu);
>>>> +	if (!cpu_clk)
>>>>  		return;
>>>>  	clk_prepare_enable(cpu_clk);
>>>>  	rate = clk_get_rate(cpu_clk);
>>>>  
>>>>  	/* set all the other CPU clk to the same rate than the boot CPU */
>>>> -	for_each_node_by_type(np, "cpu") {
>>>> -		int err;
>>>> -		int cpu;
>>>> -
>>>> -		err = of_property_read_u32(np, "reg", &cpu);
>>>> -		if (WARN_ON(err))
>>>> +	for_each_possible_cpu(cpu) {
>>>> +		if (cpu == thiscpu)
>>>> +			continue;
>>>> +		cpu_clk = get_cpu_clk(cpu);
>>>> +		if (!cpu_clk)
>>>>  			return;
>>>> -
>>>> -		if (cpu != thiscpu) {
>>>> -			cpu_clk = of_clk_get(np, 0);
>>>> -			clk_set_rate(cpu_clk, rate);
>>>> -		}
>>>> +		clk_set_rate(cpu_clk, rate);
>>>>  	}
>>>>  }
>>>>  
>>>>
>>>
>>>
>>
> 
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> 


-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com