From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <devicetree-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,
	INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED
	autolearn=ham autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 7F90AC43381
	for <linux-devicetree@archiver.kernel.org>; Tue, 26 Jan 2021 23:01:47 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id 5F12F206A1
	for <linux-devicetree@archiver.kernel.org>; Tue, 26 Jan 2021 23:01:47 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1730235AbhAZXBR (ORCPT
        <rfc822;linux-devicetree@archiver.kernel.org>);
        Tue, 26 Jan 2021 18:01:17 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38158 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1731591AbhAZU13 (ORCPT
        <rfc822;devicetree@vger.kernel.org>); Tue, 26 Jan 2021 15:27:29 -0500
Received: from gate2.alliedtelesis.co.nz (gate2.alliedtelesis.co.nz [IPv6:2001:df5:b000:5::4])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2D361C0613D6
        for <devicetree@vger.kernel.org>; Tue, 26 Jan 2021 12:26:48 -0800 (PST)
Received: from mmarshal3.atlnz.lc (mmarshal3.atlnz.lc [10.32.18.43])
        (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
        (Client did not present a certificate)
        by gate2.alliedtelesis.co.nz (Postfix) with ESMTPS id 6A84E891AF;
        Wed, 27 Jan 2021 09:26:46 +1300 (NZDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alliedtelesis.co.nz;
        s=mail181024; t=1611692806;
        bh=rKTlvrig6F23gJ6MA0qxcGgiQOpbCJQdgVElbweMJaA=;
        h=From:To:CC:Subject:Date:References:In-Reply-To;
        b=ZTlorIhTuYK8CphdLQl3j0rCYCsKO4jFc3E+s/gkjLmR5dJr06IBn21AG6K10OEbp
         F3TXSeNnFh/w6E+PCNnrtT5gPNvLdeaQrofDUYUdL3m0HHjFQAwEGl6LgauybJNWFB
         1kiXTCV3ShkTXXZFEQ/VhYgo0CTkROd0bliSUYOKvA4l2JNk2cWvVgGyL6IdX89s7u
         0kMKb/XAfYzEiliJYpS1bPjKvRw6hxW5WpYxHGQlBnx/dEpnAm8SqjQBHdF7DbBM5p
         OG4oLpeiSEGwQpG2XoEMcYkVztXy4CmAVCPSvL/gCzWTiZ8kmEJBRcAk958y09meFd
         MITf8o9ryBLCw==
Received: from svr-chch-ex1.atlnz.lc (Not Verified[10.32.16.77]) by mmarshal3.atlnz.lc with Trustwave SEG (v7,5,8,10121)
        id <B60107b060001>; Wed, 27 Jan 2021 09:26:46 +1300
Received: from svr-chch-ex1.atlnz.lc (2001:df5:b000:bc8::77) by
 svr-chch-ex1.atlnz.lc (2001:df5:b000:bc8::77) with Microsoft SMTP Server
 (TLS) id 15.0.1497.2; Wed, 27 Jan 2021 09:26:45 +1300
Received: from svr-chch-ex1.atlnz.lc ([fe80::409d:36f5:8899:92e8]) by
 svr-chch-ex1.atlnz.lc ([fe80::409d:36f5:8899:92e8%12]) with mapi id
 15.00.1497.010; Wed, 27 Jan 2021 09:26:45 +1300
From:   Chris Packham <Chris.Packham@alliedtelesis.co.nz>
To:     Rob Herring <robh@kernel.org>, Russell King <linux@armlinux.org.uk>
CC:     "linux-arm-kernel@lists.infradead.org" 
        <linux-arm-kernel@lists.infradead.org>,
        "devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
        Qi Zheng <arch0.zheng@gmail.com>
Subject: Re: [PATCH] ARM: zImage: atags_to_fdt: Fix node names on added root
 nodes
Thread-Topic: [PATCH] ARM: zImage: atags_to_fdt: Fix node names on added root
 nodes
Thread-Index: AQHW84xwlZl6qBJpAEuzuF8M0I/jXKo5ghkA
Date:   Tue, 26 Jan 2021 20:26:44 +0000
Message-ID: <ae23972c-500c-416a-05f0-daf6bc439313@alliedtelesis.co.nz>
References: <20210126023905.1631161-1-robh@kernel.org>
In-Reply-To: <20210126023905.1631161-1-robh@kernel.org>
Accept-Language: en-NZ, en-US
Content-Language: en-US
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
x-ms-exchange-messagesentrepresentingtype: 1
x-ms-exchange-transport-fromentityheader: Hosted
x-originating-ip: [10.32.1.11]
Content-Type: text/plain; charset="utf-8"
Content-ID: <7EE50750D3152848A6AD0C2205A27BED@atlnz.lc>
Content-Transfer-Encoding: base64
MIME-Version: 1.0
Precedence: bulk
List-ID: <devicetree.vger.kernel.org>
X-Mailing-List: devicetree@vger.kernel.org

DQpPbiAyNi8wMS8yMSAzOjM5IHBtLCBSb2IgSGVycmluZyB3cm90ZToNCj4gQ29tbWl0IDc1MzZj
N2UwM2U3NCAoIm9mL2ZkdDogUmVtb3ZlIHJlZHVuZGFudCBrYmFzZW5hbWUgZnVuY3Rpb24NCj4g
Y2FsbCIpIGV4cG9zZWQgYSBidWcgY3JlYXRpbmcgRFQgbm9kZXMgaW4gdGhlIEFUQUdTIHRvIERU
IGZpeHVwIGNvZGUuDQo+IE5vbi1leGlzdGVudCBub2RlcyB3b3VsZCBtaXN0YWtlbiBnZXQgY3Jl
YXRlZCB3aXRoIGEgbGVhZGluZyAnLycuIFRoZQ0KPiBwcm9ibGVtIHdhcyBmZHRfcGF0aF9vZmZz
ZXQoKSB0YWtlcyBhIGZ1bGwgcGF0aCB3aGlsZSBjcmVhdGluZyBhIG5vZGUNCj4gd2l0aCBmZHRf
YWRkX3N1Ym5vZGUoKSB0YWtlcyBqdXN0IHRoZSBiYXNlbmFtZS4NCj4NCj4gU2luY2UgdGhpcyB3
ZSBvbmx5IGFkZCByb290IGNoaWxkIG5vZGVzLCB3ZSBjYW4ganVzdCBza2lwIG92ZXIgdGhlICcv
Jy4NCj4NCj4gRml4ZXM6IDc1MzZjN2UwM2U3NCAoIm9mL2ZkdDogUmVtb3ZlIHJlZHVuZGFudCBr
YmFzZW5hbWUgZnVuY3Rpb24gY2FsbCIpDQo+IFJlcG9ydGVkLWJ5OiBDaHJpcyBQYWNraGFtIDxj
aHJpcy5wYWNraGFtQGFsbGllZHRlbGVzaXMuY28ubno+DQo+IENjOiBRaSBaaGVuZyA8YXJjaDAu
emhlbmdAZ21haWwuY29tPg0KPiBDYzogUnVzc2VsbCBLaW5nIDxsaW51eEBhcm1saW51eC5vcmcu
dWs+DQo+IFNpZ25lZC1vZmYtYnk6IFJvYiBIZXJyaW5nIDxyb2JoQGtlcm5lbC5vcmc+DQoNClRo
YW5rcyBSb2IsDQoNClRlc3RlZC1ieTogQ2hyaXMgUGFja2hhbSA8Y2hyaXMucGFja2hhbUBhbGxp
ZWR0ZWxlc2lzLmNvLm56Pg0KPiAtLS0NCj4gICBhcmNoL2FybS9ib290L2NvbXByZXNzZWQvYXRh
Z3NfdG9fZmR0LmMgfCAzICsrLQ0KPiAgIDEgZmlsZSBjaGFuZ2VkLCAyIGluc2VydGlvbnMoKyks
IDEgZGVsZXRpb24oLSkNCj4NCj4gZGlmZiAtLWdpdCBhL2FyY2gvYXJtL2Jvb3QvY29tcHJlc3Nl
ZC9hdGFnc190b19mZHQuYyBiL2FyY2gvYXJtL2Jvb3QvY29tcHJlc3NlZC9hdGFnc190b19mZHQu
Yw0KPiBpbmRleCA4NDUyNzUzZWZlYmUuLjMxOTI3ZDJmZTI5NyAxMDA2NDQNCj4gLS0tIGEvYXJj
aC9hcm0vYm9vdC9jb21wcmVzc2VkL2F0YWdzX3RvX2ZkdC5jDQo+ICsrKyBiL2FyY2gvYXJtL2Jv
b3QvY29tcHJlc3NlZC9hdGFnc190b19mZHQuYw0KPiBAQCAtMTUsNyArMTUsOCBAQCBzdGF0aWMg
aW50IG5vZGVfb2Zmc2V0KHZvaWQgKmZkdCwgY29uc3QgY2hhciAqbm9kZV9wYXRoKQ0KPiAgIHsN
Cj4gICAJaW50IG9mZnNldCA9IGZkdF9wYXRoX29mZnNldChmZHQsIG5vZGVfcGF0aCk7DQo+ICAg
CWlmIChvZmZzZXQgPT0gLUZEVF9FUlJfTk9URk9VTkQpDQo+IC0JCW9mZnNldCA9IGZkdF9hZGRf
c3Vibm9kZShmZHQsIDAsIG5vZGVfcGF0aCk7DQo+ICsJCS8qIEFkZCB0aGUgbm9kZSB0byByb290
IGlmIG5vdCBmb3VuZCwgZHJvcHBpbmcgdGhlIGxlYWRpbmcgJy8nICovDQo+ICsJCW9mZnNldCA9
IGZkdF9hZGRfc3Vibm9kZShmZHQsIDAsIG5vZGVfcGF0aCArIDEpOw0KPiAgIAlyZXR1cm4gb2Zm
c2V0Ow0KPiAgIH0NCj4gICA=

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=3d55=G5=lists.infradead.org=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-14.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH,
	DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,
	INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED
	autolearn=ham autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id BED9FC43381
	for <linux-arm-kernel@archiver.kernel.org>; Tue, 26 Jan 2021 20:28:49 +0000 (UTC)
Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by mail.kernel.org (Postfix) with ESMTPS id 5B06B22255
	for <linux-arm-kernel@archiver.kernel.org>; Tue, 26 Jan 2021 20:28:49 +0000 (UTC)
DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5B06B22255
Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=alliedtelesis.co.nz
Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
	d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding:
	Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive:
	List-Unsubscribe:List-Id:MIME-Version:Content-ID:In-Reply-To:References:
	Message-ID:Date:Subject:To:From:Reply-To:Content-Description:Resent-Date:
	Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner;
	 bh=/yOxJjwhEgUgGboGxwBUNUbEp8tR36j+6MXtlDWhn4c=; b=ibaHcmNlKQfD9XoSBXee0od8/
	K2fpmsjPW4DHG7LByygmmIcQ6aJ4rxcr2UXK/y6LayCApqViOW1m43W7uBKzAAV2i7dWmbL4h0hQx
	16VK5E51jRzuP9wNmN4MuEGK7R+bPwk6ADBgID9xtDd6HhPEd2jsAbB43gqgprdrOFbpo6vp7CJOW
	IV7n+OnlsD45DyHPZxdsvPg37a/Zb6XEWLhtzpEG4cyOssuTK/xhlWZ7naahSoCjmVY18RJPfIR/c
	B28ETafBf5bVJqrWe4NL8J6i3upSrbyepFxNjGvG5ettgilMIPueTVrEvdsQD+lEqJihIHKMsQB73
	SBikRdr/g==;
Received: from localhost ([::1] helo=merlin.infradead.org)
	by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux))
	id 1l4UvM-0008Sz-27; Tue, 26 Jan 2021 20:26:52 +0000
Received: from gate2.alliedtelesis.co.nz ([2001:df5:b000:5::4])
 by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux))
 id 1l4UvJ-0008SJ-CY
 for linux-arm-kernel@lists.infradead.org; Tue, 26 Jan 2021 20:26:50 +0000
Received: from mmarshal3.atlnz.lc (mmarshal3.atlnz.lc [10.32.18.43])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by gate2.alliedtelesis.co.nz (Postfix) with ESMTPS id 6798183646;
 Wed, 27 Jan 2021 09:26:46 +1300 (NZDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alliedtelesis.co.nz;
 s=mail181024; t=1611692806;
 bh=rKTlvrig6F23gJ6MA0qxcGgiQOpbCJQdgVElbweMJaA=;
 h=From:To:CC:Subject:Date:References:In-Reply-To;
 b=ZTlorIhTuYK8CphdLQl3j0rCYCsKO4jFc3E+s/gkjLmR5dJr06IBn21AG6K10OEbp
 F3TXSeNnFh/w6E+PCNnrtT5gPNvLdeaQrofDUYUdL3m0HHjFQAwEGl6LgauybJNWFB
 1kiXTCV3ShkTXXZFEQ/VhYgo0CTkROd0bliSUYOKvA4l2JNk2cWvVgGyL6IdX89s7u
 0kMKb/XAfYzEiliJYpS1bPjKvRw6hxW5WpYxHGQlBnx/dEpnAm8SqjQBHdF7DbBM5p
 OG4oLpeiSEGwQpG2XoEMcYkVztXy4CmAVCPSvL/gCzWTiZ8kmEJBRcAk958y09meFd
 MITf8o9ryBLCw==
Received: from svr-chch-ex1.atlnz.lc (Not Verified[10.32.16.77]) by
 mmarshal3.atlnz.lc with Trustwave SEG (v7, 5, 8, 10121)
 id <B60107b060000>; Wed, 27 Jan 2021 09:26:46 +1300
Received: from svr-chch-ex1.atlnz.lc (2001:df5:b000:bc8::77) by
 svr-chch-ex1.atlnz.lc (2001:df5:b000:bc8::77) with Microsoft SMTP Server
 (TLS) id 15.0.1497.2; Wed, 27 Jan 2021 09:26:45 +1300
Received: from svr-chch-ex1.atlnz.lc ([fe80::409d:36f5:8899:92e8]) by
 svr-chch-ex1.atlnz.lc ([fe80::409d:36f5:8899:92e8%12]) with mapi id
 15.00.1497.010; Wed, 27 Jan 2021 09:26:45 +1300
From: Chris Packham <Chris.Packham@alliedtelesis.co.nz>
To: Rob Herring <robh@kernel.org>, Russell King <linux@armlinux.org.uk>
Subject: Re: [PATCH] ARM: zImage: atags_to_fdt: Fix node names on added root
 nodes
Thread-Topic: [PATCH] ARM: zImage: atags_to_fdt: Fix node names on added root
 nodes
Thread-Index: AQHW84xwlZl6qBJpAEuzuF8M0I/jXKo5ghkA
Date: Tue, 26 Jan 2021 20:26:44 +0000
Message-ID: <ae23972c-500c-416a-05f0-daf6bc439313@alliedtelesis.co.nz>
References: <20210126023905.1631161-1-robh@kernel.org>
In-Reply-To: <20210126023905.1631161-1-robh@kernel.org>
Accept-Language: en-NZ, en-US
Content-Language: en-US
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
x-ms-exchange-messagesentrepresentingtype: 1
x-ms-exchange-transport-fromentityheader: Hosted
x-originating-ip: [10.32.1.11]
Content-ID: <7EE50750D3152848A6AD0C2205A27BED@atlnz.lc>
MIME-Version: 1.0
X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 
X-CRM114-CacheID: sfid-20210126_152650_179292_E108AEB2 
X-CRM114-Status: GOOD (  35.70  )
X-BeenThere: linux-arm-kernel@lists.infradead.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <linux-arm-kernel.lists.infradead.org>
List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, 
 <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe>
List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/>
List-Post: <mailto:linux-arm-kernel@lists.infradead.org>
List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help>
List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, 
 <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe>
Cc: "devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
 Qi Zheng <arch0.zheng@gmail.com>,
 "linux-arm-kernel@lists.infradead.org" <linux-arm-kernel@lists.infradead.org>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org>
Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org


On 26/01/21 3:39 pm, Rob Herring wrote:
> Commit 7536c7e03e74 ("of/fdt: Remove redundant kbasename function
> call") exposed a bug creating DT nodes in the ATAGS to DT fixup code.
> Non-existent nodes would mistaken get created with a leading '/'. The
> problem was fdt_path_offset() takes a full path while creating a node
> with fdt_add_subnode() takes just the basename.
>
> Since this we only add root child nodes, we can just skip over the '/'.
>
> Fixes: 7536c7e03e74 ("of/fdt: Remove redundant kbasename function call")
> Reported-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
> Cc: Qi Zheng <arch0.zheng@gmail.com>
> Cc: Russell King <linux@armlinux.org.uk>
> Signed-off-by: Rob Herring <robh@kernel.org>

Thanks Rob,

Tested-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
> ---
>   arch/arm/boot/compressed/atags_to_fdt.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/boot/compressed/atags_to_fdt.c b/arch/arm/boot/compressed/atags_to_fdt.c
> index 8452753efebe..31927d2fe297 100644
> --- a/arch/arm/boot/compressed/atags_to_fdt.c
> +++ b/arch/arm/boot/compressed/atags_to_fdt.c
> @@ -15,7 +15,8 @@ static int node_offset(void *fdt, const char *node_path)
>   {
>   	int offset = fdt_path_offset(fdt, node_path);
>   	if (offset == -FDT_ERR_NOTFOUND)
> -		offset = fdt_add_subnode(fdt, 0, node_path);
> +		/* Add the node to root if not found, dropping the leading '/' */
> +		offset = fdt_add_subnode(fdt, 0, node_path + 1);
>   	return offset;
>   }
>   
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel