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

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

Merge "iommu/io-pgtable-fast: Set page table coherency" into msm-4.9

parents 6f968032 1350925c

drivers/iommu/io-pgtable-fast.c

+2 −1
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ av8l_fast_alloc_pgtable(struct io_pgtable_cfg *cfg, void *cookie) 
		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_WBWA << AV8L_FAST_TCR_ORGN0_SHIFT);

	else if (cfg->iommu_dev && cfg->iommu_dev->archdata.dma_coherent)

	else if (cfg->quirks & IO_PGTABLE_QUIRK_PAGE_TABLE_COHERENT)

		reg = (AV8L_FAST_TCR_SH_OS << AV8L_FAST_TCR_SH0_SHIFT) |

			(AV8L_FAST_TCR_RGN_WBWA << AV8L_FAST_TCR_IRGN0_SHIFT) |

			(AV8L_FAST_TCR_RGN_WBWA << AV8L_FAST_TCR_ORGN0_SHIFT);
@@ -583,6 +583,7 @@ static int __init av8l_fast_positive_testing(void) 
	av8l_fast_iopte *pmds;



	cfg = (struct io_pgtable_cfg) {

		.quirks = 0,

		.tlb = &dummy_tlb_ops,

		.ias = 32,

		.oas = 32,