diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-14 18:36:41 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-14 18:36:41 +0100 |
| commit | eb6cf9f8cb9dfacf6679f9d6c72aaf568a027edf (patch) | |
| tree | 550279bd510217fb2d5979c47afed75bf817e172 | |
| parent | Merge tag 'powerpc-4.20-4' of git://git.kernel.org/pub/scm/linux/kernel/git/p... (diff) | |
| parent | arm64: dma-mapping: Fix FORCE_CONTIGUOUS buffer clearing (diff) | |
| download | linux-eb6cf9f8cb9dfacf6679f9d6c72aaf568a027edf.tar.xz linux-eb6cf9f8cb9dfacf6679f9d6c72aaf568a027edf.zip | |
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fix from Catalin Marinas:
"Invalidate the caches before clearing the DMA buffer via the
non-cacheable alias in the FORCE_CONTIGUOUS case"
* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
arm64: dma-mapping: Fix FORCE_CONTIGUOUS buffer clearing
| -rw-r--r-- | arch/arm64/mm/dma-mapping.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index a3ac26284845..a53704406099 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c @@ -429,9 +429,9 @@ static void *__iommu_alloc_attrs(struct device *dev, size_t size, prot, __builtin_return_address(0)); if (addr) { - memset(addr, 0, size); if (!coherent) __dma_flush_area(page_to_virt(page), iosize); + memset(addr, 0, size); } else { iommu_dma_unmap_page(dev, *handle, iosize, 0, attrs); dma_release_from_contiguous(dev, page, |