From patchwork Wed Feb 22 22:10: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: 60705 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp840769wrd; Wed, 22 Feb 2023 14:13:51 -0800 (PST) X-Google-Smtp-Source: AK7set/X6r6o9W7OuwOyoA9yBHZT7ccD+YJnd2EiWLglFqoL9A89BKkMRapObnNeVIMonpvVgY1l X-Received: by 2002:a17:903:687:b0:19a:7548:da22 with SMTP id ki7-20020a170903068700b0019a7548da22mr8475425plb.50.1677104031541; Wed, 22 Feb 2023 14:13:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677104031; cv=none; d=google.com; s=arc-20160816; b=ErLvJaVEY01wF4vD053sdUsb/6sPEbAxlucrhUTDbp51sRvdj4yjOPYa7uPZzGMS0H iL11Emomf0fzz6Wx0+1HTm1oxk3EpyI+LcxX5b06coI+5XqRU4p6dKCHHXaOJYT2xPQA cLU0NOszV+CJdRjdscieA7tJQPyLZxgnN7BT0l26FUidv7HAGNCFk4WNCJvBUnatVJVj pdy1l1ed4m7LkmotzMdlAl/98zdLZnkLewxVnoDVyMSR/+I2427rbE4COSMHQgQRuDl9 omu5tzwRYL8DaIdfNmi212dSAAQQ6s65RsErqu+KZlKLfSlVCRN1o5TsK17f1tvWQuWj I+6Q== 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=Qmd3R6hWIg5q82vLDH06TvWzBz88ixXCMJL8sJY6J/b4wNlfJCROTR+V64AYa2xTi3 eE4CHZ+AV6FZ/1TwYUHlzPzKYCGnHI7PUkhE7d9bqWywyNaeXd0s4k7DxHoPi21AGt/R HlcvecAJGBxIGmNmTEIp4s22RwdWHO37HEz7tINjLporIxes9wXWgwZ3sPtqFtvDvesr SsEyxUOTjlLeVMipxvpqCHnXR3MHXa3jz607druy0Jc0YObEb4sKKm2zHwbA6qvEoW/f XS9btdRozW0Sc0ed2f4zpHjVoNhnnCDZcT4FoVy7Fye4g7vraW6XlQGjSN1uY3zGOu0N 4bhg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=gkgOt5jn; 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 l10-20020a170903120a00b0019ab2f00b90si9150847plh.171.2023.02.22.14.13.38; Wed, 22 Feb 2023 14:13:51 -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=gkgOt5jn; 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 S232166AbjBVWLz (ORCPT + 99 others); Wed, 22 Feb 2023 17:11:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232139AbjBVWLo (ORCPT ); Wed, 22 Feb 2023 17:11:44 -0500 Received: from mail-qv1-xf36.google.com (mail-qv1-xf36.google.com [IPv6:2607:f8b0:4864:20::f36]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1CF49392BE; Wed, 22 Feb 2023 14:11:26 -0800 (PST) Received: by mail-qv1-xf36.google.com with SMTP id op8so10266175qvb.11; Wed, 22 Feb 2023 14:11: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=gkgOt5jnP0EGkBSRBVDtWTyRrxk4P+ulLM6orh8qwdEObuAEmgxpTS8mrl7Sy1vbOp 3lTRsAYmS+l4Q10AW7HHk+WtspQ9vHaHUr+gl2zcEeScU/SoCRen6vpA84C5BpVyC2/n VDoYG1tfdy+Nc6+ROysdMV37oYFJBwSX7203pO0MJng4Voe089c+UoHPUSAypvAmvUkk 8ow3mJqzCcH8esL/MGfR1IdTF7QabUFveqh0HMI4vVkhBavvnqn93RtsrJtFW+3fhD8c lSg8Dxjiq6z1Qh6Fl8YWJ4cjWK5VlRj1UQMIIIc8db/xW1Q0SgsuHh0to4y52sv5j/fp fMcg== 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=CFKff1F5vR50ePVd8TdUJLfjRqt4e7SEwsFHv6RONqYSpLc/A1zuBVQOzZqMZeT60s CTcHUcR9nv5I6MbLwWlJczMlyEA81Lpz34rY3xT/h9bphtgbfmMz887FMXrDs6t5yClP aJ2ofsQ0ey2QVBwW0ETG6oaxM9HE+a82UmsO6BqilLtWADdaO4Mb4zHHGZGiFW0KJTb4 rtFQAIA3oteysqomm7baRKo1fXXIKrssm6+mTCfa0d2tbi1TSN2mx6NA5JqHGVfV5STC Q1uaOx3vhzsIorY6wRA1aM0sdZc6MgVXQUTY31g+Mog/dOfjncbsxtComxbIQgqSGg+R 03Fg== X-Gm-Message-State: AO0yUKUlGmiHl9llTu5LKonnfM+zbFZOLlCYjCsJv3GuvulgDg4XycOk ZIPhFFgsZfbyiW6eVOB5Uss= X-Received: by 2002:a05:6214:c22:b0:56c:858:6c00 with SMTP id a2-20020a0562140c2200b0056c08586c00mr15649929qvd.32.1677103885021; Wed, 22 Feb 2023 14:11:25 -0800 (PST) Received: from xps8900.attlocal.net ([2600:1700:2442:6db0:70ac:b1e4:53db:3994]) by smtp.gmail.com with ESMTPSA id a83-20020ae9e856000000b0073f7f1618e8sm6334294qkg.51.2023.02.22.14.11.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Feb 2023 14:11: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 v2 2/2] of: unittest: treat missing of_root as error instead of fixing up Date: Wed, 22 Feb 2023 16:10:51 -0600 Message-Id: <20230222221051.809091-3-frowand.list@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230222221051.809091-1-frowand.list@gmail.com> References: <20230222221051.809091-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?1758571037055914125?= X-GMAIL-MSGID: =?utf-8?q?1758571037055914125?= 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;