From patchwork Tue Jan 26 02:39:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring \(Arm\)" X-Patchwork-Id: 370576 Delivered-To: patch@linaro.org Received: by 2002:a02:a60d:0:0:0:0:0 with SMTP id c13csp4613635jam; Mon, 25 Jan 2021 20:52:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJwgWE+VF8Nser013sMbtxmyPK6QuIZL0Ahy8ai+z1jZP9NnD3zBOruuX8PdE5avrWoLcZE1 X-Received: by 2002:a05:6402:1151:: with SMTP id g17mr3100819edw.48.1611636762312; Mon, 25 Jan 2021 20:52:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611636762; cv=none; d=google.com; s=arc-20160816; b=fpETH+MgYP7kj/2LWYe3uOwpNYKG0IEOWeb7MU9aCZRQQ4REladUFiG1/jA1adIO3X X6EbKK4O0cu3P7R0eif+qKObE8CT6sBVQptLdFK4UUHNaH436ctm1rVC062oeUoiR/Zy MT4Dl7GwrfJv+JgN1Owzdno2pqVBDTgpDbUsv63K+CwSi9aPy2/j99PUMtt2ZegudRjK iCpXoJc7QNiAwydjJiU439goeagFq0QLbxQh8I7CXVnulACqi57I29UdHJDr02MvLnKd c/7ZrlEMgtGOczqSoGRUwdO2bvwiTCfKYaBWryxOHHmK4olF8dkunpdN9Duc2wqOqWCg WMrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=LyjWMQi/Wg/LetZuSHt99dOJAsiyEjqk3II+kk6Ybdc=; b=vZQfSPztpEObb46hBl5WNoqAFF9QQa7Fnr2KU34lTraISguCQSNcK4Jp2ySROjY1rz smpnhpiSf8fxWSFq1kyebKItl9cV8qTzE3DUQxL/zWAVSQqON22bGRJ8ZH6+dMMNXLZB Th3eQ39WfP3CbO0CPgC8f8ZRkDZQ8wjvwBOSyCUWiVFQnX+qZpUFvMQeAuhXHtjHCjbv jFbETi7DOqGod5X5wHgndxF2GS7Zz04lw8AAT/vTCw2sWMkBW0Z7y8UF1ALd/82T9U1L +/KIIo1zxSAjZulmQyhPH9uKgrM/PyVh4AGQNI/OrvE/rCXtY2919Tbts0gx68zj4fyL TS2g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r12si8403643edp.3.2021.01.25.20.52.42; Mon, 25 Jan 2021 20:52:42 -0800 (PST) Received-SPF: pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728738AbhAZEvl (ORCPT + 6 others); 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-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 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(-) -- 2.27.0 Tested-by: Chris Packham 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; }