| Message ID | 1447894192-17210-1-git-send-email-Suravee.Suthikulpanit@amd.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Rafael Wysocki |
| Headers | show |
Arg... sorry for the typo in the subject. It should say: [PATCH] PCI: Fix OF logic in pci_dma_configure() Suravee On 11/18/2015 6:49 PM, Suravee Suthikulpanit wrote: > This patch fixes a bug introduced by previous commit, > which incorrectly checkes the of_node of the end-point device. > Instead, it should check the of_node of the host bridge. > > Fixes: 50230713b639 ("PCI: OF: Move of_pci_dma_configure() to pci_dma_configure()") > Reported-by: Robin Murphy <robin.murphy@arm.com> > Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > Cc: Bjorn Helgaas <bhelgaas@google.com> > Cc: Arnd Bergmann <arnd@arndb.de> > Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com> > --- > drivers/pci/probe.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c > index e735c72..edb1984 100644 > --- a/drivers/pci/probe.c > +++ b/drivers/pci/probe.c > @@ -1685,8 +1685,8 @@ static void pci_dma_configure(struct pci_dev *dev) > { > struct device *bridge = pci_get_host_bridge_device(dev); > > - if (IS_ENABLED(CONFIG_OF) && dev->dev.of_node) { > - if (bridge->parent) > + if (IS_ENABLED(CONFIG_OF) && > + bridge->parent && bridge->parent->of_node) { > of_dma_configure(&dev->dev, bridge->parent->of_node); > } else if (has_acpi_companion(bridge)) { > struct acpi_device *adev = to_acpi_device_node(bridge->fwnode); > -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wednesday, November 18, 2015 06:54:16 PM Suravee Suthikulanit wrote: > Arg... sorry for the typo in the subject. It should say: > > [PATCH] PCI: Fix OF logic in pci_dma_configure() OK, applied. Thanks, Rafael -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wednesday 18 November 2015 16:49:52 Suravee Suthikulpanit wrote: > - if (IS_ENABLED(CONFIG_OF) && dev->dev.of_node) { > - if (bridge->parent) > + if (IS_ENABLED(CONFIG_OF) && > + bridge->parent && bridge->parent->of_node) { > of_dma_configure(&dev->dev, bridge->parent->of_node); > Acked-by: Arnd Bergmann <arnd@arndb.de> I was wondering for a bit whether we should warn about the case where there is no of_node pointer, as that would mean we cannot do DMA on that PCI device, but on second thought we have to do it exactly like you do, because we would otherwise break machines that do not use DT. Arnd -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index e735c72..edb1984 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1685,8 +1685,8 @@ static void pci_dma_configure(struct pci_dev *dev) { struct device *bridge = pci_get_host_bridge_device(dev); - if (IS_ENABLED(CONFIG_OF) && dev->dev.of_node) { - if (bridge->parent) + if (IS_ENABLED(CONFIG_OF) && + bridge->parent && bridge->parent->of_node) { of_dma_configure(&dev->dev, bridge->parent->of_node); } else if (has_acpi_companion(bridge)) { struct acpi_device *adev = to_acpi_device_node(bridge->fwnode);
This patch fixes a bug introduced by previous commit, which incorrectly checkes the of_node of the end-point device. Instead, it should check the of_node of the host bridge. Fixes: 50230713b639 ("PCI: OF: Move of_pci_dma_configure() to pci_dma_configure()") Reported-by: Robin Murphy <robin.murphy@arm.com> Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com> --- drivers/pci/probe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)