diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-09 17:06:24 +0000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 10:35:26 +1100 |
| commit | 8aa2659009714cf5f9ffe7f3e16ccfa8ff0e0d61 (patch) | |
| tree | 070526522368d43ab8e0332a849474b44c80e980 | |
| parent | 1263965f298af611d4992165242202eb194db1c1 (diff) | |
| download | linux-8aa2659009714cf5f9ffe7f3e16ccfa8ff0e0d61.tar.gz linux-8aa2659009714cf5f9ffe7f3e16ccfa8ff0e0d61.tar.bz2 linux-8aa2659009714cf5f9ffe7f3e16ccfa8ff0e0d61.zip | |
powerpc: Fix DMA offset for non-coherent DMA
After Becky's work we can almost have different DMA offsets
between on-chip devices and PCI. Almost because there's a
problem with the non-coherent DMA code that basically ignores
the programmed offset to use the global one for everything.
This fixes it.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
| -rw-r--r-- | arch/powerpc/kernel/dma.c | 8 | ||||
| -rw-r--r-- | arch/powerpc/lib/dma-noncoherent.c | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c index 41fdd48bf433..1562daf8839a 100644 --- a/arch/powerpc/kernel/dma.c +++ b/arch/powerpc/kernel/dma.c @@ -30,11 +30,15 @@ static unsigned long get_dma_direct_offset(struct device *dev) void *dma_direct_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flag) { + void *ret; #ifdef CONFIG_NOT_COHERENT_CACHE - return __dma_alloc_coherent(size, dma_handle, flag); + ret = __dma_alloc_coherent(size, dma_handle, flag); + if (ret == NULL) + return NULL; + *dma_handle += get_dma_direct_offset(dev); + return ret; #else struct page *page; - void *ret; int node = dev_to_node(dev); /* ignore region specifiers */ diff --git a/arch/powerpc/lib/dma-noncoherent.c b/arch/powerpc/lib/dma-noncoherent.c index 5d83907f6591..31734c0969cd 100644 --- a/arch/powerpc/lib/dma-noncoherent.c +++ b/arch/powerpc/lib/dma-noncoherent.c @@ -203,7 +203,7 @@ __dma_alloc_coherent(size_t size, dma_addr_t *handle, gfp_t gfp) /* * Set the "dma handle" */ - *handle = page_to_bus(page); + *handle = page_to_phys(page); do { BUG_ON(!pte_none(*pte)); |