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

sumananna · joergroedel · commit c2372aafbc4f · 2014-10-23T14:32:25.000+02:00
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: Suman Anna &lt;s-anna@ti.com&gt;
Acked-by: Laurent Pinchart &lt;laurent.pinchart@ideasonboard.com&gt;
Signed-off-by: Joerg Roedel &lt;jroedel@suse.de&gt;
diff --git a/drivers/iommu/omap-iommu2.c b/drivers/iommu/omap-iommu2.c
@@ -26,8 +26,6 @@
 /*
  * omap2 architecture specific register bit definitions
  */
-#define IOMMU_ARCH_VERSION	0x00000011
-
 /* IRQSTATUS & IRQENABLE */
 #define MMU_IRQ_MULTIHITFAULT	(1 << 4)
 #define MMU_IRQ_TABLEWALKFAULT	(1 << 3)
@@ -268,8 +266,6 @@ static void omap2_iommu_save_ctx(struct omap_iommu *obj)
 		p[i] = iommu_read_reg(obj, i * sizeof(u32));
 		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)
@@ -281,8 +277,6 @@ static void omap2_iommu_restore_ctx(struct omap_iommu *obj)
 		iommu_write_reg(obj, p[i], i * sizeof(u32));
 		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)

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,6 @@`
`26`	`26`	`/*`
`27`	`27`	`* omap2 architecture specific register bit definitions`
`28`	`28`	`*/`
`29`		`-#define IOMMU_ARCH_VERSION 0x00000011`
`30`		`-`
`31`	`29`	`/* IRQSTATUS & IRQENABLE */`
`32`	`30`	`#define MMU_IRQ_MULTIHITFAULT (1 << 4)`
`33`	`31`	`#define MMU_IRQ_TABLEWALKFAULT (1 << 3)`
`@@ -268,8 +266,6 @@ static void omap2_iommu_save_ctx(struct omap_iommu *obj)`
`268`	`266`	`p[i] = iommu_read_reg(obj, i * sizeof(u32));`
`269`	`267`	`dev_dbg(obj->dev, "%s\t[%02d] %08x\n", __func__, i, p[i]);`
`270`	`268`	`}`
`271`		`-`
`272`		`- BUG_ON(p[0] != IOMMU_ARCH_VERSION);`
`273`	`269`	`}`
`274`	`270`
`275`	`271`	`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`	`277`	`iommu_write_reg(obj, p[i], i * sizeof(u32));`
`282`	`278`	`dev_dbg(obj->dev, "%s\t[%02d] %08x\n", __func__, i, p[i]);`
`283`	`279`	`}`
`284`		`-`
`285`		`- BUG_ON(p[0] != IOMMU_ARCH_VERSION);`
`286`	`280`	`}`
`287`	`281`
`288`	`282`	`static void omap2_cr_to_e(struct cr_regs cr, struct iotlb_entry e)`