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

Commit 8e685744 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 485feff5 7b6859cf

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;

}