Browse Source

iommu/omap: Replace BUG() in iopgtable_store_entry_core()

The iopgtable_store_entry_core() function uses a BUG() statement
for an unsupported page size entry programming. Replace this with
a less severe WARN_ON() and perform a graceful bailout on error.

Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Suman Anna 9 years ago
parent
commit
7c1ab60008
1 changed files with 3 additions and 1 deletions
  1. 3 1
      drivers/iommu/omap-iommu.c

+ 3 - 1
drivers/iommu/omap-iommu.c

@@ -628,10 +628,12 @@ iopgtable_store_entry_core(struct omap_iommu *obj, struct iotlb_entry *e)
 		break;
 		break;
 	default:
 	default:
 		fn = NULL;
 		fn = NULL;
-		BUG();
 		break;
 		break;
 	}
 	}
 
 
+	if (WARN_ON(!fn))
+		return -EINVAL;
+
 	prot = get_iopte_attr(e);
 	prot = get_iopte_attr(e);
 
 
 	spin_lock(&obj->page_table_lock);
 	spin_lock(&obj->page_table_lock);