[PATCH v2 3/5] sh/PCI: Pass GAPSPCI_DMA_BASE CPU address to dma_declare_coherent_memory()

[Bjorn Helgaas]

dma_declare_coherent_memory() needs both the CPU physical address and the
bus address of the device memory.  They are likely the same on this
platform, but in general we should use pcibios_bus_to_resource() to account
for any address translation done by the PCI host bridge.

Signed-off-by: Bjorn Helgaas <bhelg...@google.com>
CC: Magnus Damm <d...@opensource.se>
CC: linux...@vger.kernel.org
---
 arch/sh/drivers/pci/fixups-dreamcast.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/arch/sh/drivers/pci/fixups-dreamcast.c 
b/arch/sh/drivers/pci/fixups-dreamcast.c
index d6cde700e316..987c788f5a4f 100644
--- a/arch/sh/drivers/pci/fixups-dreamcast.c
+++ b/arch/sh/drivers/pci/fixups-dreamcast.c
@@ -31,6 +31,8 @@
 static void gapspci_fixup_resources(struct pci_dev *dev)
 {
        struct pci_channel *p = dev->sysdata;
+       struct pci_bus_region region;
+       struct resource res;
 
        printk(KERN_NOTICE "PCI: Fixing up device %s\n", pci_name(dev));
 
@@ -51,8 +53,12 @@ static void gapspci_fixup_resources(struct pci_dev *dev)
                /*
                 * Redirect dma memory allocations to special memory window.
                 */
+               region.start = GAPSPCI_DMA_BASE;
+               region.end = GAPSPCI_DMA_BASE + GAPSPCI_DMA_SIZE - 1;
+               res.flags = IORESOURCE_MEM;
+               pcibios_bus_to_resource(dev->bus, &res, &region);
                BUG_ON(!dma_declare_coherent_memory(&dev->dev,
-                                               GAPSPCI_DMA_BASE,
+                                               res->start,
                                                GAPSPCI_DMA_BASE,
                                                GAPSPCI_DMA_SIZE,
                                                DMA_MEMORY_MAP |

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/