Re: [PATCH 2/6] PCI: of: Use device_{add,remove}_of_node() to attach of_node to existing device

Rob Herring
2024-11-04T20:20:10Z

On Mon, Nov 04, 2024 at 06:19:56PM +0100, Herve Codina wrote:
> The commit 407d1a51921e ("PCI: Create device tree node for bridge")
> creates of_node for PCI devices. The newly created of_node is attached
> to an existing device. This is done setting directly pdev->dev.of_node
> in the code.
>
> Even if pdev->dev.of_node cannot be previously set, this doesn't handle
> the fwnode field of the struct device. Indeed, this field needs to be
> set if it hasn't already been set.
>
> device_{add,remove}_of_node() have been introduced to handle this case.
>
> Use them instead of the direct setting.
>
> Fixes: 407d1a51921e ("PCI: Create device tree node for bridge")
> Cc: stable@vger.kernel.org

I don't think this is stable material. What exactly would is broken
which would be fixed by just the first 2 patches?

> Signed-off-by: Herve Codina <herve.codina@bootlin.com>
> ---
> drivers/pci/of.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/pci/of.c b/drivers/pci/of.c
> index dacea3fc5128..141ffbb1b3e6 100644
> --- a/drivers/pci/of.c
> +++ b/drivers/pci/of.c
> @@ -655,8 +655,8 @@ void of_pci_remove_node(struct pci_dev *pdev)
> np = pci_device_to_OF_node(pdev);
> if (!np || !of_node_check_flag(np, OF_DYNAMIC))
> return;
> - pdev->dev.of_node = NULL;
>
> + device_remove_of_node(&pdev->dev);
> of_changeset_revert(np->data);
> of_changeset_destroy(np->data);
> of_node_put(np);
> @@ -713,7 +713,7 @@ void of_pci_make_dev_node(struct pci_dev *pdev)
> goto out_free_node;
>
> np->data = cset;
> - pdev->dev.of_node = np;
> + device_add_of_node(&pdev->dev, np);
> kfree(name);
>
> return;
> --
> 2.46.2
>