Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5924fee6 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "dma-mapping: Introduce DMA_ATTR_IOMMU_USE_UPSTREAM_HINT" into msm-4.8

parents 8b4ba111 827325a0

Documentation/DMA-attributes.txt

+7 −0
Original line number Diff line number Diff line
@@ -169,3 +169,10 @@ DMA_ATTR_EXEC_MAPPING 
By default, the DMA mappings are non-executable. Some use cases might require

an executable mapping. This attribute can be used to indicate to the DMA

subsystem to create an executable mappings for the buffer.



DMA_ATTR_IOMMU_USE_UPSTREAM_HINT

--------------------------------



DMA_ATTR_IOMMU_USE_UPSTREAM_HINT: Normally an smmu will override any bus

attributes (i.e cacheablilty) provided by the client device. Some hardware

may be designed to use the original attributes instead.

include/linux/dma-mapping.h

+6 −0
Original line number Diff line number Diff line
@@ -81,6 +81,12 @@ 
 * DMA_ATTR_EXEC_MAPPING: The mapping has executable permissions.

 */

#define DMA_ATTR_EXEC_MAPPING		(1UL << 12)

/*

 * DMA_ATTR_IOMMU_USE_UPSTREAM_HINT: Normally an smmu will override any bus

 * attributes (i.e cacheablilty) provided by the client device. Some hardware

 * may be designed to use the original attributes instead.

 */

#define DMA_ATTR_IOMMU_USE_UPSTREAM_HINT	(1UL << 13)



/*

 * A dma_addr_t can hold any valid DMA or bus address for the platform.