From patchwork Fri Aug 18 20:40:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 136280 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b82d:0:b0:3f2:4152:657d with SMTP id z13csp2562392vqi; Sun, 20 Aug 2023 09:51:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEPWoaN5+8rwV+yEP8MMwUR3ZgSoVtmS8f9w8T2B9Map++DXJD2fIN2kxZ1wMJNkWs19uWt X-Received: by 2002:a05:6a00:23d5:b0:688:7c8e:a354 with SMTP id g21-20020a056a0023d500b006887c8ea354mr5246471pfc.25.1692550288109; Sun, 20 Aug 2023 09:51:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692550288; cv=none; d=google.com; s=arc-20160816; b=MHaSZldS8BxDDZTTvcYdX55moqgqkm9X580HOOYZ8qzEa/ATRMuNSSAG2QyfCrzl3u tPm6xZOPP96EYyM5+4o9NPxk7wkYT1a3dJ/ZE4XeLoQ+QfeRGzyfS0VWxTUCxGN/O8qA 6y6xPEK9Ucguu3QTS79Vi/+YCxfJ78WAYwJAdEveuBcPbI00LTFy7eAK28riM23OzUlS TY4GPBFHiry3yNtKCKnRcqlb7+mOQj9cZZ2HKKLz6bOXbdze2mXfFNyvR2VA3AmFsz1Q xP9pkKfh6EFoQX3ohEbzVxzo0Xj3xzeSwKfvQpukkmMkJoOhGv5b1AV8Wb5kPZmY6c8n X5IA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=aWTraoeYFwluF1R3L9RgiXc6SiQQ2inr5gLDY91GrJk=; fh=9muYjwzOjeujIiOiqgEm7G2SJDFzcm638Q1NXjJ2Sec=; b=0AlMRZdV4zdqpmsYxFpz3FBX0SohbAR4Yn4h6eEA6frrVyq36xKciSJz+EVfWccwOZ eXqOmzotdFIdzvFrcEYYH2eQc5xrV+AJPtCx0Bl/2NAsCK/JUP5PXhyL24aHhKXAWHiG 6ytoDjY3nqVd/hsx3Gn3YvYOMh7kZnvp64/jAw/Xi6O6Rg/FHsgm69p26DzGnq6zYqIj DoMhXJEeZM+Vdl1LslMJ+Mh92ndksMl8nf7EmyJFXhx/UDWxHfbfWVLIPUMY9MJUkjpy qVuJCNpeszJK+mSQxIxeJzeAti3co2r+zXKHZNmYj7senwj5SvA+Zpb90pt+mSmuA05f THSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=WLzGAvUI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id a5-20020a636605000000b005641ddd0309si5166191pgc.599.2023.08.20.09.51.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Aug 2023 09:51:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=WLzGAvUI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id D5FFD296710; Sat, 19 Aug 2023 11:44:45 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1380011AbjHRUlT (ORCPT + 99 others); Fri, 18 Aug 2023 16:41:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35060 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1379998AbjHRUlP (ORCPT ); Fri, 18 Aug 2023 16:41:15 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 94A733C3D; Fri, 18 Aug 2023 13:41:13 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2A7F2617F0; Fri, 18 Aug 2023 20:41:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C3269C433C7; Fri, 18 Aug 2023 20:41:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692391272; bh=wrYiYDsIIfdczgxjXaVuF7zvcuFzTKYD6z96W+uKXPE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=WLzGAvUIJAxkzwj0Y0t2tfgZymvfVE40vz4Kf0TWHABOwgjOPc8ofEJT6LNxqm1bS 1rgwIRabPUUdySRdfY6cYIls2P09KXNj7yif+AH4gwPo30zVvdcV5K/P5t2gNFZijT LldTIzwabQbxO/6jBo7ZWQ/QkxHk1zvC+O9gVYG8q6O1/Ugp4m/H27v+LupjQB3atj ZoJiuwG3Qg9M9dhVGdtJWfkKQD7qht72vNU7YRJH3rvhthrCF54tzNPg+m83NwRUWi 2meA1jumOgE2rQg/zQYG1etOp8UkzoLxOZtexqBGp7T6iUrM9s5OjS4L1cSoTT06HH orS8bh6Z6PipA== Received: (nullmailer pid 545138 invoked by uid 1000); Fri, 18 Aug 2023 20:41:06 -0000 From: Rob Herring Date: Fri, 18 Aug 2023 15:40:56 -0500 Subject: [PATCH v3 1/6] of: unittest: Fix EXPECT for parse_phandle_with_args_map() test MIME-Version: 1.0 Message-Id: <20230801-dt-changeset-fixes-v3-1-5f0410e007dd@kernel.org> References: <20230801-dt-changeset-fixes-v3-0-5f0410e007dd@kernel.org> In-Reply-To: <20230801-dt-changeset-fixes-v3-0-5f0410e007dd@kernel.org> To: Frank Rowand , "Enrico Weigelt, metux IT consult" , "Rafael J. Wysocki" , Sakari Ailus , Petr Mladek , Andy Shevchenko , Geert Uytterhoeven Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.13-dev X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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: INBOX X-GMAIL-THRID: 1774767610945913336 X-GMAIL-MSGID: 1774767610945913336 Commit 12e17243d8a1 ("of: base: improve error msg in of_phandle_iterator_next()") added printing of the phandle value on error, but failed to update the unittest. Fixes: 12e17243d8a1 ("of: base: improve error msg in of_phandle_iterator_next()") Reviewed-by: Geert Uytterhoeven Signed-off-by: Rob Herring --- drivers/of/unittest.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index e5b0eea8011c..d943bf87c94d 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c @@ -664,12 +664,12 @@ static void __init of_unittest_parse_phandle_with_args_map(void) memset(&args, 0, sizeof(args)); EXPECT_BEGIN(KERN_INFO, - "OF: /testcase-data/phandle-tests/consumer-b: could not find phandle"); + "OF: /testcase-data/phandle-tests/consumer-b: could not find phandle 12345678"); rc = of_parse_phandle_with_args_map(np, "phandle-list-bad-phandle", "phandle", 0, &args); EXPECT_END(KERN_INFO, - "OF: /testcase-data/phandle-tests/consumer-b: could not find phandle"); + "OF: /testcase-data/phandle-tests/consumer-b: could not find phandle 12345678"); unittest(rc == -EINVAL, "expected:%i got:%i\n", -EINVAL, rc); From patchwork Fri Aug 18 20:41:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 136067 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b82d:0:b0:3f2:4152:657d with SMTP id z13csp1678625vqi; Fri, 18 Aug 2023 14:17:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGG4z/K8IdL1iL1Md3DvJCN381rnfWLa3gEE1PoZ103WkOGTlJl9hNroztVQPupJD+eT0pY X-Received: by 2002:a19:791d:0:b0:4fe:711:2931 with SMTP id u29-20020a19791d000000b004fe07112931mr256237lfc.22.1692393433119; Fri, 18 Aug 2023 14:17:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692393433; cv=none; d=google.com; s=arc-20160816; b=lq/ObW3XET+b4T6WSa8CNLdE50Q41JtPaW47jFl/fnAbIBuMLJeWTZKHFU7I6TGiNz NLq1m6KflE8VdU830DeIqHni3d07IMk7a25Q7Cmx8zVERXv+I39dGEdtXK+VuJX9HyB7 OQNV4Jxf15nFGLX74uP4+6PyI0qRoVHrFqOzHwznufP4aGsj5faCLcqWhbkcFTD6A2jV wXFy59FkqMeaNTNlFAOYP7PG2uGWPhgFs3sqht5mrQ/VtyqFQtE2DxRt8ygIMYXO8tab FzU2P6twfCUvvaXFmKSgDuZtABTtuhVrvSyePUv1nTUlftI5Pb4aMlt8W7/URdoPcGfn ztZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=XfsmGpqDBlLU4I6nJ7OjZIhaZH4QQ2ovSGE83xDcpqo=; fh=9muYjwzOjeujIiOiqgEm7G2SJDFzcm638Q1NXjJ2Sec=; b=TYOacyhG+WtysZ5Fx/28jp0+0iIWSP2FMfc75IFd2qXmTtCduQimvaNvu0Gr3/VFgU J5SENdkRh5Ta9L3zqgAA09b2LSZKphSiGi5wXmelSEpZ2CWgYwaR349KPxXwEh3Gh6e7 VRl6r20eSwqejHsUFNfpZY5HQmVCXFRv6t6bzEoGL6Q25IbRK8H/S/wna8k3m7xz5Uem Hc+6rf30k4bNFd256g1LAyRXaOC+h8QT6hQ2uj7LEQSUvUWFYRDXPKxoORs4s97XX3N2 YCVfCHtaBeB8JYEqmBZLHq+2Sf9PEV/H9VnorwkT7Y3BGQafcd4v/5HPImJwp2svVDK5 q1aQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Uvo5jm+e; 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=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d5-20020aa7ce05000000b005232d644311si1816728edv.327.2023.08.18.14.16.47; Fri, 18 Aug 2023 14:17: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=@kernel.org header.s=k20201202 header.b=Uvo5jm+e; 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=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1380016AbjHRUlU (ORCPT + 99 others); Fri, 18 Aug 2023 16:41:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35048 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1379997AbjHRUlO (ORCPT ); Fri, 18 Aug 2023 16:41:14 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BF4F13C3C; Fri, 18 Aug 2023 13:41:11 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 483D660201; Fri, 18 Aug 2023 20:41:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E166BC433C7; Fri, 18 Aug 2023 20:41:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692391270; bh=KNeygD7b0invSgMAHHcJ7ByINYFALCfTCNGcUBotyfg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Uvo5jm+e+1bUypvaZ2KvUMW6pAt2i+X3PNu+D7I7UI8o82GHQp0wyWTmqJbEQQh4c O5OeHT+LsZJHQfiimLj03Xu5/oE51yN2XgzgWpwnwq4d1EGnvKb+x6f8aU3uYxkxdW 9mArTFrP6EzhEkqVCQS+zY/i+OL3tTanDZDyYww1peZG3AQOZXpocfdOTOggD/UODN otnzzc/bujHK1y20xdiHP1umlC4f8487vgIMNfss4LpPxRrEQvya15t03d6XbJZlIk RQyKOgPgu4Xmkxg2HOA8VNofyBQ6hcDgGvan35mr2DvLkNdjpQ+k2BJoDcmvjHoF+9 MrG0v3tOtCTyQ== Received: (nullmailer pid 545146 invoked by uid 1000); Fri, 18 Aug 2023 20:41:06 -0000 From: Rob Herring Date: Fri, 18 Aug 2023 15:41:00 -0500 Subject: [PATCH v3 5/6] of: dynamic: Move dead property list check into property add/update functions MIME-Version: 1.0 Message-Id: <20230801-dt-changeset-fixes-v3-5-5f0410e007dd@kernel.org> References: <20230801-dt-changeset-fixes-v3-0-5f0410e007dd@kernel.org> In-Reply-To: <20230801-dt-changeset-fixes-v3-0-5f0410e007dd@kernel.org> To: Frank Rowand , "Enrico Weigelt, metux IT consult" , "Rafael J. Wysocki" , Sakari Ailus , Petr Mladek , Andy Shevchenko , Geert Uytterhoeven Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.13-dev X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,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: INBOX X-GMAIL-THRID: 1774603136053750788 X-GMAIL-MSGID: 1774603136053750788 The changeset code checks for a property in the deadprops list when adding/updating a property, but of_add_property() and of_update_property() do not. As the users of these functions are pretty simple, they have not hit this scenario or else the property lists would get corrupted. With this there are 3 cases of removing a property from either deadprops or properties lists, so add a helper to find and remove a matching property. Signed-off-by: Rob Herring Reviewed-by: Geert Uytterhoeven --- v3: - Make the helper remove a property from either deadprops or properties lists - Keep existing style in deadprops loop v2: - Add helper to remove property from deadprops list --- drivers/of/base.c | 37 ++++++++++++++++++++++++------------- drivers/of/dynamic.c | 19 ------------------- 2 files changed, 24 insertions(+), 32 deletions(-) diff --git a/drivers/of/base.c b/drivers/of/base.c index e235f3a57ea8..3f9ddd18ff4b 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -1530,6 +1530,20 @@ int of_count_phandle_with_args(const struct device_node *np, const char *list_na } EXPORT_SYMBOL(of_count_phandle_with_args); +static struct property *__of_remove_property_from_list(struct property **list, struct property *prop) +{ + struct property **next; + + for (next = list; *next; next = &(*next)->next) { + if (*next == prop) { + *next = prop->next; + prop->next = NULL; + return prop; + } + } + return NULL; +} + /** * __of_add_property - Add a property to a node without lock operations * @np: Caller's Device Node @@ -1539,6 +1553,8 @@ int __of_add_property(struct device_node *np, struct property *prop) { struct property **next; + __of_remove_property_from_list(&np->deadprops, prop); + prop->next = NULL; next = &np->properties; while (*next) { @@ -1583,21 +1599,14 @@ EXPORT_SYMBOL_GPL(of_add_property); int __of_remove_property(struct device_node *np, struct property *prop) { - struct property **next; - - for (next = &np->properties; *next; next = &(*next)->next) { - if (*next == prop) - break; + if (__of_remove_property_from_list(&np->properties, prop)) { + /* Found the property, add it to deadprops list */ + prop->next = np->deadprops; + np->deadprops = prop; + return 0; } - if (*next == NULL) - return -ENODEV; - - /* found the node */ - *next = prop->next; - prop->next = np->deadprops; - np->deadprops = prop; - return 0; + return -ENODEV; } /** @@ -1641,6 +1650,8 @@ int __of_update_property(struct device_node *np, struct property *newprop, { struct property **next, *oldprop; + __of_remove_property_from_list(&np->deadprops, newprop); + for (next = &np->properties; *next; next = &(*next)->next) { if (of_prop_cmp((*next)->name, newprop->name) == 0) break; diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c index 1876af5b01fc..d3ad970ad7b8 100644 --- a/drivers/of/dynamic.c +++ b/drivers/of/dynamic.c @@ -564,7 +564,6 @@ static int __of_changeset_entry_notify(struct of_changeset_entry *ce, static int __of_changeset_entry_apply(struct of_changeset_entry *ce) { - struct property **propp; unsigned long flags; int ret = 0; @@ -579,15 +578,6 @@ static int __of_changeset_entry_apply(struct of_changeset_entry *ce) __of_detach_node(ce->np); break; case OF_RECONFIG_ADD_PROPERTY: - /* If the property is in deadprops then it must be removed */ - for (propp = &ce->np->deadprops; *propp; propp = &(*propp)->next) { - if (*propp == ce->prop) { - *propp = ce->prop->next; - ce->prop->next = NULL; - break; - } - } - ret = __of_add_property(ce->np, ce->prop); break; case OF_RECONFIG_REMOVE_PROPERTY: @@ -595,15 +585,6 @@ static int __of_changeset_entry_apply(struct of_changeset_entry *ce) break; case OF_RECONFIG_UPDATE_PROPERTY: - /* If the property is in deadprops then it must be removed */ - for (propp = &ce->np->deadprops; *propp; propp = &(*propp)->next) { - if (*propp == ce->prop) { - *propp = ce->prop->next; - ce->prop->next = NULL; - break; - } - } - ret = __of_update_property(ce->np, ce->prop, &ce->old_prop); break; default: From patchwork Fri Aug 18 20:41:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 136209 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b82d:0:b0:3f2:4152:657d with SMTP id z13csp2230500vqi; Sat, 19 Aug 2023 16:10:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFDVXyOtwFhZjes7FWIONiGcGYhUW1ZGCtgfqXSwNO2agVNPJKI8wE38/IIHcO0SJMeqyLl X-Received: by 2002:a17:902:e88f:b0:1bc:210d:635f with SMTP id w15-20020a170902e88f00b001bc210d635fmr4114832plg.28.1692486620737; Sat, 19 Aug 2023 16:10:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692486620; cv=none; d=google.com; s=arc-20160816; b=mUBV5sMD6L7Kw/QcW1FgkzP7GKKsNMmbPPykxVGw45b47V5E8FrsgMJ2OLG5aeVPny HGnIcNh/3tKG3jg95xv+oaUIz2X/dxk8E2Y/T+D82pmFIFCYLvTl+2XObh6bZ3AZ/nPF tJGjqpukIvVGkCbH92Vr/4eZmbAPjMtnuC4XkrP1m8iuLgXb0orkr5Ye1HuBYxEVI8hS 6qGgLYSMpqy182VeThktWXOIZgRmPQcXTaSoaOSASFfB4hQr1RwsJ04oaPx4dD/f9q1c yjfyfKUhSSTRAmh9zu0k/giCKYA1GxDSSIEGM+ybyWKoXYkQzuMM2OXAV2VHN1wowxX1 sJjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=M5Zzvr+xq5xurqHUb2W/3EqZPkITeiJzYCossJfs5+c=; fh=9muYjwzOjeujIiOiqgEm7G2SJDFzcm638Q1NXjJ2Sec=; b=BOR6qrfa9IexnryYBzBcEn1Xf7B+44YvQ2S0IGRpa3qMSGowQ7kzcSgKgKoQWbEn4L t6SzA4fo9MEw7x+zArJc2XyAzArBP+80+SEavrx9aTfwSbmPN1BFPsi65N1I60Q8Wbdo j9itShhSW5nJVb7Ph9cl0u2SZJFEGmuKY4fXJlv4mtIuff0vW9B+W9K9F2fMt7C6Bjnz 1FM7JO16cA9VT1Oyz4HUU3iLatKQhtjsbE7xmvaygZoDgAj0mxIi845ZZt66df+kQc6a 2Iv4LYuiRDOGiNNOE/Q8wYSpxk95/BTrfl7wvHpIVHvox2MfHMmcWdYwL1im2r4Djqfw ak6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=E2jWWT3W; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id 2-20020a170902e9c200b001bbd0797a61si4062993plk.47.2023.08.19.16.10.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Aug 2023 16:10:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=E2jWWT3W; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 759D4570AA; Sat, 19 Aug 2023 11:03:38 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1380046AbjHRUlz (ORCPT + 99 others); Fri, 18 Aug 2023 16:41:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44634 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1380000AbjHRUlX (ORCPT ); Fri, 18 Aug 2023 16:41:23 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 98CED3C3C; Fri, 18 Aug 2023 13:41:21 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2E6DB6117F; Fri, 18 Aug 2023 20:41:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B3533C433C8; Fri, 18 Aug 2023 20:41:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692391280; bh=kE1POYgRiSrKokoluBapEwaMEsuHZqNe70xF6nyjMO4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=E2jWWT3WpSUv5OFgd6XzG0CUnhxvucd4DOyME0YWiEPkCn4qTx84hV9dmTmDt3snB Fa93Eh1JiPsWCXdeWBgIq7eId2TSk2vz0YwEjlBXJri1nmnULaQlIB6B697qPdpAWt 9H6xBxj9MvBZQtccewIseClq7rSkiH8dDh2y/1fDZYBkJ1HXUUfuRYldjFq+Qfxpg6 Tuba2UQXRk0YH9Hq5dKOv+ieMXByE2SqfqJGRellKEJyiC1pX4yjjcDPNc5zIY241H FiHnTuV7Fwt4frPT+DBeNSrM2CXgJPNTBFfXWAmrXAVIz91FsoYXu1Kdehz616qkeK zasWVNxZqsifQ== Received: (nullmailer pid 545148 invoked by uid 1000); Fri, 18 Aug 2023 20:41:06 -0000 From: Rob Herring Date: Fri, 18 Aug 2023 15:41:01 -0500 Subject: [PATCH v3 6/6] of: Refactor node and property manipulation function locking MIME-Version: 1.0 Message-Id: <20230801-dt-changeset-fixes-v3-6-5f0410e007dd@kernel.org> References: <20230801-dt-changeset-fixes-v3-0-5f0410e007dd@kernel.org> In-Reply-To: <20230801-dt-changeset-fixes-v3-0-5f0410e007dd@kernel.org> To: Frank Rowand , "Enrico Weigelt, metux IT consult" , "Rafael J. Wysocki" , Sakari Ailus , Petr Mladek , Andy Shevchenko , Geert Uytterhoeven Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.13-dev X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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: INBOX X-GMAIL-THRID: 1774700850769587624 X-GMAIL-MSGID: 1774700850769587624 All callers of __of_{add,remove,update}_property() and __of_{attach,detach}_node() wrap the call with the devtree_lock spinlock. Let's move the spinlock into the functions. This allows moving the sysfs update functions into those functions as well. Signed-off-by: Rob Herring --- v3: - Rebase due to changes in prior patch v2: - Re-arrange exit handling --- drivers/of/base.c | 65 ++++++++++++++++++++++++++-------------------------- drivers/of/dynamic.c | 51 +++++++++++++---------------------------- 2 files changed, 49 insertions(+), 67 deletions(-) diff --git a/drivers/of/base.c b/drivers/of/base.c index 3f9ddd18ff4b..4b24bed894ad 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -1551,21 +1551,32 @@ static struct property *__of_remove_property_from_list(struct property **list, s */ int __of_add_property(struct device_node *np, struct property *prop) { + int rc = 0; + unsigned long flags; struct property **next; + raw_spin_lock_irqsave(&devtree_lock, flags); + __of_remove_property_from_list(&np->deadprops, prop); prop->next = NULL; next = &np->properties; while (*next) { - if (strcmp(prop->name, (*next)->name) == 0) + if (strcmp(prop->name, (*next)->name) == 0) { /* duplicate ! don't insert it */ - return -EEXIST; - + rc = -EEXIST; + goto out_unlock; + } next = &(*next)->next; } *next = prop; +out_unlock: + raw_spin_unlock_irqrestore(&devtree_lock, flags); + if (rc) + return rc; + + __of_add_property_sysfs(np, prop); return 0; } @@ -1576,37 +1587,36 @@ int __of_add_property(struct device_node *np, struct property *prop) */ int of_add_property(struct device_node *np, struct property *prop) { - unsigned long flags; int rc; mutex_lock(&of_mutex); - - raw_spin_lock_irqsave(&devtree_lock, flags); rc = __of_add_property(np, prop); - raw_spin_unlock_irqrestore(&devtree_lock, flags); - - if (!rc) - __of_add_property_sysfs(np, prop); - mutex_unlock(&of_mutex); - if (!rc) - of_property_notify(OF_RECONFIG_ADD_PROPERTY, np, prop, NULL); - return rc; } EXPORT_SYMBOL_GPL(of_add_property); int __of_remove_property(struct device_node *np, struct property *prop) { + unsigned long flags; + int rc = -ENODEV; + + raw_spin_lock_irqsave(&devtree_lock, flags); + if (__of_remove_property_from_list(&np->properties, prop)) { /* Found the property, add it to deadprops list */ prop->next = np->deadprops; np->deadprops = prop; - return 0; + rc = 0; } - return -ENODEV; + raw_spin_unlock_irqrestore(&devtree_lock, flags); + if (rc) + return rc; + + __of_remove_property_sysfs(np, prop); + return 0; } /** @@ -1621,21 +1631,13 @@ int __of_remove_property(struct device_node *np, struct property *prop) */ int of_remove_property(struct device_node *np, struct property *prop) { - unsigned long flags; int rc; if (!prop) return -ENODEV; mutex_lock(&of_mutex); - - raw_spin_lock_irqsave(&devtree_lock, flags); rc = __of_remove_property(np, prop); - raw_spin_unlock_irqrestore(&devtree_lock, flags); - - if (!rc) - __of_remove_property_sysfs(np, prop); - mutex_unlock(&of_mutex); if (!rc) @@ -1649,6 +1651,9 @@ int __of_update_property(struct device_node *np, struct property *newprop, struct property **oldpropp) { struct property **next, *oldprop; + unsigned long flags; + + raw_spin_lock_irqsave(&devtree_lock, flags); __of_remove_property_from_list(&np->deadprops, newprop); @@ -1670,6 +1675,10 @@ int __of_update_property(struct device_node *np, struct property *newprop, *next = newprop; } + raw_spin_unlock_irqrestore(&devtree_lock, flags); + + __of_update_property_sysfs(np, newprop, oldprop); + return 0; } @@ -1685,21 +1694,13 @@ int __of_update_property(struct device_node *np, struct property *newprop, int of_update_property(struct device_node *np, struct property *newprop) { struct property *oldprop; - unsigned long flags; int rc; if (!newprop->name) return -EINVAL; mutex_lock(&of_mutex); - - raw_spin_lock_irqsave(&devtree_lock, flags); rc = __of_update_property(np, newprop, &oldprop); - raw_spin_unlock_irqrestore(&devtree_lock, flags); - - if (!rc) - __of_update_property_sysfs(np, newprop, oldprop); - mutex_unlock(&of_mutex); if (!rc) diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c index d3ad970ad7b8..9252641de507 100644 --- a/drivers/of/dynamic.c +++ b/drivers/of/dynamic.c @@ -198,6 +198,9 @@ static void __of_attach_node(struct device_node *np) { const __be32 *phandle; int sz; + unsigned long flags; + + raw_spin_lock_irqsave(&devtree_lock, flags); if (!of_node_check_flag(np, OF_OVERLAY)) { np->name = __of_get_property(np, "name", NULL); @@ -220,6 +223,10 @@ static void __of_attach_node(struct device_node *np) np->parent->child = np; of_node_clear_flag(np, OF_DETACHED); np->fwnode.flags |= FWNODE_FLAG_NOT_DEVICE; + + raw_spin_unlock_irqrestore(&devtree_lock, flags); + + __of_attach_node_sysfs(np); } /** @@ -229,17 +236,12 @@ static void __of_attach_node(struct device_node *np) int of_attach_node(struct device_node *np) { struct of_reconfig_data rd; - unsigned long flags; memset(&rd, 0, sizeof(rd)); rd.dn = np; mutex_lock(&of_mutex); - raw_spin_lock_irqsave(&devtree_lock, flags); __of_attach_node(np); - raw_spin_unlock_irqrestore(&devtree_lock, flags); - - __of_attach_node_sysfs(np); mutex_unlock(&of_mutex); of_reconfig_notify(OF_RECONFIG_ATTACH_NODE, &rd); @@ -250,13 +252,15 @@ int of_attach_node(struct device_node *np) void __of_detach_node(struct device_node *np) { struct device_node *parent; + unsigned long flags; - if (WARN_ON(of_node_check_flag(np, OF_DETACHED))) - return; + raw_spin_lock_irqsave(&devtree_lock, flags); parent = np->parent; - if (WARN_ON(!parent)) + if (WARN_ON(of_node_check_flag(np, OF_DETACHED) || !parent)) { + raw_spin_unlock_irqrestore(&devtree_lock, flags); return; + } if (parent->child == np) parent->child = np->sibling; @@ -273,6 +277,10 @@ void __of_detach_node(struct device_node *np) /* race with of_find_node_by_phandle() prevented by devtree_lock */ __of_phandle_cache_inv_entry(np->phandle); + + raw_spin_unlock_irqrestore(&devtree_lock, flags); + + __of_detach_node_sysfs(np); } /** @@ -282,17 +290,12 @@ void __of_detach_node(struct device_node *np) int of_detach_node(struct device_node *np) { struct of_reconfig_data rd; - unsigned long flags; memset(&rd, 0, sizeof(rd)); rd.dn = np; mutex_lock(&of_mutex); - raw_spin_lock_irqsave(&devtree_lock, flags); __of_detach_node(np); - raw_spin_unlock_irqrestore(&devtree_lock, flags); - - __of_detach_node_sysfs(np); mutex_unlock(&of_mutex); of_reconfig_notify(OF_RECONFIG_DETACH_NODE, &rd); @@ -564,12 +567,10 @@ static int __of_changeset_entry_notify(struct of_changeset_entry *ce, static int __of_changeset_entry_apply(struct of_changeset_entry *ce) { - unsigned long flags; int ret = 0; of_changeset_action_debug("applying: ", ce->action, ce->np, ce->prop); - raw_spin_lock_irqsave(&devtree_lock, flags); switch (ce->action) { case OF_RECONFIG_ATTACH_NODE: __of_attach_node(ce->np); @@ -590,32 +591,12 @@ static int __of_changeset_entry_apply(struct of_changeset_entry *ce) default: ret = -EINVAL; } - raw_spin_unlock_irqrestore(&devtree_lock, flags); if (ret) { of_changeset_action_err("apply failed: ", ce->action, ce->np, ce->prop); return ret; } - switch (ce->action) { - case OF_RECONFIG_ATTACH_NODE: - __of_attach_node_sysfs(ce->np); - break; - case OF_RECONFIG_DETACH_NODE: - __of_detach_node_sysfs(ce->np); - break; - case OF_RECONFIG_ADD_PROPERTY: - /* ignore duplicate names */ - __of_add_property_sysfs(ce->np, ce->prop); - break; - case OF_RECONFIG_REMOVE_PROPERTY: - __of_remove_property_sysfs(ce->np, ce->prop); - break; - case OF_RECONFIG_UPDATE_PROPERTY: - __of_update_property_sysfs(ce->np, ce->prop, ce->old_prop); - break; - } - return 0; }