shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 19:08:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

ANDROID: arm64: Fix merge issue with __dma_map_area

Browse Source 
The LTS merge conflict was not handled properly for the upstream commit
c50f11c619 ("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: 8d0a39b476 ("Merge 5.10.125 into android13-5.10-lts")
Signed-off-by: Will McVicker <willmcvicker@google.com>
Change-Id: I16de2aa4c58e2984b4436f7ea55b4302b9882827
This commit is contained in:
Will McVicker
2022-09-19 19:22:55 +00:00
committed by William McVicker
parent 629d390e29
commit a9e0c3b023
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm64/mm/cache.S
View File

@@ -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)