common: bouncebuf: Use dma-mapping for cache ops

This matches how this would be done in Linux and these functions
do the alignment for us which makes the code look cleaner.

Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/common/bouncebuf.c b/common/bouncebuf.c
index 6d98920de6628536babf60b679e1d070a93a8006..93a35668cc29dad6953c447f39d0a67d54f1243f 100644 (file)
--- a/common/bouncebuf.c
+++ b/common/bouncebuf.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <bouncebuf.h>
 #include <asm/cache.h>
+#include <linux/dma-mapping.h>
 
 static int addr_aligned(struct bounce_buffer *state)
 {
@@ -59,9 +60,9 @@ int bounce_buffer_start_extalign(struct bounce_buffer *state, void *data,
         * Flush data to RAM so DMA reads can pick it up,
         * and any CPU writebacks don't race with DMA writes
         */
-       flush_dcache_range((unsigned long)state->bounce_buffer,
-                               (unsigned long)(state->bounce_buffer) +
-                                       state->len_aligned);
+       dma_map_single(state->bounce_buffer,
+                      state->len_aligned,
+                      DMA_BIDIRECTIONAL);
 
        return 0;
 }
@@ -78,9 +79,9 @@ int bounce_buffer_stop(struct bounce_buffer *state)
 {
        if (state->flags & GEN_BB_WRITE) {
                /* Invalidate cache so that CPU can see any newly DMA'd data */
-               invalidate_dcache_range((unsigned long)state->bounce_buffer,
-                                       (unsigned long)(state->bounce_buffer) +
-                                               state->len_aligned);
+               dma_unmap_single((dma_addr_t)state->bounce_buffer,
+                                state->len_aligned,
+                                DMA_BIDIRECTIONAL);
        }
 
        if (state->bounce_buffer == state->user_buffer)