From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 95A26C433E0 for ; Mon, 25 May 2020 11:24:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 741CF20787 for ; Mon, 25 May 2020 11:24:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390100AbgEYLYQ (ORCPT ); Mon, 25 May 2020 07:24:16 -0400 Received: from mga06.intel.com ([134.134.136.31]:56855 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389897AbgEYLYP (ORCPT ); Mon, 25 May 2020 07:24:15 -0400 IronPort-SDR: p9kcU0T3xNHo0KdbTel4/+N0dwKt0kjS890xUNniRU9OGnoMO4Dh4eLgNHHdjD0OvI1Ck006dp onrcCXulMJYw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 May 2020 04:24:15 -0700 IronPort-SDR: SQzU8SMO4DVlsQEdL7JernjBzFrgFoakWQ+ufSXtU/D+i3RaC/pGLFQubeq2AeHeO5DpQ/EenL pBd1vtj9mOyQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,433,1583222400"; d="scan'208";a="375411545" Received: from kuha.fi.intel.com ([10.237.72.162]) by fmsmga001.fm.intel.com with SMTP; 25 May 2020 04:24:10 -0700 Received: by kuha.fi.intel.com (sSMTP sendmail emulation); Mon, 25 May 2020 14:24:09 +0300 Date: Mon, 25 May 2020 14:24:09 +0300 From: Heikki Krogerus To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, linux@roeck-us.net, Naresh Kamboju , kernel test robot , stable , Andy Shevchenko , Brendan Higgins , Dmitry Torokhov , Petr Mladek , "Rafael J . Wysocki" , Randy Dunlap , Rasmus Villemoes , Sakari Ailus , Sergey Senozhatsky , Steven Rostedt Subject: Re: [PATCH 1/2] software node: implement software_node_unregister() Message-ID: <20200525112409.GA3208393@kuha.fi.intel.com> References: <20200524153041.2361-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200524153041.2361-1-gregkh@linuxfoundation.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Sun, May 24, 2020 at 05:30:40PM +0200, Greg Kroah-Hartman wrote: > Sometimes it is better to unregister individual nodes instead of trying > to do them all at once with software_node_unregister_nodes(), so create > software_node_unregister() so that you can unregister them one at a > time. > > This is especially important when creating nodes in a hierarchy, with > parent -> children representations. Children always need to be removed > before a parent is, as the swnode logic assumes this is going to be the > case. > > Fix up the lib/test_printf.c fwnode_pointer() test which to use this new > function as it had the problem of tearing things down in the backwards > order. > > Fixes: f1ce39df508d ("lib/test_printf: Add tests for %pfw printk modifier") > Reported-by: Naresh Kamboju > Reported-by: kernel test robot > Cc: stable > Cc: Andy Shevchenko > Cc: Brendan Higgins > Cc: Dmitry Torokhov > Cc: Heikki Krogerus > Cc: Petr Mladek > Cc: Rafael J. Wysocki > Cc: Randy Dunlap > Cc: Rasmus Villemoes > Cc: Sakari Ailus > Cc: Sergey Senozhatsky > Cc: Steven Rostedt > Signed-off-by: Greg Kroah-Hartman FWIW: Reviewed-by: Heikki Krogerus > --- > drivers/base/swnode.c | 27 +++++++++++++++++++++------ > include/linux/property.h | 1 + > lib/test_printf.c | 4 +++- > 3 files changed, 25 insertions(+), 7 deletions(-) > > diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c > index de8d3543e8fe..770b1f47a625 100644 > --- a/drivers/base/swnode.c > +++ b/drivers/base/swnode.c > @@ -712,17 +712,18 @@ EXPORT_SYMBOL_GPL(software_node_register_nodes); > * @nodes: Zero terminated array of software nodes to be unregistered > * > * Unregister multiple software nodes at once. > + * > + * NOTE: Be careful using this call if the nodes had parent pointers set up in > + * them before registering. If so, it is wiser to remove the nodes > + * individually, in the correct order (child before parent) instead of relying > + * on the sequential order of the list of nodes in the array. > */ > void software_node_unregister_nodes(const struct software_node *nodes) > { > - struct swnode *swnode; > int i; > > - for (i = 0; nodes[i].name; i++) { > - swnode = software_node_to_swnode(&nodes[i]); > - if (swnode) > - fwnode_remove_software_node(&swnode->fwnode); > - } > + for (i = 0; nodes[i].name; i++) > + software_node_unregister(&nodes[i]); > } > EXPORT_SYMBOL_GPL(software_node_unregister_nodes); > > @@ -741,6 +742,20 @@ int software_node_register(const struct software_node *node) > } > EXPORT_SYMBOL_GPL(software_node_register); > > +/** > + * software_node_unregister - Unregister static software node > + * @node: The software node to be unregistered > + */ > +void software_node_unregister(const struct software_node *node) > +{ > + struct swnode *swnode; > + > + swnode = software_node_to_swnode(node); > + if (swnode) > + fwnode_remove_software_node(&swnode->fwnode); > +} > +EXPORT_SYMBOL_GPL(software_node_unregister); > + > struct fwnode_handle * > fwnode_create_software_node(const struct property_entry *properties, > const struct fwnode_handle *parent) > diff --git a/include/linux/property.h b/include/linux/property.h > index d86de017c689..0d4099b4ce1f 100644 > --- a/include/linux/property.h > +++ b/include/linux/property.h > @@ -441,6 +441,7 @@ int software_node_register_nodes(const struct software_node *nodes); > void software_node_unregister_nodes(const struct software_node *nodes); > > int software_node_register(const struct software_node *node); > +void software_node_unregister(const struct software_node *node); > > int software_node_notify(struct device *dev, unsigned long action); > > diff --git a/lib/test_printf.c b/lib/test_printf.c > index 6b1622f4d7c2..fc63b8959d42 100644 > --- a/lib/test_printf.c > +++ b/lib/test_printf.c > @@ -637,7 +637,9 @@ static void __init fwnode_pointer(void) > test(second_name, "%pfwP", software_node_fwnode(&softnodes[1])); > test(third_name, "%pfwP", software_node_fwnode(&softnodes[2])); > > - software_node_unregister_nodes(softnodes); > + software_node_unregister(&softnodes[2]); > + software_node_unregister(&softnodes[1]); > + software_node_unregister(&softnodes[0]); > } > > static void __init > -- > 2.26.2 thanks, -- heikki