Commit 37b29810 authored by Hiroshi DOYU's avatar Hiroshi DOYU

omap iommu: move iommu_disable at fault to the above layer

The function prefix "omap2_iommu_" indicates that the prefixed
function belongs to "omap2_iommu_ops" to provide iommu basic
functionalities for the above layers. It's better to avoid the
prefixed function called in the same prefixed ones internally, like
nested here. Now "iommu_disable" is called just after fault_isr() in
the above layer. This is a little bit more sensible to keep the
consistency of module layers.
Signed-off-by: default avatarHiroshi DOYU <Hiroshi.DOYU@nokia.com>
parent ddfa975a
...@@ -172,7 +172,7 @@ static u32 omap2_iommu_fault_isr(struct iommu *obj, u32 *ra) ...@@ -172,7 +172,7 @@ static u32 omap2_iommu_fault_isr(struct iommu *obj, u32 *ra)
printk("\n"); printk("\n");
iommu_write_reg(obj, stat, MMU_IRQSTATUS); iommu_write_reg(obj, stat, MMU_IRQSTATUS);
omap2_iommu_disable(obj);
return stat; return stat;
} }
......
...@@ -800,6 +800,8 @@ static irqreturn_t iommu_fault_handler(int irq, void *data) ...@@ -800,6 +800,8 @@ static irqreturn_t iommu_fault_handler(int irq, void *data)
if (!stat) if (!stat)
return IRQ_HANDLED; return IRQ_HANDLED;
iommu_disable(obj);
iopgd = iopgd_offset(obj, da); iopgd = iopgd_offset(obj, da);
if (!iopgd_is_table(*iopgd)) { if (!iopgd_is_table(*iopgd)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment