From patchwork Tue Jul 25 22:15:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lizhi Hou X-Patchwork-Id: 125882 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a985:0:b0:3e4:2afc:c1 with SMTP id t5csp48268vqo; Tue, 25 Jul 2023 15:36:44 -0700 (PDT) X-Google-Smtp-Source: APBJJlHK8SBSHUxkxsx6dItUaziS4dBl9okkTCKXPe9Yn02G0G1kB5Bfc79PK0Yb+8k+NaoN2oco X-Received: by 2002:a05:6a21:32a9:b0:137:a9d7:d8cc with SMTP id yt41-20020a056a2132a900b00137a9d7d8ccmr472992pzb.24.1690324604047; Tue, 25 Jul 2023 15:36:44 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1690324604; cv=pass; d=google.com; s=arc-20160816; b=aNPBlQuVhoBJal37MI+oKN2iz5jc2lLaT6Y5JDOiuiL/+q3Sygs6v4LfCP/vRTGHsN J5mNfmLeKv/NxGnKePTSHkSwkN6EDcHwrNYMNF2TGITspEimDNONoSW+QTiNyJjV1G1I G6FfXqzynqIe9teTq/bfScGHqYNsj54v+XYc+P4xnal7l4HvSszaUfgNmyiyIH42MyuH bbiqJL9+/KmSBe4LTFpy2o/2zMCGergFd7/N4HiYXxsywOO4eKcpy/tjM0O2MSvwaZuS 5DLWmDhmCHQDkmCrIhyYFl/Gvt/HGmy6eAOJA91Chk4VqKb9QfRi3GUQnretsO0E2pA0 rijw== ARC-Message-Signature: i=2; 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=Mb8fk3c6owXtbs0RJr9UCcTG6YiCOgLA8W5ZtA7S1NI=; fh=4woVYSlX/aH5Dx7feWWKhyl2lja0215bDfHlt4737xg=; b=WGkCxOdrG3NB0hxSnE+3XB31bZ/cDXVedCIfNKLKc0NNkITMd14x5LeHWB5YOIcoy6 GmHNU8TMmhsexRk4TVYtFe4+9toHWo/iXBKAlVD3gC8LM+45cQgtzjxrVFQzoq5F1SSZ RPdCUDAnjsGJwfxl4j+/OQewgE5ocmbU4Bu42Weqv6nRDKOaqklGnWVHXr4A6gZEPwa/ L8kdrAQvtnyG+D6um+nSeHwqWBAuekl3P0ZIWQAELqirPZef1yWLXf+5xMMTx7bdNjoN k3IhFxx6KV5FEz3wNuJ8mS12BgRnr9njyy5iqtdRbYUdUSlWzU+VsyOrbIdJEjHW8k5P Ap5A== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=Cd64Mxkl; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s2-20020a63e802000000b005348b4f79f1si11868410pgh.345.2023.07.25.15.36.30; Tue, 25 Jul 2023 15:36:44 -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=@amd.com header.s=selector1 header.b=Cd64Mxkl; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231875AbjGYWQB (ORCPT + 99 others); Tue, 25 Jul 2023 18:16:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32834 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230091AbjGYWPi (ORCPT ); Tue, 25 Jul 2023 18:15:38 -0400 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2043.outbound.protection.outlook.com [40.107.94.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4FF8AE0; Tue, 25 Jul 2023 15:15:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FhcK7koiyXz7sviTNGqQ0cWp9VRYp8VWJVN9qub7Vf8O4Kpfn69hia3tgELS4fh8TS/ZEuIgmBIf0VCDATjK5FeFbFt/5l/DbAJ1JepSMjxfS3NTmLM5vV1sPQU91cZSLZG7r/hAc6xjdhWEgU7u7dTO8HzO8DlEOJFvwbpC7L03l4epsGRnVb2u1UfKyKueBirrHAr+lBgl9DcxKnUZd5JdwPkhF54k3F+JKGvaGB4kNsjiMt+4sQJpNekXBkXb/2glvqEU2phVWGKb98Sgllr62g0Nr1ke9Lelu6Tc9Vdug3xCFKXK1gk0fdMoo1LKZzqOx8BsNtBnI2ewjrUSgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Mb8fk3c6owXtbs0RJr9UCcTG6YiCOgLA8W5ZtA7S1NI=; b=Xh3yeaIB0uX47/6cSr994/yJMLD8+nqFL/lQ+gg95ZFa3d9LKvTfYhyljbjxBX/MOHqHl9ZIZpPPQnzUMavKGkgI8NZrof7lCLvJcgWCxVNOjXLc3CHEuuY+5mKIgnL3Wl+q8oLQkJ7cKT5tH2zFVLOO5hZklt58yj4Vx18tmgGAOYti4yNLqX3dvk1fNoWyYePDPUoHf+oadJoo050L7gcF1mHsWzPU8wE9XkH81OEM5ErOcTa7R0n2s7jmfiMa4GsXsXTCGRdHvsE7dpfM8uKMx05GyjaDUHV6g6SEGV5Gg63Yc+zKl7QdyFnV7vjYlstgZn2PNphOqopiP6Vy4w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Mb8fk3c6owXtbs0RJr9UCcTG6YiCOgLA8W5ZtA7S1NI=; b=Cd64MxklrC/1hAMSEtL/mczVWiwRDawTaK62H62N1hwihPAYDIduWlfEFwVk5XQEWYCfZjs1hapJDXCBOTKePsJmsd2FSf1yLcriivMU1U0wM9z4/aoXk++8eiWu8NZVqtuCJWR6S4Ldjy0rykP9dtWonzV3WfNdfl7UgAzYrkI= Received: from DS7PR05CA0005.namprd05.prod.outlook.com (2603:10b6:5:3b9::10) by IA1PR12MB8466.namprd12.prod.outlook.com (2603:10b6:208:44b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6609.32; Tue, 25 Jul 2023 22:15:32 +0000 Received: from DM6NAM11FT009.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3b9:cafe::d) by DS7PR05CA0005.outlook.office365.com (2603:10b6:5:3b9::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.25 via Frontend Transport; Tue, 25 Jul 2023 22:15:32 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB03.amd.com; pr=C Received: from SATLEXMB03.amd.com (165.204.84.17) by DM6NAM11FT009.mail.protection.outlook.com (10.13.173.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6631.25 via Frontend Transport; Tue, 25 Jul 2023 22:15:32 +0000 Received: from SATLEXMB08.amd.com (10.181.40.132) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Tue, 25 Jul 2023 17:15:31 -0500 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB08.amd.com (10.181.40.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Tue, 25 Jul 2023 15:15:30 -0700 Received: from xsjlizhih40.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.27 via Frontend Transport; Tue, 25 Jul 2023 17:15:30 -0500 From: Lizhi Hou To: , , , CC: Lizhi Hou , , , , =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= Subject: [PATCH V11 1/5] of: dynamic: Add interfaces for creating device node dynamically Date: Tue, 25 Jul 2023 15:15:14 -0700 Message-ID: <1690323318-6103-2-git-send-email-lizhi.hou@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1690323318-6103-1-git-send-email-lizhi.hou@amd.com> References: <1690323318-6103-1-git-send-email-lizhi.hou@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT009:EE_|IA1PR12MB8466:EE_ X-MS-Office365-Filtering-Correlation-Id: d9cc0fe5-5bbb-4624-3492-08db8d5ca9c9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EhCYRTUuVlApRU/MlSPtuzimY4pYrNum7cVACdq9/JiiV24yG9F4coNx2D8nGf4/WJ/urm6SZh0HI76G6eRV/n0rg6fqrnhvEJnZJAwyny0yd8Omroc/SJ7qceRJSJWv/P/DBSC70sp0F3rgQwD2YIehPL5NunRJ1kuXkogtBsekLTKNl6Ilc1WpmZNhy1BiAf52eiF6tif/yaXnPEE1z1Wwjy47ppXogCLj+xFhSLs1SKMbr7SmGBBYz03P78Y9oiGXN/L0BeC1FrUN555nvlL54UCr+Yj8YOMn4scFCorTPPtkHq5YnEEBF3591ova7A3eFg0EZ01vXWsLNJZH/YkauqLERyPIuC3u3b/uj0W0a4wjqWVmKpF/zYPUIC9ZodGhz2hYo8My4WuKjjQ206i8dcQWbp3ZEMLTUJ07dnVEclWro8IWi+v7XLDa64+NUfFYRyhAZAcy73tAGwdGsoAAjPB2r6rj8dioVNeFC2iN8pYK0KqvAbaBco/FI8iYxW92sAf6hYnRV2Tx23Zv1nRbYrStsRO2yuz5BPrsqnrE0ZpSuEQNal2OhTEnihDLDRzSy2n0XUc4Hbaq0j3iYNqUXt+KD8z6WXiAXn/bxhoTqTZHYl3DfNkQCFSZXFoWG+WeZj2xqzq1pk6shk56O62/aVQywRTQSudTuAbYEXVoQUEHXcOL2+oaguznX76XB70XD7ohMv8jrMR/B7ErLegw4ZY4R2q0uuvrruTdJqBSo4gVinQXxSLFYEP4B01O3pTDbSee4DYHp38ZvaBSFQ== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB03.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230028)(4636009)(39860400002)(376002)(136003)(396003)(346002)(82310400008)(451199021)(40470700004)(36840700001)(46966006)(26005)(186003)(336012)(40460700003)(41300700001)(81166007)(356005)(478600001)(70206006)(86362001)(70586007)(36756003)(4326008)(316002)(110136005)(40480700001)(82740400003)(6666004)(54906003)(426003)(5660300002)(66574015)(2906002)(36860700001)(8676002)(8936002)(2616005)(83380400001)(44832011)(47076005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jul 2023 22:15:32.7319 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d9cc0fe5-5bbb-4624-3492-08db8d5ca9c9 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT009.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8466 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no 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: INBOX X-GMAIL-THRID: 1772433811955925001 X-GMAIL-MSGID: 1772433811955925001 of_changeset_create_node() creates device node dynamically and attaches the newly created node to a changeset. Expand of_changeset APIs to handle specific types of properties. of_changeset_add_prop_string() of_changeset_add_prop_string_array() of_changeset_add_prop_u32_array() Signed-off-by: Clément Léger Signed-off-by: Lizhi Hou --- drivers/of/dynamic.c | 164 ++++++++++++++++++++++++++++++++++++++++++ drivers/of/unittest.c | 19 ++++- include/linux/of.h | 23 ++++++ 3 files changed, 205 insertions(+), 1 deletion(-) diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c index e311d406b170..9259cebda4d6 100644 --- a/drivers/of/dynamic.c +++ b/drivers/of/dynamic.c @@ -487,6 +487,38 @@ struct device_node *__of_node_dup(const struct device_node *np, return NULL; } +/** + * of_changeset_create_node - Dynamically create a device node and attach to + * a given changeset. + * + * @parent: Pointer to parent device node + * @full_name: Node full name + * @cset: Pointer to changeset + * + * Return: Pointer to the created device node or NULL in case of an error. + */ +struct device_node *of_changeset_create_node(struct device_node *parent, + const char *full_name, + struct of_changeset *cset) +{ + struct device_node *np; + int ret; + + np = __of_node_dup(NULL, full_name); + if (!np) + return NULL; + np->parent = parent; + + ret = of_changeset_attach_node(cset, np); + if (ret) { + of_node_put(np); + return NULL; + } + + return np; +} +EXPORT_SYMBOL(of_changeset_create_node); + static void __of_changeset_entry_destroy(struct of_changeset_entry *ce) { if (ce->action == OF_RECONFIG_ATTACH_NODE && @@ -960,3 +992,135 @@ int of_changeset_action(struct of_changeset *ocs, unsigned long action, return 0; } EXPORT_SYMBOL_GPL(of_changeset_action); + +static int of_changeset_add_prop_helper(struct of_changeset *ocs, + struct device_node *np, + const struct property *pp) +{ + struct property *new_pp; + int ret; + + new_pp = __of_prop_dup(pp, GFP_KERNEL); + if (!new_pp) + return -ENOMEM; + + ret = of_changeset_add_property(ocs, np, new_pp); + if (ret) { + kfree(new_pp->name); + kfree(new_pp->value); + kfree(new_pp); + } + + return ret; +} + +/** + * of_changeset_add_prop_string - Add a string property to a changeset + * + * @ocs: changeset pointer + * @np: device node pointer + * @prop_name: name of the property to be added + * @str: pointer to null terminated string + * + * Create a string property and add it to a changeset. + * + * Return: 0 on success, a negative error value in case of an error. + */ +int of_changeset_add_prop_string(struct of_changeset *ocs, + struct device_node *np, + const char *prop_name, const char *str) +{ + struct property prop; + + prop.name = (char *)prop_name; + prop.length = strlen(str) + 1; + prop.value = (void *)str; + + return of_changeset_add_prop_helper(ocs, np, &prop); +} +EXPORT_SYMBOL_GPL(of_changeset_add_prop_string); + +/** + * of_changeset_add_prop_string_array - Add a string list property to + * a changeset + * + * @ocs: changeset pointer + * @np: device node pointer + * @prop_name: name of the property to be added + * @str_array: pointer to an array of null terminated strings + * @sz: number of string array elements + * + * Create a string list property and add it to a changeset. + * + * Return: 0 on success, a negative error value in case of an error. + */ +int of_changeset_add_prop_string_array(struct of_changeset *ocs, + struct device_node *np, + const char *prop_name, + const char **str_array, size_t sz) +{ + struct property prop; + int i, ret; + char *vp; + + prop.name = (char *)prop_name; + + prop.length = 0; + for (i = 0; i < sz; i++) + prop.length += strlen(str_array[i]) + 1; + + prop.value = kmalloc(prop.length, GFP_KERNEL); + if (!prop.value) + return -ENOMEM; + + vp = prop.value; + for (i = 0; i < sz; i++) { + vp += snprintf(vp, (char *)prop.value + prop.length - vp, "%s", + str_array[i]) + 1; + } + ret = of_changeset_add_prop_helper(ocs, np, &prop); + kfree(prop.value); + + return ret; +} +EXPORT_SYMBOL_GPL(of_changeset_add_prop_string_array); + +/** + * of_changeset_add_prop_u32_array - Add a property of 32 bit integers + * property to a changeset + * + * @ocs: changeset pointer + * @np: device node pointer + * @prop_name: name of the property to be added + * @array: pointer to an array of 32 bit integers + * @sz: number of array elements + * + * Create a property of 32 bit integers and add it to a changeset. + * + * Return: 0 on success, a negative error value in case of an error. + */ +int of_changeset_add_prop_u32_array(struct of_changeset *ocs, + struct device_node *np, + const char *prop_name, + const u32 *array, size_t sz) +{ + struct property prop; + __be32 *val; + int i, ret; + + val = kcalloc(sz, sizeof(__be32), GFP_KERNEL); + if (!val) + return -ENOMEM; + + for (i = 0; i < sz; i++) + val[i] = cpu_to_be32(array[i]); + prop.name = (char *)prop_name; + prop.length = sizeof(u32) * sz; + prop.value = (void *)val; + + ret = of_changeset_add_prop_helper(ocs, np, &prop); + kfree(val); + + return ret; +} +EXPORT_SYMBOL_GPL(of_changeset_add_prop_u32_array); diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index a406a12eb208..d2b286d32db0 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c @@ -802,7 +802,9 @@ static void __init of_unittest_changeset(void) struct property *ppname_n21, pname_n21 = { .name = "name", .length = 3, .value = "n21" }; struct property *ppupdate, pupdate = { .name = "prop-update", .length = 5, .value = "abcd" }; struct property *ppremove; - struct device_node *n1, *n2, *n21, *nchangeset, *nremove, *parent, *np; + struct device_node *n1, *n2, *n21, *n22, *nchangeset, *nremove, *parent, *np; + static const char * const str_array[] = { "str1", "str2", "str3" }; + const u32 u32_array[] = { 1, 2, 3 }; struct of_changeset chgset; n1 = __of_node_dup(NULL, "n1"); @@ -857,6 +859,17 @@ static void __init of_unittest_changeset(void) unittest(!of_changeset_add_property(&chgset, parent, ppadd), "fail add prop prop-add\n"); unittest(!of_changeset_update_property(&chgset, parent, ppupdate), "fail update prop\n"); unittest(!of_changeset_remove_property(&chgset, parent, ppremove), "fail remove prop\n"); + n22 = of_changeset_create_node(n2, "n22", &chgset); + unittest(n22, "fail create n22\n"); + unittest(!of_changeset_add_prop_string(&chgset, n22, "prop-str", "abcd"), + "fail add prop prop-str"); + unittest(!of_changeset_add_prop_string_array(&chgset, n22, "prop-str-array", + (const char **)str_array, + ARRAY_SIZE(str_array)), + "fail add prop prop-str-array"); + unittest(!of_changeset_add_prop_u32_array(&chgset, n22, "prop-u32-array", + u32_array, ARRAY_SIZE(u32_array)), + "fail add prop prop-u32-array"); unittest(!of_changeset_apply(&chgset), "apply failed\n"); @@ -866,6 +879,9 @@ static void __init of_unittest_changeset(void) unittest((np = of_find_node_by_path("/testcase-data/changeset/n2/n21")), "'%pOF' not added\n", n21); of_node_put(np); + unittest((np = of_find_node_by_path("/testcase-data/changeset/n2/n22")), + "'%pOF' not added\n", n22); + of_node_put(np); unittest(!of_changeset_revert(&chgset), "revert failed\n"); @@ -874,6 +890,7 @@ static void __init of_unittest_changeset(void) of_node_put(n1); of_node_put(n2); of_node_put(n21); + of_node_put(n22); #endif } diff --git a/include/linux/of.h b/include/linux/of.h index 6ecde0515677..82d0a476ec75 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -1580,6 +1580,29 @@ static inline int of_changeset_update_property(struct of_changeset *ocs, { return of_changeset_action(ocs, OF_RECONFIG_UPDATE_PROPERTY, np, prop); } + +struct device_node *of_changeset_create_node(struct device_node *parent, + const char *full_name, + struct of_changeset *cset); +int of_changeset_add_prop_string(struct of_changeset *ocs, + struct device_node *np, + const char *prop_name, const char *str); +int of_changeset_add_prop_string_array(struct of_changeset *ocs, + struct device_node *np, + const char *prop_name, + const char **str_array, size_t sz); +int of_changeset_add_prop_u32_array(struct of_changeset *ocs, + struct device_node *np, + const char *prop_name, + const u32 *array, size_t sz); +static inline int of_changeset_add_prop_u32(struct of_changeset *ocs, + struct device_node *np, + const char *prop_name, + const u32 val) +{ + return of_changeset_add_prop_u32_array(ocs, np, prop_name, &val, 1); +} + #else /* CONFIG_OF_DYNAMIC */ static inline int of_reconfig_notifier_register(struct notifier_block *nb) {