提交 04c532a1 编写于 作者: R Ralf Goebel 提交者: Joerg Roedel

iommu/omap: Fix cache flushes on L2 table entries

The base address used for DMA operations on the second-level table
did incorrectly include the offset for the table entry. The offset
was then added again which lead to incorrect behavior.

Operations on the L1 table are not affected.

The calculation of the base address is changed to point to the
beginning of the L2 table.

Fixes: bfee0cf0 ("iommu/omap: Use DMA-API for performing cache flushes")
Acked-by: NSuman Anna <s-anna@ti.com>
Signed-off-by: NRalf Goebel <ralf.goebel@imago-technologies.com>
Signed-off-by: NJoerg Roedel <jroedel@suse.de>
上级 1ffaddd0
...@@ -550,7 +550,7 @@ static u32 *iopte_alloc(struct omap_iommu *obj, u32 *iopgd, ...@@ -550,7 +550,7 @@ static u32 *iopte_alloc(struct omap_iommu *obj, u32 *iopgd,
pte_ready: pte_ready:
iopte = iopte_offset(iopgd, da); iopte = iopte_offset(iopgd, da);
*pt_dma = virt_to_phys(iopte); *pt_dma = iopgd_page_paddr(iopgd);
dev_vdbg(obj->dev, dev_vdbg(obj->dev,
"%s: da:%08x pgd:%p *pgd:%08x pte:%p *pte:%08x\n", "%s: da:%08x pgd:%p *pgd:%08x pte:%p *pte:%08x\n",
__func__, da, iopgd, *iopgd, iopte, *iopte); __func__, da, iopgd, *iopgd, iopte, *iopte);
...@@ -738,7 +738,7 @@ static size_t iopgtable_clear_entry_core(struct omap_iommu *obj, u32 da) ...@@ -738,7 +738,7 @@ static size_t iopgtable_clear_entry_core(struct omap_iommu *obj, u32 da)
} }
bytes *= nent; bytes *= nent;
memset(iopte, 0, nent * sizeof(*iopte)); memset(iopte, 0, nent * sizeof(*iopte));
pt_dma = virt_to_phys(iopte); pt_dma = iopgd_page_paddr(iopgd);
flush_iopte_range(obj->dev, pt_dma, pt_offset, nent); flush_iopte_range(obj->dev, pt_dma, pt_offset, nent);
/* /*
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册