From patchwork Wed Feb 22 03:54:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Rowand X-Patchwork-Id: 60338 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp372419wrd; Tue, 21 Feb 2023 20:08:25 -0800 (PST) X-Google-Smtp-Source: AK7set+YFObNvXP/n24efv8iJzcKoqgNK2NzPbUDfonH+U9LI8Y7iDT1hpNY3yawoe9pqLDrWuSo X-Received: by 2002:a17:902:fa88:b0:192:ac33:7f91 with SMTP id lc8-20020a170902fa8800b00192ac337f91mr4711296plb.69.1677038904961; Tue, 21 Feb 2023 20:08:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677038904; cv=none; d=google.com; s=arc-20160816; b=WSw2BUla8XcAirgbKMOLT0QdTydQ3Grc7+VTAaUW1zS/xWEml6MIg2GBnSlGp4PxDU +a/Q6M+pY4vnxcGIR84+9H4kSS4KBgOvD+8vX/0o4qOYoa5z7q6h9cQyqBg5DEccM1N/ /o3Ygykc4fZdPxfzuUIU+ycIXDm/UGSfOpGZbGxswW2ea+S8LB/Tte0XikKTo9LyQ6C5 EiBxea2U/kjSp1fspCDprRwKBffvRIA5bhVOlE3/bBLaeQiN4fy1XnmgNE0mBKb+GhfF h1GBdJpmyE5CB/Pw1UNI+BkxLE5XVLEYgC1Rq0XPrhn6HkEZXnS1cUesapkyWJOcOsWK RYHw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Dl7cNlq6eol+0bH4dQvHPF1M13TBElOJT4S6JzbFEnE=; b=mpZVW50/itB+FbHtwBhx2oXZKXAx7bcTuWI03kAxdgIeLDPDwGCrJzutZyQEIXOV08 kAHRvNLZHbsxB2ANOS7QrKDcaq3H09cKjZE1Br4er6CSReub/LKcIbjI0biKcVSuwq0o pXiI+5mNMCXzKxr4EFz0OjYl61o8gvlaQA2nDRYcunaBpg9bT4o8jIOr36dQAsmiIFWP Wa7ximhgZCgvoUsb+59uGa4pk14St09joYfEDRFGOmPjTRj0yLyTBzqQisrQRN5xu0LX 4iKPQ7YVqgTjdVEjfRtOVs5N1mhu1tsiNUKnEmlCO9i2OZpk54havpHUlz4Q+AEaIkuR 82DQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=IkuNEjha; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z13-20020a1709027e8d00b001944e99d38fsi14306830pla.557.2023.02.21.20.08.12; Tue, 21 Feb 2023 20:08:24 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=IkuNEjha; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231577AbjBVDzc (ORCPT + 99 others); Tue, 21 Feb 2023 22:55:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44642 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231515AbjBVDz1 (ORCPT ); Tue, 21 Feb 2023 22:55:27 -0500 Received: from mail-ot1-x335.google.com (mail-ot1-x335.google.com [IPv6:2607:f8b0:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7EE5F31E2C; Tue, 21 Feb 2023 19:55:25 -0800 (PST) Received: by mail-ot1-x335.google.com with SMTP id e18-20020a0568301e5200b00690e6abbf3fso1490095otj.13; Tue, 21 Feb 2023 19:55:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Dl7cNlq6eol+0bH4dQvHPF1M13TBElOJT4S6JzbFEnE=; b=IkuNEjhaZ1PliD2souixHHwtTrSoR5WGyijs3MJtI9lJq1LNy+Nx3s7KrddRG47is5 At8xhnJy3a5RZmCurWUZk58LX5QFfQwHzh7ulG1DKATiHw3Z9bgtb0+k2eDnR1gZpQMS K31c1ifrAiCOjTXZLjKeJB8YUPIMf9huqqyDLm1GecnjAOILwZlj5RYhb/YpSyD8wfPQ qgTWIQJP2hiuKCHw3jY7M9PWMrIWTAek7kKbCsdmPEEv7PZmPUfsvJziV0tFJT3SJV/R p/YVa1RjegYanaOCbGbJEZzQop/SFMxG5vd9VPCmv9PRMMVAkFsQrRxRtL9F/XJf2RH3 DCHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Dl7cNlq6eol+0bH4dQvHPF1M13TBElOJT4S6JzbFEnE=; b=YIFR6SnsVtSQmfkP4a824GdCz913nW9pgf6EYqDR0o0ej4MA7BlitJC0n+Bz4GoI+c qDeo3bwJdd+5hbBdXLETlC1ACSCRRdrP7BV/SbJVAUDWlkqDNHRuSm1zk7bsh3MRlzeA FZAlD9U+uZvWK898kUzTLXwZVPncYvC85MZHpBKNVNXDUfTIZX2irVCtMpGFI8IkyWUr xrSvaiU50GSQtQzly4o+eMTLzWFJ3zfzU2BcInCRnasOq4QaVROTzdbeMwPtKsoY7YEf EOjVn92/uqSlVkIMNHTPp9MudSIDgrHKVwRohgx76UiPNE5s97twq39LVXbBuKJyy4Pl hFvw== X-Gm-Message-State: AO0yUKVmIEbRwbfMUsMCo1quHnZnJT66bUYh7TQvjv30zo+YfznJ7oz9 BLIHwWrPYbyEf2523BRzFAU= X-Received: by 2002:a05:6830:448b:b0:690:e27f:3200 with SMTP id r11-20020a056830448b00b00690e27f3200mr4176729otv.12.1677038124818; Tue, 21 Feb 2023 19:55:24 -0800 (PST) Received: from xps8900.attlocal.net ([2600:1700:2442:6db0:70ac:b1e4:53db:3994]) by smtp.gmail.com with ESMTPSA id y6-20020a056830070600b00684cbd8dd49sm533404ots.79.2023.02.21.19.55.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 19:55:24 -0800 (PST) From: Frank Rowand To: Rob Herring , =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Lizhi Hou , Allan Nielsen , Horatiu Vultur , Steen Hegelund , Thomas Petazzoni Subject: [PATCH 1/2] of: create of_root if no dtb provided Date: Tue, 21 Feb 2023 21:54:51 -0600 Message-Id: <20230222035452.803375-2-frowand.list@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230222035452.803375-1-frowand.list@gmail.com> References: <20230222035452.803375-1-frowand.list@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758502746862770251?= X-GMAIL-MSGID: =?utf-8?q?1758502746862770251?= When enabling CONFIG_OF on a platform where of_root is not populated by firmware, we end up without a root node. In order to apply overlays and create subnodes of the root node, we need one. Create this root node by unflattening an empty builtin dtb. If firmware provides a flattened device tree (FDT) then the FDT is unflattened via setup_arch(). Otherwise, setup_of() which is called immediately after setup_arch(), and will create the default root node if it does not exist. Signed-off-by: Frank Rowand --- There are checkpatch warnings. I have reviewed them and feel they can be ignored. Changes since version 1: - refresh for 6.2-rc1 - update Signed-off-by - fix typo in of_fdt.h: s/of_setup/setup_of - unflatten_device_tree(): validate size in header field dtb_empty_root that will be used to copy dtb_empty_root - add Kconfig option to manually select CONFIG_OF_EARLY_FLATTREE drivers/of/Kconfig | 7 ++++++- drivers/of/Makefile | 2 +- drivers/of/empty_root.dts | 6 ++++++ drivers/of/fdt.c | 27 ++++++++++++++++++++++++++- include/linux/of_fdt.h | 2 ++ init/main.c | 2 ++ 6 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 drivers/of/empty_root.dts diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig index 80b5fd44ab1c..591cfe386727 100644 --- a/drivers/of/Kconfig +++ b/drivers/of/Kconfig @@ -42,9 +42,14 @@ config OF_FLATTREE select CRC32 config OF_EARLY_FLATTREE - bool + bool "Functions for accessing Flat Devicetree (FDT) early in boot" select DMA_DECLARE_COHERENT if HAS_DMA select OF_FLATTREE + help + Normally selected by platforms that process an FDT that has been + passed to the kernel by the bootloader. If the bootloader does not + pass an FDT to the kernel and you need an empty devicetree that + contains only a root node to exist, then say Y here. config OF_PROMTREE bool diff --git a/drivers/of/Makefile b/drivers/of/Makefile index e0360a44306e..cbae92c5ed02 100644 --- a/drivers/of/Makefile +++ b/drivers/of/Makefile @@ -2,7 +2,7 @@ obj-y = base.o device.o platform.o property.o obj-$(CONFIG_OF_KOBJ) += kobj.o obj-$(CONFIG_OF_DYNAMIC) += dynamic.o -obj-$(CONFIG_OF_FLATTREE) += fdt.o +obj-$(CONFIG_OF_FLATTREE) += fdt.o empty_root.dtb.o obj-$(CONFIG_OF_EARLY_FLATTREE) += fdt_address.o obj-$(CONFIG_OF_PROMTREE) += pdt.o obj-$(CONFIG_OF_ADDRESS) += address.o diff --git a/drivers/of/empty_root.dts b/drivers/of/empty_root.dts new file mode 100644 index 000000000000..cf9e97a60f48 --- /dev/null +++ b/drivers/of/empty_root.dts @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0-only +/dts-v1/; + +/ { + +}; diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index b2272bccf85c..0d2f6d016b7e 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -33,6 +33,13 @@ #include "of_private.h" +/* + * __dtb_empty_root_begin[] and __dtb_empty_root_end[] magically created by + * cmd_dt_S_dtb in scripts/Makefile.lib + */ +extern void *__dtb_empty_root_begin; +extern void *__dtb_empty_root_end; + /* * of_fdt_limit_memory - limit the number of regions in the /memory node * @limit: maximum entries @@ -1326,8 +1333,19 @@ bool __init early_init_dt_scan(void *params) */ void __init unflatten_device_tree(void) { - __unflatten_device_tree(initial_boot_params, NULL, &of_root, + if (!initial_boot_params) { + initial_boot_params = (void *) __dtb_empty_root_begin; + /* fdt_totalsize() will be used for copy size */ + if (fdt_totalsize(initial_boot_params) > + __dtb_empty_root_end - __dtb_empty_root_begin) { + pr_err("invalid size in dtb_empty_root\n"); + return; + } + unflatten_and_copy_device_tree(); + } else { + __unflatten_device_tree(initial_boot_params, NULL, &of_root, early_init_dt_alloc_memory_arch, false); + } /* Get pointer to "/chosen" and "/aliases" nodes for use everywhere */ of_alias_scan(early_init_dt_alloc_memory_arch); @@ -1367,6 +1385,13 @@ void __init unflatten_and_copy_device_tree(void) unflatten_device_tree(); } +void __init setup_of(void) +{ + /* if architecture did not unflatten devicetree, do it now */ + if (!of_root) + unflatten_device_tree(); +} + #ifdef CONFIG_SYSFS static ssize_t of_fdt_raw_read(struct file *filp, struct kobject *kobj, struct bin_attribute *bin_attr, diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h index d69ad5bb1eb1..f0dc46d576da 100644 --- a/include/linux/of_fdt.h +++ b/include/linux/of_fdt.h @@ -81,6 +81,7 @@ extern const void *of_flat_dt_match_machine(const void *default_match, /* Other Prototypes */ extern void unflatten_device_tree(void); extern void unflatten_and_copy_device_tree(void); +extern void setup_of(void); extern void early_init_devtree(void *); extern void early_get_first_memblock_info(void *, phys_addr_t *); #else /* CONFIG_OF_EARLY_FLATTREE */ @@ -91,6 +92,7 @@ static inline void early_init_fdt_reserve_self(void) {} static inline const char *of_flat_dt_get_machine_name(void) { return NULL; } static inline void unflatten_device_tree(void) {} static inline void unflatten_and_copy_device_tree(void) {} +static inline void setup_of(void) {} #endif /* CONFIG_OF_EARLY_FLATTREE */ #endif /* __ASSEMBLY__ */ diff --git a/init/main.c b/init/main.c index e1c3911d7c70..31e0931b5134 100644 --- a/init/main.c +++ b/init/main.c @@ -101,6 +101,7 @@ #include #include #include +#include #include #include @@ -961,6 +962,7 @@ asmlinkage __visible void __init __no_sanitize_address start_kernel(void) pr_notice("%s", linux_banner); early_security_init(); setup_arch(&command_line); + setup_of(); setup_boot_config(); setup_command_line(command_line); setup_nr_cpu_ids(); From patchwork Wed Feb 22 03:54:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Rowand X-Patchwork-Id: 60337 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp372150wrd; Tue, 21 Feb 2023 20:07:32 -0800 (PST) X-Google-Smtp-Source: AK7set/9PjucCo3fEWUU3qlA0mn4fU0mRiD4fgRU/wkJTOfdGYyUxEYlrClDKnjXYfXI8VaWtYwy X-Received: by 2002:a17:907:a801:b0:8a9:e031:c4ae with SMTP id vo1-20020a170907a80100b008a9e031c4aemr14678148ejc.2.1677038852018; Tue, 21 Feb 2023 20:07:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677038851; cv=none; d=google.com; s=arc-20160816; b=vLeECo+HZ1Dt29f9bgREGUUchLbweepb88LdQmPg/x0EcycToLh9a275le7ppeDqA+ 0RuhqctkN0h+/6AW/wJlwsu8nnTKw5lTy3Pxmv8kpr3X0g1dmisAQQMUBSr4R1pb0cxg pKXLRjmJEV3EDveOaGP2GemtKlgWofw2i1BUHfeZY7Dwq4mIWF40BOqtwkV+UCsK8yH4 vutI3xR2DY+SVnqMfmsOKY2e3TvapmqteWjWNVePT0tJEZEaqnZy0NMESD8ErPVK1BOW sDZYl2LNkfqXg5GbTkBCaQCGL9hM9Vt6TpqckuZy9YsoB/zhfTrfOFzNLGL91hJ1CwQh Ol/Q== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=RisiUnTKxh0SthJdKQRZqo4o/ROREVq/nJM+wr/YiyI=; b=mqJ2NVS5RYKhT1TguuE4zwoAuORHnH+3XPyWqWYDoJAZYJMQGv9SqlMNYRK0YhL/bu 7HgYXp51XmDbqW3cIPCTWzYqaIvmeUGtBWTxVBtyL9ReQGtHSRU8K+540yFqvhudT/AZ JDh3JDPpGISxe+T6iZQ6pzAp7M0ibl2js8Wy0YLYsq84KpVxDtzolmklaPWAcHsNVsxf +0xQqVGo8YCuKRsNXZB2hZKoicudFTqKs6hn/nVKFX23bTMGe2zsM0T0IfYRTFfvgUA2 PVm353ZwutWvhI/yeuEJi2eziegmx5NHER/JHrsf8K8GWt0X4qhqo9KGOiIxWFiwszBK mO7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=mJzj0Kh6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gk15-20020a17090790cf00b008dc042cf51dsi5393825ejb.751.2023.02.21.20.07.08; Tue, 21 Feb 2023 20:07:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=mJzj0Kh6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231561AbjBVDz3 (ORCPT + 99 others); Tue, 21 Feb 2023 22:55:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44644 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231520AbjBVDz1 (ORCPT ); Tue, 21 Feb 2023 22:55:27 -0500 Received: from mail-ot1-x329.google.com (mail-ot1-x329.google.com [IPv6:2607:f8b0:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6D03B31E0F; Tue, 21 Feb 2023 19:55:26 -0800 (PST) Received: by mail-ot1-x329.google.com with SMTP id h6-20020a9d7986000000b0068bd8c1e836so1235011otm.3; Tue, 21 Feb 2023 19:55:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=RisiUnTKxh0SthJdKQRZqo4o/ROREVq/nJM+wr/YiyI=; b=mJzj0Kh6Ny+WV2zRyd/i0FgKix70BpBi/bk64KxYVV1kMpmOSO0KbfIfqfyAJHVfjL 91jQhvYUwAB2jy/yywyIG1CCdBcH1D2O7Z+rPsMIMB2rRw++E78s9ktgrmGysJo2kKmR hSMq/pW8ibFmpnJCFE8TAByaGUTDFycE+29NFuv4cC+kk/gVjDIu11jDn5vLGrOAyQNb Fq1jBuiJZIxtTqgY7wS5aQkfdUumkUJ803fv+RUIe7vurWdzpOYbLzFA24igUqoikXxG YL99EguEl0vf6QHe+QFcfkcP3JA0KA0V3hCR0g8XOEyb0MSJoLfAOBeWOdRkoNL1HkOB 0xcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RisiUnTKxh0SthJdKQRZqo4o/ROREVq/nJM+wr/YiyI=; b=BWYZ33/20AVqpWqr8XTSTeE5DtTPgoYKooEDnUS7Uty0xiXXHMFfcIw+1OM+AAzQ16 DZn4aeiHipqElzjo7x3U4DOJnZF73hxqXXdUDnumm57f57fgFcWYbktEqPpr1ieaLN56 P3+34kvXwrJtR21yctG2nhWbCJWYPADy/C2B0CChasGOciHXJesU0DuJH3XKeVv14brT lDUs+13ENpfYPq2Lnn3uYRS5gLj4ybVxnTItp/A7jfYPfT4fUhiiUfzQclFdzjNnCEZm iMRNTKD4Uul27EoR6L1Xux6CIGPqopPU7QKiEijbOkF1B0+Oq2jqEpzejOxUOBLnyAer giwg== X-Gm-Message-State: AO0yUKXkbMA9lkKChJzY/+UeraJM6P7pP+oUy7huw65y/4xYvHW41kF1 tDdmofm6PzLcuziZ9xcxjcY= X-Received: by 2002:a05:6830:3115:b0:68b:cb07:49ec with SMTP id b21-20020a056830311500b0068bcb0749ecmr4527670ots.14.1677038125821; Tue, 21 Feb 2023 19:55:25 -0800 (PST) Received: from xps8900.attlocal.net ([2600:1700:2442:6db0:70ac:b1e4:53db:3994]) by smtp.gmail.com with ESMTPSA id y6-20020a056830070600b00684cbd8dd49sm533404ots.79.2023.02.21.19.55.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 19:55:25 -0800 (PST) From: Frank Rowand To: Rob Herring , =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Lizhi Hou , Allan Nielsen , Horatiu Vultur , Steen Hegelund , Thomas Petazzoni Subject: [PATCH 2/2] of: unittest: treat missing of_root as error instead of fixing up Date: Tue, 21 Feb 2023 21:54:52 -0600 Message-Id: <20230222035452.803375-3-frowand.list@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230222035452.803375-1-frowand.list@gmail.com> References: <20230222035452.803375-1-frowand.list@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758502690892757240?= X-GMAIL-MSGID: =?utf-8?q?1758502690892757240?= setup_of() now ensures that of_root node is populated with the root of a default devicetree. Remove the unittest code that created of_root if it was missing. Verify that of_root is valid before attempting to attach the testcase-data subtree. Signed-off-by: Frank Rowand --- Changes since version 1: - refresh for 6.2-rc1 - update Signed-off-by - fix formatting error (leading space) in patch comment drivers/of/unittest.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index bc0f1e50a4be..006713511c53 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c @@ -1469,20 +1469,16 @@ static int __init unittest_data_add(void) return -EINVAL; } - if (!of_root) { - of_root = unittest_data_node; - for_each_of_allnodes(np) - __of_attach_node_sysfs(np); - of_aliases = of_find_node_by_path("/aliases"); - of_chosen = of_find_node_by_path("/chosen"); - of_overlay_mutex_unlock(); - return 0; - } - EXPECT_BEGIN(KERN_INFO, "Duplicate name in testcase-data, renamed to \"duplicate-name#1\""); /* attach the sub-tree to live tree */ + if (!of_root) { + pr_warn("%s: no live tree to attach sub-tree\n", __func__); + kfree(unittest_data); + return -ENODEV; + } + np = unittest_data_node->child; while (np) { struct device_node *next = np->sibling;