OSDN Git Service

PCI/ACPI: Don't reset a fwnode set by OF
authorJean-Philippe Brucker <jean-philippe@linaro.org>
Mon, 13 Sep 2021 17:23:59 +0000 (18:23 +0100)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 15 Sep 2021 21:26:59 +0000 (16:26 -0500)
commit6bd65974dedd1e8638e6665e92ccbf26e8a67cbf
tree9e1520a9ff5e5802b77cd4da0e9ef0b9ddcafac1
parent00e1a5d21b4ff514593554167b28a8caeda1497f
PCI/ACPI: Don't reset a fwnode set by OF

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 a virtio-iommu boot regression in v5.15-rc1.

Fixes: 375553a93201 ("PCI: Setup ACPI fwnode early and at the same time with OF")
Link: https://lore.kernel.org/r/20210913172358.1775381-1-jean-philippe@linaro.org
Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Rob Herring <robh@kernel.org>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/pci/pci-acpi.c