From a9e0c3b023e8f2375b538676b68ec412fdd0a23b Mon Sep 17 00:00:00 2001 From: Will McVicker Date: Mon, 19 Sep 2022 19:22:55 +0000 Subject: [PATCH] ANDROID: arm64: Fix merge issue with __dma_map_area The LTS merge conflict was not handled properly for the upstream commit c50f11c6196f ("arm64: mm: Don't invalidate FROM_DEVICE buffers at start of DMA transfer") which led to device corruption. Fix __dma_map_area() to include the initial add. Fixes: 8d0a39b47670 ("Merge 5.10.125 into android13-5.10-lts") Signed-off-by: Will McVicker Change-Id: I16de2aa4c58e2984b4436f7ea55b4302b9882827 --- arch/arm64/mm/cache.S | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/mm/cache.S b/arch/arm64/mm/cache.S index 5d0c3c94b996..0d8f5351b755 100644 --- a/arch/arm64/mm/cache.S +++ b/arch/arm64/mm/cache.S @@ -230,6 +230,7 @@ SYM_FUNC_END_PI(__dma_flush_area) * - dir - DMA direction */ SYM_FUNC_START_PI(__dma_map_area) + add x1, x0, x1 b __dma_clean_area SYM_FUNC_END_PI(__dma_map_area)