diff options
| author | Joerg Roedel <jroedel@suse.de> | 2017-03-22 23:59:56 +0100 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2017-03-22 23:59:56 +0100 |
| commit | 11cd3386a1987a0515d7ce11ee87b242e5015dfe (patch) | |
| tree | a8f3db18956402e64722af7ccd31851f4f0dac10 /drivers/iommu | |
| parent | 9d3a4de4cb8db8e71730e36736272ef041836f68 (diff) | |
| parent | a03849e7210277fa212779b7cd9c30e1ab6194b2 (diff) | |
| download | linux-11cd3386a1987a0515d7ce11ee87b242e5015dfe.tar.gz linux-11cd3386a1987a0515d7ce11ee87b242e5015dfe.tar.bz2 linux-11cd3386a1987a0515d7ce11ee87b242e5015dfe.zip | |
Merge branch 'for-joerg/arm-smmu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into iommu/fixes
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/io-pgtable-arm-v7s.c | 6 | ||||
| -rw-r--r-- | drivers/iommu/io-pgtable-arm.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c index 1c049e2e12bf..8d6ca28c3e1f 100644 --- a/drivers/iommu/io-pgtable-arm-v7s.c +++ b/drivers/iommu/io-pgtable-arm-v7s.c @@ -422,8 +422,12 @@ static int __arm_v7s_map(struct arm_v7s_io_pgtable *data, unsigned long iova, pte |= ARM_V7S_ATTR_NS_TABLE; __arm_v7s_set_pte(ptep, pte, 1, cfg); - } else { + } else if (ARM_V7S_PTE_IS_TABLE(pte, lvl)) { cptep = iopte_deref(pte, lvl); + } else { + /* We require an unmap first */ + WARN_ON(!selftest_running); + return -EEXIST; } /* Rinse, repeat */ diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c index feacc54bec68..f9bc6ebb8140 100644 --- a/drivers/iommu/io-pgtable-arm.c +++ b/drivers/iommu/io-pgtable-arm.c @@ -335,8 +335,12 @@ static int __arm_lpae_map(struct arm_lpae_io_pgtable *data, unsigned long iova, if (cfg->quirks & IO_PGTABLE_QUIRK_ARM_NS) pte |= ARM_LPAE_PTE_NSTABLE; __arm_lpae_set_pte(ptep, pte, cfg); - } else { + } else if (!iopte_leaf(pte, lvl)) { cptep = iopte_deref(pte, data); + } else { + /* We require an unmap first */ + WARN_ON(!selftest_running); + return -EEXIST; } /* Rinse, repeat */ |