mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-30 12:49:36 +00:00
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: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
This commit is contained in:
parent
ddfa975a8c
commit
37b298100f
2 changed files with 3 additions and 1 deletions
|
@ -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)
|
||||||
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)) {
|
||||||
|
|
Loading…
Reference in a new issue