diff options
| author | Suman Anna <s-anna@ti.com> | 2014-10-22 17:22:25 -0500 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2014-10-23 14:32:25 +0200 |
| commit | c2372aafbc4ff59bb6a6bda7ed73364d7f7c53bb (patch) | |
| tree | 5fc9443b535820f5ec637adb9b202991b08ed634 /drivers/iommu | |
| parent | 3acb04ca5ea4e03c5718a87b713b2fd6f7f52b51 (diff) | |
| download | linux-stable-c2372aafbc4ff59bb6a6bda7ed73364d7f7c53bb.tar.gz linux-stable-c2372aafbc4ff59bb6a6bda7ed73364d7f7c53bb.tar.bz2 linux-stable-c2372aafbc4ff59bb6a6bda7ed73364d7f7c53bb.zip | |
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: Suman Anna <s-anna@ti.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/omap-iommu2.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/iommu/omap-iommu2.c b/drivers/iommu/omap-iommu2.c index 2f6a9f76c6ee..372141b2267d 100644 --- 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) |