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

Commit 124262a2 authored by Suman Anna's avatar Suman Anna Committed by Joerg Roedel
Browse files

iommu/omap: Simplify omap2_iommu_fault_isr() 



The function omap2_iommu_fault_isr() does an unnecessary
recomputation of the return value. The logic relies on
setting the same bit fields as the MMU fault error status
bits, so simplify this function and remove the unneeded
macros. These macros were originally exported to notify
MMU faults to users prior to the IOMMU framework adaptation,
but are now redundant.

Signed-off-by: default avatarSuman Anna <s-anna@ti.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent c2372aaf

drivers/iommu/omap-iommu2.c

+1 −19
Original line number Diff line number Diff line
@@ -53,13 +53,6 @@ 
	 ((pgsz) == MMU_CAM_PGSZ_64K) ? 0xffff0000 :	\

	 ((pgsz) == MMU_CAM_PGSZ_4K)  ? 0xfffff000 : 0)



/* IOMMU errors */

#define OMAP_IOMMU_ERR_TLB_MISS		(1 << 0)

#define OMAP_IOMMU_ERR_TRANS_FAULT	(1 << 1)

#define OMAP_IOMMU_ERR_EMU_MISS		(1 << 2)

#define OMAP_IOMMU_ERR_TBLWALK_FAULT	(1 << 3)

#define OMAP_IOMMU_ERR_MULTIHIT_FAULT	(1 << 4)



static void __iommu_set_twl(struct omap_iommu *obj, bool on)

{

	u32 l = iommu_read_reg(obj, MMU_CNTL);
@@ -122,7 +115,6 @@ static void omap2_iommu_set_twl(struct omap_iommu *obj, bool on) 
static u32 omap2_iommu_fault_isr(struct omap_iommu *obj, u32 *ra)

{

	u32 stat, da;

	u32 errs = 0;



	stat = iommu_read_reg(obj, MMU_IRQSTATUS);

	stat &= MMU_IRQ_MASK;
@@ -134,19 +126,9 @@ static u32 omap2_iommu_fault_isr(struct omap_iommu *obj, u32 *ra) 
	da = iommu_read_reg(obj, MMU_FAULT_AD);

	*ra = da;



	if (stat & MMU_IRQ_TLBMISS)

		errs |= OMAP_IOMMU_ERR_TLB_MISS;

	if (stat & MMU_IRQ_TRANSLATIONFAULT)

		errs |= OMAP_IOMMU_ERR_TRANS_FAULT;

	if (stat & MMU_IRQ_EMUMISS)

		errs |= OMAP_IOMMU_ERR_EMU_MISS;

	if (stat & MMU_IRQ_TABLEWALKFAULT)

		errs |= OMAP_IOMMU_ERR_TBLWALK_FAULT;

	if (stat & MMU_IRQ_MULTIHITFAULT)

		errs |= OMAP_IOMMU_ERR_MULTIHIT_FAULT;

	iommu_write_reg(obj, stat, MMU_IRQSTATUS);



	return errs;

	return stat;

}



static void omap2_tlb_read_cr(struct omap_iommu *obj, struct cr_regs *cr)