From patchwork Thu Feb 23 21:34:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Rowand X-Patchwork-Id: 61087 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp554639wrd; Thu, 23 Feb 2023 13:59:29 -0800 (PST) X-Google-Smtp-Source: AK7set8jDaiY3w2qOD8iAUQaq6F5F7w2/73ukwd+8ll4/+8h5Q6QuCIenyfDnV0L8tXrMyn6Rg0E X-Received: by 2002:a17:906:d4:b0:8f0:ba09:4abe with SMTP id 20-20020a17090600d400b008f0ba094abemr2054317eji.2.1677189569546; Thu, 23 Feb 2023 13:59:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677189569; cv=none; d=google.com; s=arc-20160816; b=sQSxdhGr1VYCfToXBMsNcSApZYs9X24N0TEi7Jwu/dv4L3uWyTCX3a0M2k0zbbMv9m SPBJsOhTGBy/H93EPAFS4dpVmNtJwPqr1OCk7lrOQZ+dUiYCzunPw+HywPkxE5CiX6ZH 0jmBbz7cYE9JLFRv0+/nN4WkKznPZEps56pOuKv27FRHnk/AkuL1gKnhragIdrqLUOXN LUEXEB7SMqqus9UwASsCpmPfnst3k+hSKKKR0cy+4Az64e7WhjygvjPp3sRR3WNlxLKF SGahEuD2TOaavfr5gB7le+COpgiUvrX5ouCFxDqBAGSSKF2Olkg7ZP9gov5aBPvad54M 3GwQ== 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=EG7BfhWICi210IReUr1JwkGM/hX8ZWUtKNaWTP0Cayw=; b=X7hj2uxfpLKurZBFJ+sVUv+tE2yulvK4DgvtlGFeZ7iH2SjFL3AHOfqHrQCBunLgYs jTBLbGHPUnS659tn7dZN6G9m9mCJQPjSgJ9BQlqOiGNaouPEzNo8p/xo9+8uMHKGegTl O9kYd3gDfRyOhjIEoTAg0DmZ9/aiZPIy1jfImFNO+ajKu9wdwoaVFxqVVJfHujfzZ6u3 MmSAVINYqj2UEXHjAVjPbaGKZDAYAqemYuheqx4VsmAi2CluFeXtPc+ABH4OSPp2J/8C AtRgNuS8T1J4IgOuMgYGwMO43W8rjGYkT1lGXGgS3Ti55RJ+a0Groh+CS4PL6Z7xczV9 qTpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Jaw6YqX3; 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 bf20-20020a170906c51400b008d0743df869si16739986ejb.704.2023.02.23.13.59.06; Thu, 23 Feb 2023 13:59:29 -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=Jaw6YqX3; 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 S229724AbjBWVer (ORCPT + 99 others); Thu, 23 Feb 2023 16:34:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47220 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229711AbjBWVeo (ORCPT ); Thu, 23 Feb 2023 16:34:44 -0500 Received: from mail-oa1-x33.google.com (mail-oa1-x33.google.com [IPv6:2001:4860:4864:20::33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BDFE058493; Thu, 23 Feb 2023 13:34:42 -0800 (PST) Received: by mail-oa1-x33.google.com with SMTP id 586e51a60fabf-172094e10e3so17183252fac.10; Thu, 23 Feb 2023 13:34:42 -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=EG7BfhWICi210IReUr1JwkGM/hX8ZWUtKNaWTP0Cayw=; b=Jaw6YqX3I/wdi0fmfNqg1NUJ/gocDWwOkWX+csGeI//TF8ks9gPp2y6kV09BDut0Y4 JCzhcZKHEkbX69uFLZ0dtwBscVSDBLAS45n219s9fKt9uO9IXVEk/0CJRf4fWCdcm9hT tvEcXRqy+Y5GUTkXaAWDMqOUzJidVuHeN81NHeQMyuwro46jXwkyZhSfvYUGQbEht3an m0zYh5f9b36ru8QVHjlnksS+u9njTuOi79HGnRX6YbwM5+/9YHa3s6yiTiLCePsaAg3Q Ucta2qASJpNDf2m1geK6m3s1qQ/65KzjJxHkCfr+aMkaLKeEaCxSt+Cg2Z/bj5U3qPBE D/sQ== 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=EG7BfhWICi210IReUr1JwkGM/hX8ZWUtKNaWTP0Cayw=; b=K9qHQl8sLOIwh903/Y15ZanrCueQlo4aANvydu6egWaOUckM18AjHPZn1uKQott8N1 dFp9mDNtVts2RfhWaQXzLKdmwDvn3TSG/YHMUEqgqLJAu/kRNDpFdN1bHI5wjvNU+b1n 3HUtmSC6NLyFouglr9n9xJ5oY+u6ImE1TzQ9uAEK7f0leyzopjOxo7cLiXJ9H4TOJXEd AvJitp0xFRvUUQv34oLUldDaYCR353q5/r6ribnZNJ5/s9WdQuwvUAG51MqvicrqoH6T PhQAfqnhwBRyxUoyUIzFORrxUsX77Y9GCLy0FS6mK91DmjgLHvQSV76QkTJjoVJVPclr jUbg== X-Gm-Message-State: AO0yUKW681Ww5lf3KYmY4oB/yIkx1bj73irM/Ej6aFlnfuz77sV+PzAu jIiTWUVd2DaT/JC4AUtXNT0= X-Received: by 2002:a05:6870:3929:b0:16e:8edf:42bb with SMTP id b41-20020a056870392900b0016e8edf42bbmr14552787oap.14.1677188082166; Thu, 23 Feb 2023 13:34:42 -0800 (PST) Received: from xps8900.attlocal.net ([2600:1700:2442:6db0:e42b:73d3:ba1a:1b32]) by smtp.gmail.com with ESMTPSA id r1-20020a4ae501000000b00524fe20aee5sm2903976oot.34.2023.02.23.13.34.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Feb 2023 13:34:41 -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 v3 2/2] of: unittest: treat missing of_root as error instead of fixing up Date: Thu, 23 Feb 2023 15:34:18 -0600 Message-Id: <20230223213418.891942-3-frowand.list@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230223213418.891942-1-frowand.list@gmail.com> References: <20230223213418.891942-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?1758660729644786400?= X-GMAIL-MSGID: =?utf-8?q?1758660729644786400?= 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 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, 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;