提交 c2372aaf 编写于 作者: S Suman Anna 提交者: Joerg Roedel

iommu/omap: Remove bogus version check in context save/restore

The omap2_iommu_save_ctx() and omap2_iommu_restore_ctx()
performs a sanity version check against a fixed value
that is correct only for OMAP2/OMAP3 IOMMUs. This fixed check
does not scale for all OMAP2+ IOMMUs and is not absolutely
required, so it has been removed.
Signed-off-by: NSuman Anna <s-anna@ti.com>
Acked-by: NLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: NJoerg Roedel <jroedel@suse.de>
上级 3acb04ca
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
/* /*
* omap2 architecture specific register bit definitions * omap2 architecture specific register bit definitions
*/ */
#define IOMMU_ARCH_VERSION 0x00000011
/* IRQSTATUS & IRQENABLE */ /* IRQSTATUS & IRQENABLE */
#define MMU_IRQ_MULTIHITFAULT (1 << 4) #define MMU_IRQ_MULTIHITFAULT (1 << 4)
#define MMU_IRQ_TABLEWALKFAULT (1 << 3) #define MMU_IRQ_TABLEWALKFAULT (1 << 3)
...@@ -268,8 +266,6 @@ static void omap2_iommu_save_ctx(struct omap_iommu *obj) ...@@ -268,8 +266,6 @@ static void omap2_iommu_save_ctx(struct omap_iommu *obj)
p[i] = iommu_read_reg(obj, i * sizeof(u32)); p[i] = iommu_read_reg(obj, i * sizeof(u32));
dev_dbg(obj->dev, "%s\t[%02d] %08x\n", __func__, i, p[i]); dev_dbg(obj->dev, "%s\t[%02d] %08x\n", __func__, i, p[i]);
} }
BUG_ON(p[0] != IOMMU_ARCH_VERSION);
} }
static void omap2_iommu_restore_ctx(struct omap_iommu *obj) static void omap2_iommu_restore_ctx(struct omap_iommu *obj)
...@@ -281,8 +277,6 @@ static void omap2_iommu_restore_ctx(struct omap_iommu *obj) ...@@ -281,8 +277,6 @@ static void omap2_iommu_restore_ctx(struct omap_iommu *obj)
iommu_write_reg(obj, p[i], i * sizeof(u32)); iommu_write_reg(obj, p[i], i * sizeof(u32));
dev_dbg(obj->dev, "%s\t[%02d] %08x\n", __func__, i, p[i]); dev_dbg(obj->dev, "%s\t[%02d] %08x\n", __func__, i, p[i]);
} }
BUG_ON(p[0] != IOMMU_ARCH_VERSION);
} }
static void omap2_cr_to_e(struct cr_regs *cr, struct iotlb_entry *e) static void omap2_cr_to_e(struct cr_regs *cr, struct iotlb_entry *e)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册