iommu/io-pgtable-fast: Set page table coherency
Currently the coherency of an iommu's page table is
dictated by the coherency of the iommu device.
Support being able to configure iommu page tables as
being coherent or not.
Change-Id: If443165cf1baf5296d6f07ddac5aa248efc8cb14
Signed-off-by: Liam Mark <lmark@codeaurora.org>
Signed-off-by: Patrick Daly <pdaly@codeaurora.org>
diff --git a/drivers/iommu/io-pgtable-fast.c b/drivers/iommu/io-pgtable-fast.c
index 6a6ee40..85fe317 100644
--- a/drivers/iommu/io-pgtable-fast.c
+++ b/drivers/iommu/io-pgtable-fast.c
@@ -437,7 +437,7 @@
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 @@
av8l_fast_iopte *pmds;
cfg = (struct io_pgtable_cfg) {
+ .quirks = 0,
.tlb = &dummy_tlb_ops,
.ias = 32,
.oas = 32,