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;