LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH v2 0/2] device property: Remove device_add_properties()
@ 2021-09-30 12:12 Heikki Krogerus
  2021-09-30 12:12 ` [PATCH v2 1/2] PCI: Convert to device_create_managed_software_node() Heikki Krogerus
  2021-09-30 12:12 ` [PATCH v2 2/2] device property: Remove device_add_properties() API Heikki Krogerus
  0 siblings, 2 replies; 7+ messages in thread
From: Heikki Krogerus @ 2021-09-30 12:12 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Rafael J. Wysocki
  Cc: Bjorn Helgaas, Andy Shevchenko, Zhangfei Gao, linux-kernel, linux-pci

Hi,

This is the second version where I only modified the commit message of
the first patch according to comments from Bjorn.


Original cover letter:

There is one user left for the API, so converting that to use software
node API instead, and removing the function.

thanks,

Heikki Krogerus (2):
  PCI: Convert to device_create_managed_software_node()
  device property: Remove device_add_properties() API

 drivers/base/core.c      |  1 -
 drivers/base/property.c  | 48 ----------------------------------------
 drivers/pci/quirks.c     |  2 +-
 include/linux/property.h |  4 ----
 4 files changed, 1 insertion(+), 54 deletions(-)

-- 
2.33.0


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH v2 1/2] PCI: Convert to device_create_managed_software_node()
  2021-09-30 12:12 [PATCH v2 0/2] device property: Remove device_add_properties() Heikki Krogerus
@ 2021-09-30 12:12 ` Heikki Krogerus
  2021-09-30 15:04   ` Bjorn Helgaas
  2021-09-30 12:12 ` [PATCH v2 2/2] device property: Remove device_add_properties() API Heikki Krogerus
  1 sibling, 1 reply; 7+ messages in thread
From: Heikki Krogerus @ 2021-09-30 12:12 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Rafael J. Wysocki
  Cc: Bjorn Helgaas, Andy Shevchenko, Zhangfei Gao, linux-kernel, linux-pci

In quirk_huawei_pcie_sva(), use device_create_managed_software_node()
instead of device_add_properties() to set the "dma-can-stall"
property.

Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Acked-by: Zhangfei Gao <zhangfei.gao@linaro.org>
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
Hi,

The commit message now says what Bjorn requested, except I left out
the claim that the patch fixes a lifetime issue.

There shouldn't be any functional impact.

thanks,
---
 drivers/pci/quirks.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index b6b4c803bdc94..fe5eedba47908 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -1850,7 +1850,7 @@ static void quirk_huawei_pcie_sva(struct pci_dev *pdev)
 	 * can set it directly.
 	 */
 	if (!pdev->dev.of_node &&
-	    device_add_properties(&pdev->dev, properties))
+	    device_create_managed_software_node(&pdev->dev, properties, NULL))
 		pci_warn(pdev, "could not add stall property");
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_HUAWEI, 0xa250, quirk_huawei_pcie_sva);
-- 
2.33.0


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH v2 2/2] device property: Remove device_add_properties() API
  2021-09-30 12:12 [PATCH v2 0/2] device property: Remove device_add_properties() Heikki Krogerus
  2021-09-30 12:12 ` [PATCH v2 1/2] PCI: Convert to device_create_managed_software_node() Heikki Krogerus
@ 2021-09-30 12:12 ` Heikki Krogerus
  1 sibling, 0 replies; 7+ messages in thread
From: Heikki Krogerus @ 2021-09-30 12:12 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Rafael J. Wysocki
  Cc: Bjorn Helgaas, Andy Shevchenko, Zhangfei Gao, linux-kernel, linux-pci

There are no more users for it.

Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
 drivers/base/core.c      |  1 -
 drivers/base/property.c  | 48 ----------------------------------------
 include/linux/property.h |  4 ----
 3 files changed, 53 deletions(-)

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 7758223f040c8..7935ee642fa3f 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -3573,7 +3573,6 @@ void device_del(struct device *dev)
 	device_pm_remove(dev);
 	driver_deferred_probe_del(dev);
 	device_platform_notify_remove(dev);
-	device_remove_properties(dev);
 	device_links_purge(dev);
 
 	if (dev->bus)
diff --git a/drivers/base/property.c b/drivers/base/property.c
index 453918eb7390c..1f1eee37817e0 100644
--- a/drivers/base/property.c
+++ b/drivers/base/property.c
@@ -508,54 +508,6 @@ struct fwnode_handle *fwnode_find_reference(const struct fwnode_handle *fwnode,
 }
 EXPORT_SYMBOL_GPL(fwnode_find_reference);
 
-/**
- * device_remove_properties - Remove properties from a device object.
- * @dev: Device whose properties to remove.
- *
- * The function removes properties previously associated to the device
- * firmware node with device_add_properties(). Memory allocated to the
- * properties will also be released.
- */
-void device_remove_properties(struct device *dev)
-{
-	struct fwnode_handle *fwnode = dev_fwnode(dev);
-
-	if (!fwnode)
-		return;
-
-	if (is_software_node(fwnode->secondary)) {
-		fwnode_remove_software_node(fwnode->secondary);
-		set_secondary_fwnode(dev, NULL);
-	}
-}
-EXPORT_SYMBOL_GPL(device_remove_properties);
-
-/**
- * device_add_properties - Add a collection of properties to a device object.
- * @dev: Device to add properties to.
- * @properties: Collection of properties to add.
- *
- * Associate a collection of device properties represented by @properties with
- * @dev. The function takes a copy of @properties.
- *
- * WARNING: The callers should not use this function if it is known that there
- * is no real firmware node associated with @dev! In that case the callers
- * should create a software node and assign it to @dev directly.
- */
-int device_add_properties(struct device *dev,
-			  const struct property_entry *properties)
-{
-	struct fwnode_handle *fwnode;
-
-	fwnode = fwnode_create_software_node(properties, NULL);
-	if (IS_ERR(fwnode))
-		return PTR_ERR(fwnode);
-
-	set_secondary_fwnode(dev, fwnode);
-	return 0;
-}
-EXPORT_SYMBOL_GPL(device_add_properties);
-
 /**
  * fwnode_get_name - Return the name of a node
  * @fwnode: The firmware node
diff --git a/include/linux/property.h b/include/linux/property.h
index 357513a977e5d..daf0b5841286f 100644
--- a/include/linux/property.h
+++ b/include/linux/property.h
@@ -377,10 +377,6 @@ property_entries_dup(const struct property_entry *properties);
 
 void property_entries_free(const struct property_entry *properties);
 
-int device_add_properties(struct device *dev,
-			  const struct property_entry *properties);
-void device_remove_properties(struct device *dev);
-
 bool device_dma_supported(struct device *dev);
 
 enum dev_dma_attr device_get_dma_attr(struct device *dev);
-- 
2.33.0


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH v2 1/2] PCI: Convert to device_create_managed_software_node()
  2021-09-30 12:12 ` [PATCH v2 1/2] PCI: Convert to device_create_managed_software_node() Heikki Krogerus
@ 2021-09-30 15:04   ` Bjorn Helgaas
  2021-10-01 10:36     ` Heikki Krogerus
  0 siblings, 1 reply; 7+ messages in thread
From: Bjorn Helgaas @ 2021-09-30 15:04 UTC (permalink / raw)
  To: Heikki Krogerus
  Cc: Greg Kroah-Hartman, Rafael J. Wysocki, Bjorn Helgaas,
	Andy Shevchenko, Zhangfei Gao, linux-kernel, linux-pci

On Thu, Sep 30, 2021 at 03:12:45PM +0300, Heikki Krogerus wrote:
> In quirk_huawei_pcie_sva(), use device_create_managed_software_node()
> instead of device_add_properties() to set the "dma-can-stall"
> property.
> 
> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
> Acked-by: Zhangfei Gao <zhangfei.gao@linaro.org>
> Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> ---
> Hi,
> 
> The commit message now says what Bjorn requested, except I left out
> the claim that the patch fixes a lifetime issue.

Thanks.

The commit log should help reviewers determine whether the change is
safe and necessary.  So far it doesn't have any hints along that line.

Comparing device_add_properties() [1] and
device_create_managed_software_node() [2], the only difference in this
case is that the latter sets "swnode->managed = true".  The function
comment says "managed" means the lifetime of the swnode is tied to the
lifetime of dev, hence my question about a lifetime issue.

I can see that one reason for this change is to remove the last caller
of device_add_properties(), so device_add_properties() itself can be
removed.  That's a good reason for wanting to do it, and the commit
log could mention it.

But it doesn't help me figure out whether it's safe.  For that,
I need to know the effect of setting "managed = true".  Obviously
it means *something*, but I don't know what.  It looks like the only
test is in software_node_notify():

  device_del
    device_platform_notify_remove
      software_node_notify_remove
        sysfs_remove_link(dev_name)
        sysfs_remove_link("software_node")
        if (swnode->managed)                 <--
          set_secondary_fwnode(dev, NULL)
          kobject_put(&swnode->kobj)
    device_remove_properties
      if (is_software_node())
        fwnode_remove_software_node
          kobject_put(&swnode->kobj)
        set_secondary_fwnode(dev, NULL)

I'm not sure what's going on here; it looks like some redundancy with
multiple calls of kobject_put() and set_secondary_fwnode().  Maybe you
are in the process of removing device_remove_properties() as well as
device_add_properties()?

[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/base/property.c?id=v5.14#n533
[2] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/base/swnode.c?id=v5.14#n1083

> There shouldn't be any functional impact.
> 
> thanks,
> ---
>  drivers/pci/quirks.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
> index b6b4c803bdc94..fe5eedba47908 100644
> --- a/drivers/pci/quirks.c
> +++ b/drivers/pci/quirks.c
> @@ -1850,7 +1850,7 @@ static void quirk_huawei_pcie_sva(struct pci_dev *pdev)
>  	 * can set it directly.
>  	 */
>  	if (!pdev->dev.of_node &&
> -	    device_add_properties(&pdev->dev, properties))
> +	    device_create_managed_software_node(&pdev->dev, properties, NULL))
>  		pci_warn(pdev, "could not add stall property");
>  }
>  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_HUAWEI, 0xa250, quirk_huawei_pcie_sva);
> -- 
> 2.33.0
> 

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH v2 1/2] PCI: Convert to device_create_managed_software_node()
  2021-09-30 15:04   ` Bjorn Helgaas
@ 2021-10-01 10:36     ` Heikki Krogerus
  2021-10-05 14:04       ` Rafael J. Wysocki
  0 siblings, 1 reply; 7+ messages in thread
From: Heikki Krogerus @ 2021-10-01 10:36 UTC (permalink / raw)
  To: Bjorn Helgaas
  Cc: Greg Kroah-Hartman, Rafael J. Wysocki, Bjorn Helgaas,
	Andy Shevchenko, Zhangfei Gao, linux-kernel, linux-pci

On Thu, Sep 30, 2021 at 10:04:02AM -0500, Bjorn Helgaas wrote:
> On Thu, Sep 30, 2021 at 03:12:45PM +0300, Heikki Krogerus wrote:
> > In quirk_huawei_pcie_sva(), use device_create_managed_software_node()
> > instead of device_add_properties() to set the "dma-can-stall"
> > property.
> > 
> > Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
> > Acked-by: Zhangfei Gao <zhangfei.gao@linaro.org>
> > Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> > ---
> > Hi,
> > 
> > The commit message now says what Bjorn requested, except I left out
> > the claim that the patch fixes a lifetime issue.
> 
> Thanks.
> 
> The commit log should help reviewers determine whether the change is
> safe and necessary.  So far it doesn't have any hints along that line.
> 
> Comparing device_add_properties() [1] and
> device_create_managed_software_node() [2], the only difference in this
> case is that the latter sets "swnode->managed = true".  The function
> comment says "managed" means the lifetime of the swnode is tied to the
> lifetime of dev, hence my question about a lifetime issue.
> 
> I can see that one reason for this change is to remove the last caller
> of device_add_properties(), so device_add_properties() itself can be
> removed.  That's a good reason for wanting to do it, and the commit
> log could mention it.

Fair enough. I need to explain the why as well as the what.

I'll improve the commit message, but just to be clear, the goal is
actually not to get rid of device_add_properties(). It is removed in
the second patch together with device_remove_properties() because
there are simply no more users for that API.

> But it doesn't help me figure out whether it's safe.  For that,
> I need to know the effect of setting "managed = true".  Obviously
> it means *something*, but I don't know what.  It looks like the only
> test is in software_node_notify():
> 
>   device_del
>     device_platform_notify_remove
>       software_node_notify_remove
>         sysfs_remove_link(dev_name)
>         sysfs_remove_link("software_node")
>         if (swnode->managed)                 <--
>           set_secondary_fwnode(dev, NULL)
>           kobject_put(&swnode->kobj)
>     device_remove_properties
>       if (is_software_node())
>         fwnode_remove_software_node
>           kobject_put(&swnode->kobj)
>         set_secondary_fwnode(dev, NULL)
> 
> I'm not sure what's going on here; it looks like some redundancy with
> multiple calls of kobject_put() and set_secondary_fwnode().  Maybe you
> are in the process of removing device_remove_properties() as well as
> device_add_properties()?

It'll get removed, but that's not the goal. The goal is to get rid of
the call to it in device_del(), so not the function itself. That call
is the problem here as explained in commit 151f6ff78cdf ("software
node: Provide replacement for device_add_properties()").

I'll split the second patch, and first only remove that
device_remove_properties() call from device_del(), and only after
that remove the functions themselves.

thanks,

-- 
heikki

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH v2 1/2] PCI: Convert to device_create_managed_software_node()
  2021-10-01 10:36     ` Heikki Krogerus
@ 2021-10-05 14:04       ` Rafael J. Wysocki
  2021-10-06  9:48         ` Heikki Krogerus
  0 siblings, 1 reply; 7+ messages in thread
From: Rafael J. Wysocki @ 2021-10-05 14:04 UTC (permalink / raw)
  To: Heikki Krogerus
  Cc: Bjorn Helgaas, Greg Kroah-Hartman, Rafael J. Wysocki,
	Bjorn Helgaas, Andy Shevchenko, Zhangfei Gao,
	Linux Kernel Mailing List, Linux PCI

On Fri, Oct 1, 2021 at 12:36 PM Heikki Krogerus
<heikki.krogerus@linux.intel.com> wrote:
>
> On Thu, Sep 30, 2021 at 10:04:02AM -0500, Bjorn Helgaas wrote:
> > On Thu, Sep 30, 2021 at 03:12:45PM +0300, Heikki Krogerus wrote:
> > > In quirk_huawei_pcie_sva(), use device_create_managed_software_node()
> > > instead of device_add_properties() to set the "dma-can-stall"
> > > property.
> > >
> > > Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
> > > Acked-by: Zhangfei Gao <zhangfei.gao@linaro.org>
> > > Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> > > ---
> > > Hi,
> > >
> > > The commit message now says what Bjorn requested, except I left out
> > > the claim that the patch fixes a lifetime issue.
> >
> > Thanks.
> >
> > The commit log should help reviewers determine whether the change is
> > safe and necessary.  So far it doesn't have any hints along that line.
> >
> > Comparing device_add_properties() [1] and
> > device_create_managed_software_node() [2], the only difference in this
> > case is that the latter sets "swnode->managed = true".  The function
> > comment says "managed" means the lifetime of the swnode is tied to the
> > lifetime of dev, hence my question about a lifetime issue.
> >
> > I can see that one reason for this change is to remove the last caller
> > of device_add_properties(), so device_add_properties() itself can be
> > removed.  That's a good reason for wanting to do it, and the commit
> > log could mention it.
>
> Fair enough. I need to explain the why as well as the what.
>
> I'll improve the commit message, but just to be clear, the goal is
> actually not to get rid of device_add_properties(). It is removed in
> the second patch together with device_remove_properties() because
> there are simply no more users for that API.
>
> > But it doesn't help me figure out whether it's safe.  For that,
> > I need to know the effect of setting "managed = true".  Obviously
> > it means *something*, but I don't know what.  It looks like the only
> > test is in software_node_notify():
> >
> >   device_del
> >     device_platform_notify_remove
> >       software_node_notify_remove
> >         sysfs_remove_link(dev_name)
> >         sysfs_remove_link("software_node")
> >         if (swnode->managed)                 <--
> >           set_secondary_fwnode(dev, NULL)
> >           kobject_put(&swnode->kobj)
> >     device_remove_properties
> >       if (is_software_node())
> >         fwnode_remove_software_node
> >           kobject_put(&swnode->kobj)
> >         set_secondary_fwnode(dev, NULL)
> >
> > I'm not sure what's going on here; it looks like some redundancy with
> > multiple calls of kobject_put() and set_secondary_fwnode().  Maybe you
> > are in the process of removing device_remove_properties() as well as
> > device_add_properties()?
>
> It'll get removed, but that's not the goal. The goal is to get rid of
> the call to it in device_del(), so not the function itself. That call
> is the problem here as explained in commit 151f6ff78cdf ("software
> node: Provide replacement for device_add_properties()").
>
> I'll split the second patch, and first only remove that
> device_remove_properties() call from device_del(), and only after
> that remove the functions themselves.

So I'm expecting a v3 of this.

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH v2 1/2] PCI: Convert to device_create_managed_software_node()
  2021-10-05 14:04       ` Rafael J. Wysocki
@ 2021-10-06  9:48         ` Heikki Krogerus
  0 siblings, 0 replies; 7+ messages in thread
From: Heikki Krogerus @ 2021-10-06  9:48 UTC (permalink / raw)
  To: Rafael J. Wysocki
  Cc: Bjorn Helgaas, Greg Kroah-Hartman, Bjorn Helgaas,
	Andy Shevchenko, Zhangfei Gao, Linux Kernel Mailing List,
	Linux PCI

On Tue, Oct 05, 2021 at 04:04:48PM +0200, Rafael J. Wysocki wrote:
> So I'm expecting a v3 of this.

Yes, sorry for the delay. v3 coming up.

thanks,

-- 
heikki

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2021-10-06  9:48 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-30 12:12 [PATCH v2 0/2] device property: Remove device_add_properties() Heikki Krogerus
2021-09-30 12:12 ` [PATCH v2 1/2] PCI: Convert to device_create_managed_software_node() Heikki Krogerus
2021-09-30 15:04   ` Bjorn Helgaas
2021-10-01 10:36     ` Heikki Krogerus
2021-10-05 14:04       ` Rafael J. Wysocki
2021-10-06  9:48         ` Heikki Krogerus
2021-09-30 12:12 ` [PATCH v2 2/2] device property: Remove device_add_properties() API Heikki Krogerus

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).