evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "arm64: dma-mapping: optimize unmap coherency check"

Browse source
This commit is contained in:
Linux Build Service Account 2017-03-10 02:07:10 -08:00 • committed by Gerrit - the friendly Code Review server
commit c03b5c2d1c
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Documentation/DMA-attributes.txt
View file

@ -132,6 +132,11 @@ DMA_ATTR_FORCE_COHERENT
When passed to a DMA map call the DMA_ATTR_FORCE_COHERENT DMA When passed to a DMA map call the DMA_ATTR_FORCE_COHERENT DMA
attribute can be used to force a buffer to be mapped as IO coherent. attribute can be used to force a buffer to be mapped as IO coherent.
When the DMA_ATTR_FORCE_COHERENT attribute is set during a map call ensure
that it is also set during for the matching unmap call to ensure that the
correct cache maintenance is carried out.
This DMA attribute is only currently supported for arm64 stage 1 IOMMU This DMA attribute is only currently supported for arm64 stage 1 IOMMU
mappings. mappings.
@ -143,5 +148,9 @@ coherent.
The DMA_ATTR_FORCE_NON_COHERENT DMA attribute overrides the buffer IO The DMA_ATTR_FORCE_NON_COHERENT DMA attribute overrides the buffer IO
coherency configuration set by making the device IO coherent. coherency configuration set by making the device IO coherent.
When the DMA_ATTR_FORCE_NON_COHERENT attribute is set during a map call
ensure that it is also set during for the matching unmap call to ensure
that the correct cache maintenance is carried out.
This DMA attribute is only currently supported for arm64 stage 1 IOMMU This DMA attribute is only currently supported for arm64 stage 1 IOMMU
mappings. mappings.

4
arch/arm64/mm/dma-mapping.c
View file

@ -1821,10 +1821,8 @@ static void arm_iommu_unmap_page(struct device *dev, dma_addr_t handle,
mapping->domain, iova)); mapping->domain, iova));
int offset = handle & ~PAGE_MASK; int offset = handle & ~PAGE_MASK;
int len = PAGE_ALIGN(size + offset); int len = PAGE_ALIGN(size + offset);
bool iova_coherent = iommu_is_iova_coherent(mapping->domain,
handle);
if (!(iova_coherent || if (!(is_dma_coherent(dev, attrs) ||
dma_get_attr(DMA_ATTR_SKIP_CPU_SYNC, attrs))) dma_get_attr(DMA_ATTR_SKIP_CPU_SYNC, attrs)))
__dma_page_dev_to_cpu(page, offset, size, dir); __dma_page_dev_to_cpu(page, offset, size, dir);