diff options
| author | Marek Szyprowski <m.szyprowski@samsung.com> | 2017-03-20 10:17:56 +0100 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2017-03-22 15:50:32 +0100 |
| commit | 7d2aa6b814476a2e2794960f844344519246df72 (patch) | |
| tree | 5a045bfc23009afcb7fcd3e8fa750979ef8caddc /drivers/iommu | |
| parent | iommu/vt-d: Fix NULL pointer dereference in device_to_iommu (diff) | |
| download | linux-7d2aa6b814476a2e2794960f844344519246df72.tar.xz linux-7d2aa6b814476a2e2794960f844344519246df72.zip | |
iommu/exynos: Block SYSMMU while invalidating FLPD cache
Documentation specifies that SYSMMU should be in blocked state while
performing TLB/FLPD cache invalidation, so add needed calls to
sysmmu_block/unblock.
Fixes: 66a7ed84b345d ("iommu/exynos: Apply workaround of caching fault page table entries")
CC: stable@vger.kernel.org # v4.10+
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/exynos-iommu.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c index a7e0821c9967..32d43f1994e4 100644 --- a/drivers/iommu/exynos-iommu.c +++ b/drivers/iommu/exynos-iommu.c @@ -512,7 +512,10 @@ static void sysmmu_tlb_invalidate_flpdcache(struct sysmmu_drvdata *data, spin_lock_irqsave(&data->lock, flags); if (data->active && data->version >= MAKE_MMU_VER(3, 3)) { clk_enable(data->clk_master); - __sysmmu_tlb_invalidate_entry(data, iova, 1); + if (sysmmu_block(data)) { + __sysmmu_tlb_invalidate_entry(data, iova, 1); + sysmmu_unblock(data); + } clk_disable(data->clk_master); } spin_unlock_irqrestore(&data->lock, flags); |