diff mbox series

[v2] PCI/ACPI: Don't reset a fwnode set by OF

Message ID 20210914095120.2132059-1-jean-philippe@linaro.org
State Accepted
Commit 6bd65974dedd1e8638e6665e92ccbf26e8a67cbf
Headers show
Series [v2] PCI/ACPI: Don't reset a fwnode set by OF | expand

Commit Message

Jean-Philippe Brucker Sept. 14, 2021, 9:51 a.m. UTC
Commit 375553a93201 ("PCI: Setup ACPI fwnode early and at the same time
with OF") added a call to pci_set_acpi_fwnode() in pci_setup_device(),
which unconditionally clears any fwnode previously set by
pci_set_of_node().

pci_set_acpi_fwnode() looks for ACPI_COMPANION(), which only returns the
existing fwnode if it was set by ACPI_COMPANION_SET(). If it was set by
OF instead, ACPI_COMPANION() returns NULL and pci_set_acpi_fwnode()
accidentally clears the fwnode. To fix this, look for any fwnode instead
of just ACPI companions.

Fixes: 375553a93201 ("PCI: Setup ACPI fwnode early and at the same time with OF")
Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org>

---
v2: Use dev_fwnode()
v1: https://lore.kernel.org/linux-pci/20210913172358.1775381-1-jean-philippe@linaro.org/
This fixes boot of virtio-iommu under OF on v5.15-rc1
---
 drivers/pci/pci-acpi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.33.0

Comments

Rob Herring (Arm) Sept. 14, 2021, 1:32 p.m. UTC | #1
On Tue, Sep 14, 2021 at 4:55 AM Jean-Philippe Brucker
<jean-philippe@linaro.org> wrote:
>

> Commit 375553a93201 ("PCI: Setup ACPI fwnode early and at the same time

> with OF") added a call to pci_set_acpi_fwnode() in pci_setup_device(),

> which unconditionally clears any fwnode previously set by

> pci_set_of_node().

>

> pci_set_acpi_fwnode() looks for ACPI_COMPANION(), which only returns the

> existing fwnode if it was set by ACPI_COMPANION_SET(). If it was set by

> OF instead, ACPI_COMPANION() returns NULL and pci_set_acpi_fwnode()

> accidentally clears the fwnode. To fix this, look for any fwnode instead

> of just ACPI companions.

>

> Fixes: 375553a93201 ("PCI: Setup ACPI fwnode early and at the same time with OF")

> Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org>

> ---

> v2: Use dev_fwnode()

> v1: https://lore.kernel.org/linux-pci/20210913172358.1775381-1-jean-philippe@linaro.org/

> This fixes boot of virtio-iommu under OF on v5.15-rc1

> ---

>  drivers/pci/pci-acpi.c | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)


Acked-by: Rob Herring <robh@kernel.org>
Rafael J. Wysocki Sept. 14, 2021, 3:01 p.m. UTC | #2
On Tue, Sep 14, 2021 at 11:55 AM Jean-Philippe Brucker
<jean-philippe@linaro.org> wrote:
>

> Commit 375553a93201 ("PCI: Setup ACPI fwnode early and at the same time

> with OF") added a call to pci_set_acpi_fwnode() in pci_setup_device(),

> which unconditionally clears any fwnode previously set by

> pci_set_of_node().

>

> pci_set_acpi_fwnode() looks for ACPI_COMPANION(), which only returns the

> existing fwnode if it was set by ACPI_COMPANION_SET(). If it was set by

> OF instead, ACPI_COMPANION() returns NULL and pci_set_acpi_fwnode()

> accidentally clears the fwnode. To fix this, look for any fwnode instead

> of just ACPI companions.

>

> Fixes: 375553a93201 ("PCI: Setup ACPI fwnode early and at the same time with OF")

> Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org>


Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>


> ---

> v2: Use dev_fwnode()

> v1: https://lore.kernel.org/linux-pci/20210913172358.1775381-1-jean-philippe@linaro.org/

> This fixes boot of virtio-iommu under OF on v5.15-rc1

> ---

>  drivers/pci/pci-acpi.c | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)

>

> diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c

> index a1b1e2a01632..0f40943a9a18 100644

> --- a/drivers/pci/pci-acpi.c

> +++ b/drivers/pci/pci-acpi.c

> @@ -937,7 +937,7 @@ static struct acpi_device *acpi_pci_find_companion(struct device *dev);

>

>  void pci_set_acpi_fwnode(struct pci_dev *dev)

>  {

> -       if (!ACPI_COMPANION(&dev->dev) && !pci_dev_is_added(dev))

> +       if (!dev_fwnode(&dev->dev) && !pci_dev_is_added(dev))

>                 ACPI_COMPANION_SET(&dev->dev,

>                                    acpi_pci_find_companion(&dev->dev));

>  }

> --

> 2.33.0

>
diff mbox series

Patch

diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index a1b1e2a01632..0f40943a9a18 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -937,7 +937,7 @@  static struct acpi_device *acpi_pci_find_companion(struct device *dev);
 
 void pci_set_acpi_fwnode(struct pci_dev *dev)
 {
-	if (!ACPI_COMPANION(&dev->dev) && !pci_dev_is_added(dev))
+	if (!dev_fwnode(&dev->dev) && !pci_dev_is_added(dev))
 		ACPI_COMPANION_SET(&dev->dev,
 				   acpi_pci_find_companion(&dev->dev));
 }