diff options
| author | Will Deacon <will@kernel.org> | 2019-06-25 12:51:25 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2019-06-25 12:51:25 +0100 |
| commit | 4f41845b340783eaec9cc2840fe3cb9a00574054 (patch) | |
| tree | 76d23e87a97d2dade1c3e8e2483e935b4af23bec /drivers/iommu/arm-smmu.c | |
| parent | 90ec7a76cc4ba65bfedeb8621cba09cd5a317d8f (diff) | |
| download | blackbird-op-linux-4f41845b340783eaec9cc2840fe3cb9a00574054.tar.gz blackbird-op-linux-4f41845b340783eaec9cc2840fe3cb9a00574054.zip | |
iommu/io-pgtable: Replace IO_PGTABLE_QUIRK_NO_DMA with specific flag
IO_PGTABLE_QUIRK_NO_DMA is a bit of a misnomer, since it's really just
an indication of whether or not the page-table walker for the IOMMU is
coherent with the CPU caches. Since cache coherency is more than just a
quirk, replace the flag with its own field in the io_pgtable_cfg
structure.
Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'drivers/iommu/arm-smmu.c')
| -rw-r--r-- | drivers/iommu/arm-smmu.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 5e54cc0a28b3..009156bb6d42 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -895,13 +895,11 @@ 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, .tlb = smmu_domain->tlb_ops, .iommu_dev = smmu->dev, }; - if (smmu->features & ARM_SMMU_FEAT_COHERENT_WALK) - pgtbl_cfg.quirks = IO_PGTABLE_QUIRK_NO_DMA; - if (smmu_domain->non_strict) pgtbl_cfg.quirks |= IO_PGTABLE_QUIRK_NON_STRICT; |
