[PATCH] ARM: fix highmem with VIPT cache and DMA

[saeed bishara]

thanks. attached fixed version.

On Mon, Apr 12, 2010 at 6:36 PM, Nicolas Pitre <nico at fluxnic.net> wrote:
> On Mon, 12 Apr 2010, saeed bishara wrote:
>
>> Nico, thanks for the patch.
>> I've ported it for 2.6.32.9 kernel, can you have a look at the
>> attached patch?
>
> That patch is bad.
>
> |diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
> |index b9590a7..5286d71 100644
> |--- a/arch/arm/mm/dma-mapping.c
> |+++ b/arch/arm/mm/dma-mapping.c
> |@@ -602,6 +602,11 @@ static void dma_cache_maint_contiguous(struct page *page, unsigned long offset,
> |                       vaddr += offset;
> |                       inner_op(vaddr, vaddr + size);
> |                       kunmap_high(page);
> |+              } else if (cache_is_vipt()) {
> |+                      pte_t saved_pte;
> |+                      vaddr = kmap_high_l1_vipt(page, &saved_pte);
> |+                      inner_op(vaddr, vaddr + size);
> |+                      kunmap_high_l1_vipt(page, saved_pte);
> |               }
> |       }
>
> You should add 'offset' to 'vaddr' before passing it to inner_op(), just
> like it is done 6 lines above it.
>
> Also you left out the addition of the unconditional flush in
> v6_copy_user_highpage_nonaliasing() which is needed now that
> kunmap_atomic() doesn't flush the cache anymore on ARMv6.
>
>
> Nicolas
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-ARM-fix-highmem-with-VIPT-cache-and-DMA.patch
Type: text/x-patch
Size: 9460 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100413/aeab5cb4/attachment.bin>