Commit eb6cf9f8 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 4645453c 3238c359
...@@ -429,9 +429,9 @@ static void *__iommu_alloc_attrs(struct device *dev, size_t size, ...@@ -429,9 +429,9 @@ static void *__iommu_alloc_attrs(struct device *dev, size_t size,
prot, prot,
__builtin_return_address(0)); __builtin_return_address(0));
if (addr) { if (addr) {
memset(addr, 0, size);
if (!coherent) if (!coherent)
__dma_flush_area(page_to_virt(page), iosize); __dma_flush_area(page_to_virt(page), iosize);
memset(addr, 0, size);
} else { } else {
iommu_dma_unmap_page(dev, *handle, iosize, 0, attrs); iommu_dma_unmap_page(dev, *handle, iosize, 0, attrs);
dma_release_from_contiguous(dev, page, dma_release_from_contiguous(dev, page,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment