ARM: 6187/1: The v6_dma_inv_range() function must preserve data on SMP

A recent patch for DMA cache maintenance on ARM11MPCore added a write
for ownership trick to the v6_dma_inv_range() function. Such operation
destroys data already present in the buffer. However, this function is
used with with dma_sync_single_for_device() which is supposed to
preserve the existing data transfered into the buffer. This patch adds a
combination of read/write for ownership to preserve the original data.

Reported-by: Ronen Shitrit <rshitrit@marvell.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Catalin Marinas 2010-06-21 15:09:36 +01:00 коммит произвёл Russell King
Родитель a5e9d38b22
Коммит ca57926d53
1 изменённых файлов: 2 добавлений и 1 удалений

Просмотреть файл

@ -212,7 +212,8 @@ v6_dma_inv_range:
#endif #endif
1: 1:
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
str r0, [r0] @ write for ownership ldr r2, [r0] @ read for ownership
str r2, [r0] @ write for ownership
#endif #endif
#ifdef HARVARD_CACHE #ifdef HARVARD_CACHE
mcr p15, 0, r0, c7, c6, 1 @ invalidate D line mcr p15, 0, r0, c7, c6, 1 @ invalidate D line