Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/arm/mach-omap2/iommu2.c

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static u32 omap2_iommu_fault_isr(struct iommu *obj, u32 *ra) 
	printk("\n");



	iommu_write_reg(obj, stat, MMU_IRQSTATUS);

	omap2_iommu_disable(obj);



	return stat;

}

arch/arm/plat-omap/iommu.c

+2 −0
Original line number Diff line number Diff line
@@ -800,6 +800,8 @@ static irqreturn_t iommu_fault_handler(int irq, void *data) 
	if (!stat)

		return IRQ_HANDLED;



	iommu_disable(obj);



	iopgd = iopgd_offset(obj, da);



	if (!iopgd_is_table(*iopgd)) {