ARM: 6111/1: Implement read/write for ownership in the ARMv6 DMA cache ops

[safe/jmp/linux-2.6] / arch / arm / mm / cache-v6.S

diff --git a/arch/arm/mm/cache-v6.S b/arch/arm/mm/cache-v6.S
index 6f926dd..e46ecd8 100644 (file)
--- a/arch/arm/mm/cache-v6.S
+++ b/arch/arm/mm/cache-v6.S
@@ -195,7 +195,7 @@ ENTRY(v6_flush_kern_dcache_area)
  *     - start   - virtual start address of region
  *     - end     - virtual end address of region
  */
-ENTRY(v6_dma_inv_range)
+v6_dma_inv_range:
        tst     r0, #D_CACHE_LINE_SIZE - 1
        bic     r0, r0, #D_CACHE_LINE_SIZE - 1
 #ifdef HARVARD_CACHE
@@ -211,6 +211,9 @@ ENTRY(v6_dma_inv_range)
        mcrne   p15, 0, r1, c7, c15, 1          @ clean & invalidate unified line
 #endif
 1:
+#ifdef CONFIG_SMP
+       str     r0, [r0]                        @ write for ownership
+#endif
 #ifdef HARVARD_CACHE
        mcr     p15, 0, r0, c7, c6, 1           @ invalidate D line
 #else
@@ -228,9 +231,12 @@ ENTRY(v6_dma_inv_range)
  *     - start   - virtual start address of region
  *     - end     - virtual end address of region
  */
-ENTRY(v6_dma_clean_range)
+v6_dma_clean_range:
        bic     r0, r0, #D_CACHE_LINE_SIZE - 1
 1:
+#ifdef CONFIG_SMP
+       ldr     r2, [r0]                        @ read for ownership
+#endif
 #ifdef HARVARD_CACHE
        mcr     p15, 0, r0, c7, c10, 1          @ clean D line
 #else
@@ -251,6 +257,10 @@ ENTRY(v6_dma_clean_range)
 ENTRY(v6_dma_flush_range)
        bic     r0, r0, #D_CACHE_LINE_SIZE - 1
 1:
+#ifdef CONFIG_SMP
+       ldr     r2, [r0]                        @ read for ownership
+       str     r2, [r0]                        @ write for ownership
+#endif
 #ifdef HARVARD_CACHE
        mcr     p15, 0, r0, c7, c14, 1          @ clean & invalidate D line
 #else
@@ -271,9 +281,10 @@ ENTRY(v6_dma_flush_range)
  */
 ENTRY(v6_dma_map_area)
        add     r1, r1, r0
-       cmp     r2, #DMA_TO_DEVICE
+       teq     r2, #DMA_FROM_DEVICE
+       beq     v6_dma_inv_range
+       teq     r2, #DMA_TO_DEVICE
        beq     v6_dma_clean_range
-       bcs     v6_dma_inv_range
        b       v6_dma_flush_range
 ENDPROC(v6_dma_map_area)
 
@@ -299,7 +310,5 @@ ENTRY(v6_cache_fns)
        .long   v6_flush_kern_dcache_area
        .long   v6_dma_map_area
        .long   v6_dma_unmap_area
-       .long   v6_dma_inv_range
-       .long   v6_dma_clean_range
        .long   v6_dma_flush_range
        .size   v6_cache_fns, . - v6_cache_fns