aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/microblaze/include/asm/dma-mapping.h1
-rw-r--r--arch/microblaze/kernel/dma.c26
2 files changed, 23 insertions, 4 deletions
diff --git a/arch/microblaze/include/asm/dma-mapping.h b/arch/microblaze/include/asm/dma-mapping.h
index 096fa96ee73..18b3731c850 100644
--- a/arch/microblaze/include/asm/dma-mapping.h
+++ b/arch/microblaze/include/asm/dma-mapping.h
@@ -34,7 +34,6 @@
#define __dma_alloc_coherent(dev, gfp, size, handle) NULL
#define __dma_free_coherent(size, addr) ((void)0)
#define __dma_sync(addr, size, rw) ((void)0)
-#define __dma_sync_page(pg, off, sz, rw) ((void)0)
static inline unsigned long device_to_mask(struct device *dev)
{
diff --git a/arch/microblaze/kernel/dma.c b/arch/microblaze/kernel/dma.c
index 300fea46737..64bc39f40ba 100644
--- a/arch/microblaze/kernel/dma.c
+++ b/arch/microblaze/kernel/dma.c
@@ -10,6 +10,7 @@
#include <linux/dma-mapping.h>
#include <linux/dma-debug.h>
#include <asm/bug.h>
+#include <asm/cacheflush.h>
/*
* Generic direct DMA implementation
@@ -20,6 +21,23 @@
* default the offset is PCI_DRAM_OFFSET.
*/
+static inline void __dma_sync_page(void *vaddr, unsigned long offset,
+ size_t size, enum dma_data_direction direction)
+{
+ unsigned long start = virt_to_phys(vaddr);
+
+ switch (direction) {
+ case DMA_TO_DEVICE:
+ flush_dcache_range(start + offset, start + offset + size);
+ break;
+ case DMA_FROM_DEVICE:
+ invalidate_dcache_range(start + offset, start + offset + size);
+ break;
+ default:
+ BUG();
+ }
+}
+
static unsigned long get_dma_direct_offset(struct device *dev)
{
if (dev)
@@ -85,11 +103,11 @@ static inline dma_addr_t dma_direct_map_page(struct device *dev,
struct page *page,
unsigned long offset,
size_t size,
- enum dma_data_direction dir,
+ enum dma_data_direction direction,
struct dma_attrs *attrs)
{
- BUG_ON(dir == DMA_NONE);
- __dma_sync_page(page, offset, size, dir);
+ BUG_ON(direction == DMA_NONE);
+ __dma_sync_page(page, offset, size, direction);
return page_to_phys(page) + offset + get_dma_direct_offset(dev);
}
@@ -99,6 +117,8 @@ static inline void dma_direct_unmap_page(struct device *dev,
enum dma_data_direction direction,
struct dma_attrs *attrs)
{
+/* There is not necessary to do cache cleanup */
+ /* __dma_sync_page(dma_address, 0 , size, direction); */
}
struct dma_map_ops dma_direct_ops = {