From 88e5dd0fb2adcbc4f7c2362f9cca9b6a0a6083a5 Mon Sep 17 00:00:00 2001 From: "Isaac J. Manjarres" Date: Wed, 16 Oct 2019 23:45:17 -0700 Subject: [PATCH] iommu/arm-smmu: Use existing facilities for I/O Coherent PTWs The SMMU driver currently uses the IO_PGTABLE_QUIRK_NO_DMA quirk to convey to the IO pagetable code that the IOMMU's pagetable walker is IO coherent with the CPUs. Instead, remove the usage of IO_PGTABLE_QUIRK_NO_DMA in the SMMU driver in lieu of the existing coherent_walk variable in the pagetable configuration structure, which conveys the same information. Change-Id: I14308a20d5f85efe4b3f62c71bcbd2a18d0b08a1 Signed-off-by: Isaac J. Manjarres --- drivers/iommu/arm-smmu.c | 4 +--- drivers/iommu/io-pgtable-arm.c | 18 +++++++----------- drivers/iommu/io-pgtable-fast.c | 4 ++-- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 8d66db962474..417fbbdc6633 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -1765,8 +1765,6 @@ static void arm_smmu_domain_get_qcom_quirks(struct arm_smmu_domain *smmu_domain, { if (smmu_domain->attributes & (1ULL << DOMAIN_ATTR_USE_UPSTREAM_HINT)) *quirks |= IO_PGTABLE_QUIRK_QCOM_USE_UPSTREAM_HINT; - if (is_iommu_pt_coherent(smmu_domain)) - *quirks |= IO_PGTABLE_QUIRK_NO_DMA; if (smmu_domain->attributes & (1ULL << DOMAIN_ATTR_USE_LLC_NWA)) *quirks |= IO_PGTABLE_QUIRK_QCOM_USE_LLC_NWA; } @@ -1972,7 +1970,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain, .pgsize_bitmap = smmu->pgsize_bitmap, .ias = ias, .oas = oas, - .coherent_walk = smmu->features & ARM_SMMU_FEAT_COHERENT_WALK, + .coherent_walk = is_iommu_pt_coherent(smmu_domain), .tlb = &smmu_domain->flush_ops->tlb.tlb_ops, .iommu_dev = smmu->dev, }; diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c index 27882ebcbf04..f676bbc3eec3 100644 --- a/drivers/iommu/io-pgtable-arm.c +++ b/drivers/iommu/io-pgtable-arm.c @@ -298,7 +298,7 @@ static inline void pgtable_dma_sync_single_for_device( dma_addr_t addr, size_t size, enum dma_data_direction dir) { - if (!(cfg->quirks & IO_PGTABLE_QUIRK_NO_DMA)) + if (!cfg->coherent_walk) dma_sync_single_for_device(cfg->iommu_dev, addr, size, dir); } @@ -314,7 +314,7 @@ static void *__arm_lpae_alloc_pages(size_t size, gfp_t gfp, if (!pages) return NULL; - if (!(cfg->quirks & IO_PGTABLE_QUIRK_NO_DMA)) { + if (!cfg->coherent_walk) { dma = dma_map_single(dev, pages, size, DMA_TO_DEVICE); if (dma_mapping_error(dev, dma)) goto out_free; @@ -340,7 +340,7 @@ out_free: static void __arm_lpae_free_pages(void *pages, size_t size, struct io_pgtable_cfg *cfg, void *cookie) { - if (!(cfg->quirks & IO_PGTABLE_QUIRK_NO_DMA)) + if (!cfg->coherent_walk) dma_unmap_single(cfg->iommu_dev, __arm_lpae_dma_addr(pages), size, DMA_TO_DEVICE); io_pgtable_free_pages_exact(cfg, cookie, pages, size); @@ -358,7 +358,7 @@ static void __arm_lpae_set_pte(arm_lpae_iopte *ptep, arm_lpae_iopte pte, { *ptep = pte; - if (!(cfg->quirks & IO_PGTABLE_QUIRK_NO_DMA)) + if (!cfg->coherent_walk) __arm_lpae_sync_pte(ptep, cfg); } @@ -436,8 +436,7 @@ static arm_lpae_iopte arm_lpae_install_table(arm_lpae_iopte *table, old = cmpxchg64_relaxed(ptep, curr, new); - if ((cfg->quirks & IO_PGTABLE_QUIRK_NO_DMA) || - (old & ARM_LPAE_PTE_SW_SYNC)) + if (cfg->coherent_walk || (old & ARM_LPAE_PTE_SW_SYNC)) return old; /* Even if it's not ours, there's no point waiting; just kick it */ @@ -526,8 +525,7 @@ static int __arm_lpae_map(struct arm_lpae_io_pgtable *data, unsigned long iova, pte = arm_lpae_install_table(cptep, ptep, 0, cfg, 0); if (pte) __arm_lpae_free_pages(cptep, tblsz, cfg, cookie); - } else if (!(cfg->quirks & IO_PGTABLE_QUIRK_NO_DMA) && - !(pte & ARM_LPAE_PTE_SW_SYNC)) { + } else if (!cfg->coherent_walk && !(pte & ARM_LPAE_PTE_SW_SYNC)) { __arm_lpae_sync_pte(ptep, cfg); } @@ -1129,7 +1127,6 @@ arm_64_lpae_alloc_pgtable_s1(struct io_pgtable_cfg *cfg, void *cookie) struct arm_lpae_io_pgtable *data; if (cfg->quirks & ~(IO_PGTABLE_QUIRK_ARM_NS - | IO_PGTABLE_QUIRK_NO_DMA | IO_PGTABLE_QUIRK_NON_STRICT | IO_PGTABLE_QUIRK_QCOM_USE_UPSTREAM_HINT | IO_PGTABLE_QUIRK_QCOM_USE_LLC_NWA)) @@ -1140,7 +1137,7 @@ arm_64_lpae_alloc_pgtable_s1(struct io_pgtable_cfg *cfg, void *cookie) return NULL; /* TCR */ - if (cfg->quirks & IO_PGTABLE_QUIRK_NO_DMA) + if (cfg->coherent_walk) reg = (ARM_LPAE_TCR_SH_OS << ARM_LPAE_TCR_SH0_SHIFT) | (ARM_LPAE_TCR_RGN_WBWA << ARM_LPAE_TCR_IRGN0_SHIFT) | (ARM_LPAE_TCR_RGN_WBWA << ARM_LPAE_TCR_ORGN0_SHIFT); @@ -1740,7 +1737,6 @@ static int __init arm_lpae_do_selftests(void) struct io_pgtable_cfg cfg = { .tlb = &dummy_tlb_ops, .oas = 48, - .quirks = IO_PGTABLE_QUIRK_NO_DMA, .coherent_walk = true, }; diff --git a/drivers/iommu/io-pgtable-fast.c b/drivers/iommu/io-pgtable-fast.c index 9386cdcd57e8..ca7b7a7b598a 100644 --- a/drivers/iommu/io-pgtable-fast.c +++ b/drivers/iommu/io-pgtable-fast.c @@ -182,7 +182,7 @@ static void av8l_clean_range(struct io_pgtable_ops *ops, { struct io_pgtable *iop = iof_pgtable_ops_to_pgtable(ops); - if (!(iop->cfg.quirks & IO_PGTABLE_QUIRK_NO_DMA)) + if (!iop->cfg.coherent_walk) __av8l_clean_range(iop->cfg.iommu_dev, start, end); } @@ -549,7 +549,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->quirks & IO_PGTABLE_QUIRK_NO_DMA) + else if (cfg->coherent_walk) 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);