diff options
| author | Joerg Roedel <jroedel@suse.de> | 2019-07-01 14:44:41 +0300 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2019-07-01 14:44:41 +0300 |
| commit | 39debdc1d7e615863b66e5e8c612e4f0e78b1e1b (patch) | |
| tree | 4a5a7e5b64524e88e73d19e4a96dc1cfecf8e967 /drivers/iommu/arm-smmu.c | |
| parent | 6fbc7275c7a9ba97877050335f290341a1fd8dbf (diff) | |
| parent | 9e6ea59f3ff37192fd7aec7821dca6ece629b7d0 (diff) | |
| download | linux-39debdc1d7e615863b66e5e8c612e4f0e78b1e1b.tar.xz | |
Merge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into arm/smmu
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 586dd5a46d9f..653b6b3dcafb 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -892,13 +892,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; |