From patchwork Fri Mar 17 05:34:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Rowand X-Patchwork-Id: 71077 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp163113wrt; Thu, 16 Mar 2023 22:51:09 -0700 (PDT) X-Google-Smtp-Source: AK7set9HTTUHvNT8u+kg8kqBYnkkVqDPkJRTaAmE7O8MvkRB3LnIttD5wpeSowCYN3tzVUTDzY11 X-Received: by 2002:a17:90a:fe8b:b0:23d:2b53:1ae2 with SMTP id co11-20020a17090afe8b00b0023d2b531ae2mr5322907pjb.3.1679032269506; Thu, 16 Mar 2023 22:51:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679032269; cv=none; d=google.com; s=arc-20160816; b=y8gks0FWDYQ2PxG/OllQf4Jy77mvNy8LZhN5NB/IkkrEtFamN819+djfvWxrP5g9jJ P7vOJwr7rJR4dYoutfVIWzml4lEutbOi21yIgvIPq804V1W5i3rqWhbDl/xGFLu8sLd+ LcIXKdWI54JiO8NKc1nUZeJO+WI8UerlJj3ORnKlBWhSPbVLFT3p43Bj02VibvQaig4j FTJ4o3AylsciVw8u6vAWIfORTuxmFHiZ7bgrtjyY00TS9fAiO8+PEJjK6QbubmphotlZ HBJQBO5bgFjPV0ajSHy33dUZjqNRdTb2Q/lKXjauKVAFmxLmDh30pJRiMHOzZ7+jNWBA 61OA== 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=9REZkhiENtutm2XWIH1dQvVKSfKRddJL/3DZpRuUkWI=; b=grJzJMhkrxTzvMgylxwaQ2f28Cup2JznjHRUlcGybAjSg14TC1xeyXfytp5hNlzw/b 2qrKrHvlexwiQ7pbQrOb8aWmRuRCWWKRNTmUbk92CmWwWOqLncsexFtzwuvaTPUZjwD8 beAp36wNqDN/9qUaSJ6M1ERCMOT1huuO9cGCr+nWtPG/PChGKHhftZWNQoRlp4Gy/Y4a nnYlYg8/MU1Lei7ifJ4PoWFlb8Y+yB22bY28J40V1mL1TIrRm0m/8PedBgRC7rR4eMyw AoJjMsnzhFPs7v+dBK6uhf0AAhPkuS3LF5eboQjjEt64JImiAkyk1BLaNeesVo7ETh06 oO5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=lClEe3QY; 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 ha4-20020a17090af3c400b00237413f8c6esi5423547pjb.154.2023.03.16.22.50.53; Thu, 16 Mar 2023 22:51:09 -0700 (PDT) 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=lClEe3QY; 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 S230028AbjCQFef (ORCPT + 99 others); Fri, 17 Mar 2023 01:34:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60108 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229879AbjCQFea (ORCPT ); Fri, 17 Mar 2023 01:34:30 -0400 Received: from mail-qt1-x834.google.com (mail-qt1-x834.google.com [IPv6:2607:f8b0:4864:20::834]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3BCE6768C; Thu, 16 Mar 2023 22:34:29 -0700 (PDT) Received: by mail-qt1-x834.google.com with SMTP id ek9so4536161qtb.10; Thu, 16 Mar 2023 22:34:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679031268; 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=9REZkhiENtutm2XWIH1dQvVKSfKRddJL/3DZpRuUkWI=; b=lClEe3QYl0olxODsxeRKQ/9GrkyopZPsCQqWIyLKjYRQhbVfBjYsQDR5awxURhaUqh GddUuaBNVSfZ+aHbSHQIMUavS4pU1Dcbt+07bCChTKjQwX9JhzmMCGCrXkUEsDl+xZ2u NwsXvtUnreREItuVepUKiCFJzcVQxMrlypG5/sgo9xn3RVHrQbUJuIqNkhMPdMQalTnl r9RKwPkWJbz5ZvkWLaEp4bICNDi3lzaOVb1raG90vQQ08874pcHgcOfuvpdYeXoZPQ3V T0fTpw1V9NPFbGheceYDO4v1VkXwf8TZiRkhvWB9HClruc/hzjvtg2nQcC/154leZpG/ H6eQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679031268; 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=9REZkhiENtutm2XWIH1dQvVKSfKRddJL/3DZpRuUkWI=; b=BUVuV+OXr2dh2nez/Y7uUQFu0zaKE1eicS+m04KVYLaSkbDgNa1XCh9RVWQaFIBs+V Gc8aQSKIMHPsiGMBaz5wfxsPLhnDlltkUpeQI24aZsgCGglxAZCkL2BqYDlkes+VB7Fs bY9QBPIXBihX2zOBHxGYmWkXAsLrP1nidPnXUBmZNYRkG4MNZzIfFprSmBYkyT5qKdkt tgGfdn+qbhmHeiBI0U2MvmGVyzn1hYhHQcvXYLad4eh6MBllVgyftxNU0mfbXeK7tbH8 a8NDefAU+u9dXt5YVi8I6XJklPkq4qX8A85yOilaUUWg2rnjQ3ahWbrJgL7GBSHYfCoh wSqA== X-Gm-Message-State: AO0yUKUcBSf5ll73Jm4W/mT9ItHA+MnLcdBJSvFSuVfQarpc5mC29EBU I9HLt+n0KUFfWkvp7Z2YugE= X-Received: by 2002:ac8:7f8c:0:b0:3bf:b1d0:ab88 with SMTP id z12-20020ac87f8c000000b003bfb1d0ab88mr9894988qtj.5.1679031268305; Thu, 16 Mar 2023 22:34:28 -0700 (PDT) Received: from xps8900.attlocal.net ([2600:1700:2442:6db0:557c:9772:415e:adc7]) by smtp.gmail.com with ESMTPSA id i5-20020ac860c5000000b003b34650039bsm737649qtm.76.2023.03.16.22.34.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 22:34:27 -0700 (PDT) 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 v4 1/2] of: create of_root if no dtb provided Date: Fri, 17 Mar 2023 00:34:14 -0500 Message-Id: <20230317053415.2254616-2-frowand.list@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230317053415.2254616-1-frowand.list@gmail.com> References: <20230317053415.2254616-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?1760592941017995223?= X-GMAIL-MSGID: =?utf-8?q?1760592941017995223?= 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(), will create the default root node if it does not exist. Signed-off-by: Frank Rowand --- Please wait for test results from Clement before accepting. Changes since version 3: - refresh for 6.3-rc1 - unflatten_device_tree() - calculate of_fdt_crc32 if setting initial_boot_params to __dtb_empty_root_begin so CRC check in of_fdt_raw_init() will not fail Changes since version 2: - change of __dtb_empty_root_* from "void *" to "uint8_t []" 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 | 29 ++++++++++++++++++++++++++++- include/linux/of_fdt.h | 2 ++ init/main.c | 2 ++ 6 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 drivers/of/empty_root.dts diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig index 644386833a7b..194e090ceee8 100644 --- a/drivers/of/Kconfig +++ b/drivers/of/Kconfig @@ -54,9 +54,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 d1a68b6d03b3..f65016c2e79f 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -32,6 +32,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 uint8_t __dtb_empty_root_begin[]; +extern uint8_t __dtb_empty_root_end[]; + /* * of_fdt_limit_memory - limit the number of regions in the /memory node * @limit: maximum entries @@ -1326,8 +1333,21 @@ 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; + } + of_fdt_crc32 = crc32_be(~0, initial_boot_params, + fdt_totalsize(initial_boot_params)); + 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 +1387,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 4425d1783d5c..3c443e0c5927 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 Fri Mar 17 05:34:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Rowand X-Patchwork-Id: 71078 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp165136wrt; Thu, 16 Mar 2023 22:59:13 -0700 (PDT) X-Google-Smtp-Source: AK7set96VaJyVnf0EtQLXdqPi4gaYVKqIaDDw1258gmhQzMlVE6zfchmLS70QMSCH7DoryZwOZf/ X-Received: by 2002:a05:6a00:2d3:b0:619:49fe:3be5 with SMTP id b19-20020a056a0002d300b0061949fe3be5mr5617118pft.1.1679032753062; Thu, 16 Mar 2023 22:59:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679032753; cv=none; d=google.com; s=arc-20160816; b=GdF1D3Nrs2BOyEKHDiHdZ38BtC0bisyUNaBn2l22ARf/P8KKcLYg3JbAQ545U/iCI2 2vIpRT1vFJTcNs1Sf+mr7G5ra2kkp/Y2GcjSZb/ge3AozOjdYrW/owwdaZ/u0BHBkVoI 6MbNQbR4rzXn5j4zinhe9aM7w7tjXbyYJe5K6S9nQwPQHbk7HZjaYYO9eiSfXq2prVrG jiRhdnaD6jN+0nd+dUDs5+ni32+0bT1KU8Avl+KGLgqLnzTJnP3lxXQddg8LI39ZzLcE chE5gxMysKaBqDQQzXf//q2yzl86yXap4BdcSdlEVqR/T8vKFfIbgnRzzdkBvYdHmsXC dNew== 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=7/GcK3ST5seDShdKUAT+Ly3z8BvqJ6uC+lJYQIWJMMM=; b=iL1iFVv3oP6h6U2EuCQL2WncZv0Jb/lg/RctTVCQLaf0bF2qUL+LI+3h9NkEl9J5JW rCL7w2ngqxv1XAgRL3+NofCgGt5DSC9IqZqwwSWHPTm7a3VIOVoX5DqZI78nukFOkwGW Bub05lxMnDBC7+gKxdGip1EZ6Q7GBMd0UlGL9yzVUImD0HNVr86eYENhIjBtW2zoA3Ka InVcj/1yRZfGypEok9EyiXehSzZVrP58hjiqs4du32+ZuBi0n9S+hCWhYzD1UKQun1fP TTiUF1WkHIZtLnqS5IK6nPeKZNtwqG8iXqkoJFYQ8Wjh3revrUU3VoEQCp/OsuF5KO+C C1Qg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=lFyz6F9U; 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 16-20020a056a00071000b005de484ca9d0si1379582pfl.342.2023.03.16.22.58.59; Thu, 16 Mar 2023 22:59:13 -0700 (PDT) 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=lFyz6F9U; 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 S230037AbjCQFei (ORCPT + 99 others); Fri, 17 Mar 2023 01:34:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229974AbjCQFeb (ORCPT ); Fri, 17 Mar 2023 01:34:31 -0400 Received: from mail-qt1-x82e.google.com (mail-qt1-x82e.google.com [IPv6:2607:f8b0:4864:20::82e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E13A2F940; Thu, 16 Mar 2023 22:34:29 -0700 (PDT) Received: by mail-qt1-x82e.google.com with SMTP id n2so4591660qtp.0; Thu, 16 Mar 2023 22:34:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679031269; 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=7/GcK3ST5seDShdKUAT+Ly3z8BvqJ6uC+lJYQIWJMMM=; b=lFyz6F9UsZO61Y6dJ947WIhMUEJnlu9oTELO/Xk2A6yS/VqTz4qMkEarvYPmk8l8Ct P8jdcv0BqrvNDq+/1Sq3kmUQwa24jskLcmx6bH9pyCxodORxu8pD1UgaoSgjVohEvDah ifTE5PU75RP5rW5SojIhSIs5PNSxc8jxhMVh1lEEzfplVqyE6CxOiTRnJe4NwWzemtPb DEB2etFF9HKDqXH+4EwZkFIctPBb2kC2kN9/fDrgvshMVbcV0wsUBRNpdvPoD2uNqXyH FFEe+wkOL+Ot2qX89SfH6f9n9qcxvcY964CLm97iIPdQm/uyWVGmRSo4loRo5FsXs8vr 0IwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679031269; 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=7/GcK3ST5seDShdKUAT+Ly3z8BvqJ6uC+lJYQIWJMMM=; b=T/S1a1scvd/lT0PFI01VrrfkljsX7Iil/1P83BejN5ALvs3Z7sDgIBab5MW0KrSvfT HPUSWSpfYo6rgYVyl+BnkDuVoaiCmD06J+Dfso8g22pmD9EgMj/vX+BLWcDgJJuE5k9Z 0gq90PKmQxAUt8QHJ1CQ1EHvQwTFiOnCg24BorbWVFMCDaSCsmhZwk/nz6kKwIwsgi8Z JdMwptJOq5rpy5b4f84qxYCcOwfiWIiNs8SuQwbVJgqVdbeQQo4mXhNYeIiTK9jI+jwK VommwN1tmk6cQfYU/gR3YaMe/sfZ5Gw9I5034xyvty13mdBU6PF668Kpyz7kW1ReiRY1 aMkw== X-Gm-Message-State: AO0yUKWMrWEvgmaNNjeCRiZNqbc+XgHNh5d5e0gtOF3GpKwKprNr2f1L L8cSvfOmqbA2OClrK4QTmaYao/+uN+g= X-Received: by 2002:ac8:5894:0:b0:3bf:c388:cbea with SMTP id t20-20020ac85894000000b003bfc388cbeamr11456463qta.43.1679031269060; Thu, 16 Mar 2023 22:34:29 -0700 (PDT) Received: from xps8900.attlocal.net ([2600:1700:2442:6db0:557c:9772:415e:adc7]) by smtp.gmail.com with ESMTPSA id i5-20020ac860c5000000b003b34650039bsm737649qtm.76.2023.03.16.22.34.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 22:34:28 -0700 (PDT) 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 v4 2/2] of: unittest: treat missing of_root as error instead of fixing up Date: Fri, 17 Mar 2023 00:34:15 -0500 Message-Id: <20230317053415.2254616-3-frowand.list@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230317053415.2254616-1-frowand.list@gmail.com> References: <20230317053415.2254616-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?1760593448154788577?= X-GMAIL-MSGID: =?utf-8?q?1760593448154788577?= 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. Remove the unittest code that unflattens the unittest overlay base if architecture is UML. Signed-off-by: Frank Rowand --- Changes since version 3: - refresh for 6.3-rc1 - remove the CONFIG_UML case of populating the devicetree - unittest_data_add() - move an EXPECT_BEGIN() to after an error check that can result in an early return Changes since version 2: - none 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, 4 insertions(+), 12 deletions(-) diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index b5a7a31d8bd2..8dc293ac08b7 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c @@ -1476,20 +1476,16 @@ static int __init unittest_data_add(void) return -EINVAL; } + /* attach the sub-tree to live tree */ 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; + pr_warn("%s: no live tree to attach sub-tree\n", __func__); + kfree(unittest_data); + return -ENODEV; } EXPECT_BEGIN(KERN_INFO, "Duplicate name in testcase-data, renamed to \"duplicate-name#1\""); - /* attach the sub-tree to live tree */ np = unittest_data_node->child; while (np) { struct device_node *next = np->sibling; @@ -3612,10 +3608,6 @@ static int __init of_unittest(void) add_taint(TAINT_TEST, LOCKDEP_STILL_OK); /* adding data for unittest */ - - if (IS_ENABLED(CONFIG_UML)) - unittest_unflatten_overlay_base(); - res = unittest_data_add(); if (res) return res;