aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaura Abbott <lauraa@codeaurora.org>2014-07-17 16:00:33 -0700
committerSrinivas Kandagatla <srinivas.kandagatla@linaro.org>2015-10-16 14:06:59 +0100
commit2c07d45b4925c737816314afe561122d552924eb (patch)
tree956b80ff4549911eaf40192e1e629fbabcfa5e44
parentbbd73941d1364d0ff5282f0f79b8d686f9d04ce3 (diff)
arm64: Add support for DMA_ATTR_STRONGLY_ORDERED
Strongly ordered memory prevents speculative accesses among other features. Add support for this attribute in arm64. Change-Id: If26459f63edfea3108ad7426e29f98c23b1a07ef Signed-off-by: Laura Abbott <lauraa@codeaurora.org> Conflicts: arch/arm64/mm/dma-mapping.c Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
-rw-r--r--arch/arm64/mm/dma-mapping.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
index 99224dcebdc5..1f18fd686789 100644
--- a/arch/arm64/mm/dma-mapping.c
+++ b/arch/arm64/mm/dma-mapping.c
@@ -36,6 +36,8 @@ static pgprot_t __get_dma_pgprot(struct dma_attrs *attrs, pgprot_t prot,
{
if (!coherent || dma_get_attr(DMA_ATTR_WRITE_COMBINE, attrs))
return pgprot_writecombine(prot);
+ else if (dma_get_attr(DMA_ATTR_STRONGLY_ORDERED, attrs))
+ prot = pgprot_noncached(prot);
return prot;
}