Merge "iommu/io-pgtable-arm: Use outer shareable for all configurations" into msm-4.8 (6a6bdfec) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/iommu/io-pgtable-arm.c

+4 −6

Original line number	Diff line number	Diff line
		@@ -358,7 +358,7 @@ static int arm_lpae_init_pte(struct arm_lpae_io_pgtable *data,
		else
		pte \|= ARM_LPAE_PTE_TYPE_BLOCK;

		pte \|= ARM_LPAE_PTE_AF \| ARM_LPAE_PTE_SH_IS;
		pte \|= ARM_LPAE_PTE_AF \| ARM_LPAE_PTE_SH_OS;
		pte \|= pfn_to_iopte(paddr >> data->pg_shift, data);

		if (flush)
		@@ -477,14 +477,12 @@ static arm_lpae_iopte arm_lpae_prot_to_pte(struct arm_lpae_io_pgtable *data,
		pte \|= (prot & IOMMU_PRIV) ? ARM_LPAE_PTE_AP_PRIV_RO
		: ARM_LPAE_PTE_AP_RO;

		if (prot & IOMMU_MMIO) {
		if (prot & IOMMU_MMIO)
		pte \|= (ARM_LPAE_MAIR_ATTR_IDX_DEV
		<< ARM_LPAE_PTE_ATTRINDX_SHIFT);
		} else if (prot & IOMMU_CACHE) {
		else if (prot & IOMMU_CACHE)
		pte \|= (ARM_LPAE_MAIR_ATTR_IDX_CACHE
		<< ARM_LPAE_PTE_ATTRINDX_SHIFT);
		pte \|= ARM_LPAE_PTE_SH_OS;
		}
		} else {
		pte = ARM_LPAE_PTE_HAP_FAULT;
		if (prot & IOMMU_READ)
		@@ -936,7 +934,7 @@ arm_64_lpae_alloc_pgtable_s1(struct io_pgtable_cfg cfg, void cookie)
		(ARM_LPAE_TCR_RGN_WBWA << ARM_LPAE_TCR_IRGN0_SHIFT) \|
		(ARM_LPAE_TCR_RGN_WBWA << ARM_LPAE_TCR_ORGN0_SHIFT);
		else
		reg = (ARM_LPAE_TCR_SH_IS << ARM_LPAE_TCR_SH0_SHIFT) \|
		reg = (ARM_LPAE_TCR_SH_OS << ARM_LPAE_TCR_SH0_SHIFT) \|
		(ARM_LPAE_TCR_RGN_NC << ARM_LPAE_TCR_IRGN0_SHIFT) \|
		(ARM_LPAE_TCR_RGN_NC << ARM_LPAE_TCR_ORGN0_SHIFT);