1 files changed, 17 insertions, 3 deletions

diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index ef3e0f3aac96..c038ec0738ac 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -880,10 +880,24 @@ static void __dma_page_dev_to_cpu(struct page *page, unsigned long off,
         dma_cache_maint_page(page, off, size, dir, dmac_unmap_area);
 
         /*
-         * Mark the D-cache clean for this page to avoid extra flushing.
+         * Mark the D-cache clean for these pages to avoid extra flushing.
          */
-        if (dir != DMA_TO_DEVICE && off == 0 && size >= PAGE_SIZE)
-                set_bit(PG_dcache_clean, &page->flags);
+        if (dir != DMA_TO_DEVICE && size >= PAGE_SIZE) {
+                unsigned long pfn;
+                size_t left = size;
+
+                pfn = page_to_pfn(page) + off / PAGE_SIZE;
+                off %= PAGE_SIZE;
+                if (off) {
+                        pfn++;
+                        left -= PAGE_SIZE - off;
+                }
+                while (left >= PAGE_SIZE) {
+                        page = pfn_to_page(pfn++);
+                        set_bit(PG_dcache_clean, &page->flags);
+                        left -= PAGE_SIZE;
+                }
+        }
 }
 
 /**