From: Jon Fraser <jfraser@xxxxxxxxxxxx>
DMA changes from Jon Fraser, slightly tweaked for 2.6.30.
Signed-off-by: Jon Fraser <jfraser@xxxxxxxxxxxx>
Signed-off-by: David VomLehn <dvomlehn@xxxxxxxxx>
---
arch/mips/mm/dma-default.c | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c
index 4fdb7f5..70cff1f 100644
--- a/arch/mips/mm/dma-default.c
+++ b/arch/mips/mm/dma-default.c
@@ -135,6 +135,9 @@ EXPORT_SYMBOL(dma_free_coherent);
static inline void __dma_sync(unsigned long addr, size_t size,
enum dma_data_direction direction)
{
+
+ BUG_ON(addr < KSEG0);
+
switch (direction) {
case DMA_TO_DEVICE:
dma_cache_wback(addr, size);
@@ -188,11 +191,13 @@ int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
for (i = 0; i < nents; i++, sg++) {
unsigned long addr;
+ BUG_ON(!sg_page(sg));
+
addr = (unsigned long) sg_virt(sg);
- if (!plat_device_is_coherent(dev) && addr)
+ if (!plat_device_is_coherent(dev) && (addr >= KSEG0))
__dma_sync(addr, sg->length, direction);
- sg->dma_address = plat_map_dma_mem(dev,
- (void *)addr, sg->length);
+
+ sg->dma_address = sg_phys(sg);
}
return nents;
@@ -229,7 +234,7 @@ void dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries,
if (!plat_device_is_coherent(dev) &&
direction != DMA_TO_DEVICE) {
addr = (unsigned long) sg_virt(sg);
- if (addr)
+ if (addr >= KSEG0)
__dma_sync(addr, sg->length, direction);
}
plat_unmap_dma_mem(dev, sg->dma_address);
@@ -359,6 +364,7 @@ void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
enum dma_data_direction direction)
{
BUG_ON(direction == DMA_NONE);
+ BUG_ON(vaddr < (void *)KSEG0);
plat_extra_sync_for_device(dev);
if (!plat_device_is_coherent(dev))
