From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <Laurentiu.Tudor@freescale.com>
Received: from na01-bl2-obe.outbound.protection.outlook.com
 (mail-bl2on0143.outbound.protection.outlook.com [65.55.169.143])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by lists.ozlabs.org (Postfix) with ESMTPS id 832641A01DD
 for <linuxppc-dev@lists.ozlabs.org>; Tue,  9 Sep 2014 00:49:10 +1000 (EST)
Message-ID: <540DB995.7040406@freescale.com>
Date: Mon, 8 Sep 2014 17:13:41 +0300
From: Laurentiu Tudor <b10716@freescale.com>
MIME-Version: 1.0
To: Grant Likely <grant.likely@linaro.org>, <devicetree@vger.kernel.org>,
 <linux-kernel@vger.kernel.org>, linuxppc-dev <linuxppc-dev@lists.ozlabs.org>
Subject: Re: [PATCH] of: make sure of_alias is initialized before accessing it
References: <53FDE6A3.3080303@freescale.com>
 <20140908132956.646FEC40AE5@trevor.secretlab.ca>
In-Reply-To: <20140908132956.646FEC40AE5@trevor.secretlab.ca>
Content-Type: text/plain; charset="ISO-8859-1"
Cc: Laurentiu Tudor <Laurentiu.Tudor@freescale.com>
List-Id: Linux on PowerPC Developers Mail List <linuxppc-dev.lists.ozlabs.org>
List-Unsubscribe: <https://lists.ozlabs.org/options/linuxppc-dev>,
 <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=unsubscribe>
List-Archive: <http://lists.ozlabs.org/pipermail/linuxppc-dev/>
List-Post: <mailto:linuxppc-dev@lists.ozlabs.org>
List-Help: <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=help>
List-Subscribe: <https://lists.ozlabs.org/listinfo/linuxppc-dev>,
 <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=subscribe>

On 09/08/2014 04:29 PM, Grant Likely wrote:
> On Wed, 27 Aug 2014 17:09:39 +0300, Laurentiu Tudor <b10716@freescale.com> wrote:
>> Simply swap of_alias and of_chosen initialization so
>> that of_alias ends up read first. This must be done
>> because it is accessed couple of lines below when
>> trying to initialize the of_stdout using the alias
>> based legacy method.
>>
>> [Fixes a752ee5 - tty: Update hypervisor tty drivers to                          
>> use core stdout parsing code]
>>
>> Signed-off-by: Laurentiu Tudor <Laurentiu.Tudor@freescale.com>
>> Cc: Grant Likely <grant.likely@linaro.org>
>> ---
>>  drivers/of/base.c | 8 ++++----
>>  1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/of/base.c b/drivers/of/base.c
>> index d8574ad..52f8506 100644
>> --- a/drivers/of/base.c
>> +++ b/drivers/of/base.c
>> @@ -1847,6 +1847,10 @@ void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align))
>>  {
>>  	struct property *pp;
>>  
>> +	of_aliases = of_find_node_by_path("/aliases");
>> +	if (!of_aliases)
>> +		return;
>> +
>>  	of_chosen = of_find_node_by_path("/chosen");
>>  	if (of_chosen == NULL)
>>  		of_chosen = of_find_node_by_path("/chosen@0");
>> @@ -1862,10 +1866,6 @@ void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align))
>>  			of_stdout = of_find_node_by_path(name);
>>  	}
>>  
>> -	of_aliases = of_find_node_by_path("/aliases");
>> -	if (!of_aliases)
>> -		return;
>> -
> 
> Close, but not quite. The 'if (!of_aliases)' test should not be moved.
> Only the search for of_find_node_by_path().

Eek, completely missed this. Sorry.

> I've fixed it up and applied.
 
Thanks!

---
Best Regards, Laurentiu