[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1440597279-11802-5-git-send-email-Suravee.Suthikulpanit@amd.com>
Date: Wed, 26 Aug 2015 20:54:39 +0700
From: Suravee Suthikulpanit <Suravee.Suthikulpanit@....com>
To: <bhelgaas@...gle.com>, <rjw@...ysocki.net>, <lenb@...nel.org>,
<catalin.marinas@....com>, <will.deacon@....com>
CC: <hanjun.guo@...aro.org>, <linux-acpi@...r.kernel.org>,
<linux-pci@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
<linux-arm-kernel@...ts.infradead.org>,
Suravee Suthikulpanit <Suravee.Suthikulpanit@....com>,
Rob Herring <robh+dt@...nel.org>,
"Murali Karicheri" <m-karicheri2@...com>
Subject: [PATCH V3 4/4] PCI: ACPI: Add support for PCI device DMA coherency
This patch adds support for setting up PCI device DMA coherency from
ACPI _CCA object that should normally be specified in the DSDT node
of its PCI host bridge.
Signed-off-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@....com>
CC: Bjorn Helgaas <bhelgaas@...gle.com>
CC: Catalin Marinas <catalin.marinas@....com>
CC: Rob Herring <robh+dt@...nel.org>
CC: Will Deacon <will.deacon@....com>
CC: Rafael J. Wysocki <rjw@...ysocki.net>
CC: Murali Karicheri <m-karicheri2@...com>
---
drivers/pci/probe.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 4de6594..7cfd8e2 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1551,17 +1551,25 @@ static void pci_init_capabilities(struct pci_dev *dev)
* @dev: ptr to pci_dev struct of the PCI device
*
* Function to update PCI devices's DMA configuration using the same
- * info from the OF node of host bridge's parent (if any).
+ * info from the OF node or ACPI node of host bridge's parent (if any).
*/
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)
- return;
-
- of_dma_configure(&dev->dev, bridge->parent->of_node);
+ if (bridge->parent)
+ of_dma_configure(&dev->dev,
+ bridge->parent->of_node);
+ } else if (has_acpi_companion(bridge)) {
+ struct acpi_device *adev = to_acpi_node(bridge->fwnode);
+ int ret = acpi_check_dma_coherency(adev);
+
+ if (ret < 0)
+ WARN(1, FW_BUG "PCI device %s fail to setup DMA.\n",
+ pci_name(dev));
+ else
+ arch_setup_dma_ops(&dev->dev, 0, 0, NULL, ret);
}
pci_put_host_bridge_device(bridge);
--
2.1.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists