From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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=-17.0 required=3.0 tests=BAYES_00,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT 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 B7DA1C43381 for ; Tue, 26 Jan 2021 04:52:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8184222B3B for ; Tue, 26 Jan 2021 04:52:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728738AbhAZEvl (ORCPT ); Mon, 25 Jan 2021 23:51:41 -0500 Received: from mail-ot1-f48.google.com ([209.85.210.48]:37996 "EHLO mail-ot1-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732240AbhAZCjt (ORCPT ); Mon, 25 Jan 2021 21:39:49 -0500 Received: by mail-ot1-f48.google.com with SMTP id s2so12712565otp.5 for ; Mon, 25 Jan 2021 18:39:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=LyjWMQi/Wg/LetZuSHt99dOJAsiyEjqk3II+kk6Ybdc=; b=drT0wEd++raUXuiR3DLOyn+5AbyZaFbn5H1CVs0AbFkzv1xpV2z/Z881PfXDSP31d6 //CnBTDo9WwZCjnpjMiklDo354f/txCUaSc/biXMT3bofQHzM9KtxyuDXkFSUIK4emBx wJwwL1AgAb8ZMwUYq4yHbVOlBIWxUG2ykNuAAVUkTdnXXl/A4E+JuO/R0EUOvOiAlkSB rxoRUptIThCEVqhCGx1t0+bPDsWjCjTsg9pjvirAdu4GreovTomX6eVxahLy6eVVck6/ IiusblyREmYDGlKZQA2dQJYfXLTvSb/XPXnTWu4rpphQa2WuVXB2PKoD09Q5xvsof4g7 8zGA== X-Gm-Message-State: AOAM530RfPury1SVnU0XdC/s/Ixf+6u/P1CEJ2HLrNzxx2r43q5wt+68 YtOLEF6pGeidD8H14jaL1Q== X-Google-Smtp-Source: ABdhPJzVz6r4O2ks+3G24uVhIq7vNxlpW/6RIVcGGmctLSSwXYn3iryXLjWs2HpIt6iQCJjA+fYVug== X-Received: by 2002:a05:6830:1ac3:: with SMTP id r3mr2633669otc.363.1611628747483; Mon, 25 Jan 2021 18:39:07 -0800 (PST) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id k20sm78376otr.34.2021.01.25.18.39.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Jan 2021 18:39:06 -0800 (PST) From: Rob Herring To: Russell King , Chris Packham Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Qi Zheng Subject: [PATCH] ARM: zImage: atags_to_fdt: Fix node names on added root nodes Date: Mon, 25 Jan 2021 20:39:05 -0600 Message-Id: <20210126023905.1631161-1-robh@kernel.org> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org 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 Cc: Qi Zheng Cc: Russell King Signed-off-by: Rob Herring --- 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; } -- 2.27.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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=-17.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 C2A7EC433E0 for ; Tue, 26 Jan 2021 02:40:43 +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 6C7C922AAA for ; Tue, 26 Jan 2021 02:40:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6C7C922AAA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org 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:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=WP2pnKTTvvzipe6OnO1S2zr2aNg64zULzz1CV9mGd4o=; b=MJsqWovXKlBAlxB2Z3i73jifhk gzOUZianbqQaEQf/HXgZy2Ddhvh/6xyMaCA2uWn1viI+fJQJHD1UX9qIcJQJMX4jmajPHb3tkS/1h TKtolI8Ow/OTNjfeXnAwGFWwfuygsmGcivVMtZpRvfUodI8hejjdha1MfFd18zN/DYRS7ijHRjYgm ChLaqqhb9+4Smn9XNrdpkswNjEJ2C+6uEoGUctP8a0tGfBXmBmnt0VY+E1qlPVLDqNBgq/teIw0J+ qj039lmjEvr56HY/2miK2JWK6+LT7Qfad0hpXxeSbNoL3g44Bg3BIY3cwzWKWmmWphjgHpQpJBM+Y StzuXogA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l4EG7-00067p-2X; Tue, 26 Jan 2021 02:39:11 +0000 Received: from mail-ot1-f51.google.com ([209.85.210.51]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l4EG4-00067J-DL for linux-arm-kernel@lists.infradead.org; Tue, 26 Jan 2021 02:39:09 +0000 Received: by mail-ot1-f51.google.com with SMTP id f6so14897082ots.9 for ; Mon, 25 Jan 2021 18:39:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=LyjWMQi/Wg/LetZuSHt99dOJAsiyEjqk3II+kk6Ybdc=; b=RVCHAiLKAw3H5m+LSUVplgMdbzMjht9xwDo6uh1qP2Kjj4qP6ApqdeG3rZOXABlOfc dircOupqURa63M45PIi3q462MaNxm3eMQAQFYjsohfU/quG+6RNrwUmQrh47dsDHko5a f6vVf9eq9QN2RW+prhFF7kgcfIgxGeqaEk/eD0HI9b/rG1VK7YlqfbudReDs5mX6g5zX Ux7RXqMtRo89kQo+i1d2INTjYZHq50D3fYlZcX/Kb4MzR23UyDR7h1vhS8keZ3YA59Hq P/JnAhCbfNEFrk4k0p2WGnnvN9pgusvQYWqB5fkCxxtKibqJflE4OgIF6PqyeBibqt32 ftsw== X-Gm-Message-State: AOAM533QrGtnv2EN2EJLHWiyEvkn2tWpFPpHeUuawNFLzJIt94m4SD5q L167nlqQohFqZg1K3kHYig== X-Google-Smtp-Source: ABdhPJzVz6r4O2ks+3G24uVhIq7vNxlpW/6RIVcGGmctLSSwXYn3iryXLjWs2HpIt6iQCJjA+fYVug== X-Received: by 2002:a05:6830:1ac3:: with SMTP id r3mr2633669otc.363.1611628747483; Mon, 25 Jan 2021 18:39:07 -0800 (PST) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id k20sm78376otr.34.2021.01.25.18.39.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Jan 2021 18:39:06 -0800 (PST) From: Rob Herring To: Russell King , Chris Packham Subject: [PATCH] ARM: zImage: atags_to_fdt: Fix node names on added root nodes Date: Mon, 25 Jan 2021 20:39:05 -0600 Message-Id: <20210126023905.1631161-1-robh@kernel.org> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210125_213908_453961_873E62EC X-CRM114-Status: GOOD ( 15.04 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Qi Zheng , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 Cc: Qi Zheng Cc: Russell King Signed-off-by: Rob Herring --- 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; } -- 2.27.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel