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

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

Merge "iommu/io-pgtable-fast: Configure to use outer shareable" into msm-4.9

parents 01a11b7c 741eee5b

drivers/iommu/io-pgtable-fast.c

+2 −2
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ int av8l_fast_map_public(av8l_fast_iopte *ptep, phys_addr_t paddr, size_t size, 
		| AV8L_FAST_PTE_TYPE_PAGE

		| AV8L_FAST_PTE_AF

		| AV8L_FAST_PTE_nG

		| AV8L_FAST_PTE_SH_IS;

		| AV8L_FAST_PTE_SH_OS;



	if (prot & IOMMU_MMIO)

		pte |= (AV8L_FAST_MAIR_ATTR_IDX_DEV
@@ -442,7 +442,7 @@ av8l_fast_alloc_pgtable(struct io_pgtable_cfg *cfg, void *cookie) 
			(AV8L_FAST_TCR_RGN_WBWA << AV8L_FAST_TCR_IRGN0_SHIFT) |

			(AV8L_FAST_TCR_RGN_WBWA << AV8L_FAST_TCR_ORGN0_SHIFT);

	else

		reg = (AV8L_FAST_TCR_SH_IS << AV8L_FAST_TCR_SH0_SHIFT) |

		reg = (AV8L_FAST_TCR_SH_OS << AV8L_FAST_TCR_SH0_SHIFT) |

			(AV8L_FAST_TCR_RGN_NC << AV8L_FAST_TCR_IRGN0_SHIFT) |

			(AV8L_FAST_TCR_RGN_NC << AV8L_FAST_TCR_ORGN0_SHIFT);