Skip to content

Commit 15672b6

Browse files
YongWu-HFjoergroedel
authored andcommitted
iommu/mediatek: Add tlb_lock in tlb_flush_all
The tlb_flush_all touches the registers controlling tlb operations. Protect it with the tlb_lock spinlock. This also require the range_sync func to release that spinlock before calling tlb_flush_all. Signed-off-by: Yong Wu <yong.wu@mediatek.com> [refactor commit log] Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Link: https://lore.kernel.org/r/20211208120744.2415-5-dafna.hirschfeld@collabora.com Signed-off-by: Joerg Roedel <jroedel@suse.de>
1 parent ad5042e commit 15672b6

1 file changed

Lines changed: 9 additions & 3 deletions

File tree

drivers/iommu/mtk_iommu.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,10 +210,14 @@ static struct mtk_iommu_domain *to_mtk_domain(struct iommu_domain *dom)
210210

211211
static void mtk_iommu_tlb_flush_all(struct mtk_iommu_data *data)
212212
{
213+
unsigned long flags;
214+
215+
spin_lock_irqsave(&data->tlb_lock, flags);
213216
writel_relaxed(F_INVLD_EN1 | F_INVLD_EN0,
214217
data->base + data->plat_data->inv_sel_reg);
215218
writel_relaxed(F_ALL_INVLD, data->base + REG_MMU_INVALIDATE);
216219
wmb(); /* Make sure the tlb flush all done */
220+
spin_unlock_irqrestore(&data->tlb_lock, flags);
217221
}
218222

219223
static void mtk_iommu_tlb_flush_range_sync(unsigned long iova, size_t size,
@@ -242,14 +246,16 @@ static void mtk_iommu_tlb_flush_range_sync(unsigned long iova, size_t size,
242246
/* tlb sync */
243247
ret = readl_poll_timeout_atomic(data->base + REG_MMU_CPE_DONE,
244248
tmp, tmp != 0, 10, 1000);
249+
250+
/* Clear the CPE status */
251+
writel_relaxed(0, data->base + REG_MMU_CPE_DONE);
252+
spin_unlock_irqrestore(&data->tlb_lock, flags);
253+
245254
if (ret) {
246255
dev_warn(data->dev,
247256
"Partial TLB flush timed out, falling back to full flush\n");
248257
mtk_iommu_tlb_flush_all(data);
249258
}
250-
/* Clear the CPE status */
251-
writel_relaxed(0, data->base + REG_MMU_CPE_DONE);
252-
spin_unlock_irqrestore(&data->tlb_lock, flags);
253259

254260
pm_runtime_put(data->dev);
255261
}

0 commit comments

Comments
 (0)