Commit 7b6859cf authored Jun 29, 2015 by Matt Wagantall

arm64: dma-mapping: fix attribs for non-coherent strongly-ordered mappings



An incorrect conflict resolution when picking up 07c17f4e ("arm64:
add support for NO_KERNEL_MAPPING and STRONGLY_ORDERED") caused
MT_NORMAL_NC attributes being set for strongly-ordered mappings, rather
than MT_DEVICE_nGnRnE attributes.

As a result of this, speculative data fetches of the incorrectly-
mapped memory have been observed. In cases where this memory is
XPU protected or reads result in side-effects, this may result in
device crashes.

Fix this by setting the attributes returned by pgprot_noncached()
regardless of the value of the coherent flag passed to
__get_dma_pgprot()

Change-Id: Iec56027e280ae0920016df3066045b71299a915b
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>

parent fb120d64

arch/arm64/mm/dma-mapping.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -41,10 +41,10 @@ EXPORT_SYMBOL(dma_ops);
		static pgprot_t __get_dma_pgprot(struct dma_attrs *attrs, pgprot_t prot,
		bool coherent)
		{
		if (!coherent \|\| dma_get_attr(DMA_ATTR_WRITE_COMBINE, attrs))
		return pgprot_writecombine(prot);
		else if (dma_get_attr(DMA_ATTR_STRONGLY_ORDERED, attrs))
		if (dma_get_attr(DMA_ATTR_STRONGLY_ORDERED, attrs))
		return pgprot_noncached(prot);
		else if (!coherent \|\| dma_get_attr(DMA_ATTR_WRITE_COMBINE, attrs))
		return pgprot_writecombine(prot);
		return prot;
		}