Skip to content

Commit

Permalink
OMAP2+: IOMMU: don't print fault warning on specific layer
Browse files Browse the repository at this point in the history
IOMMU upper layer and user are responsible to handle a fault and to
define whether it will end up as an error or not. OMAP2+ specific
layer should not print anything in such case.

Signed-off-by: David Cohen <dacohen@gmail.com>
Acked-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
  • Loading branch information
David Cohen authored and Tony Lindgren committed Feb 24, 2011
1 parent 82d2a5d commit 92e753d
Showing 1 changed file with 0 additions and 16 deletions.
16 changes: 0 additions & 16 deletions arch/arm/mach-omap2/iommu2.c
Original file line number Diff line number Diff line change
Expand Up @@ -145,15 +145,7 @@ static void omap2_iommu_set_twl(struct iommu *obj, bool on)

static u32 omap2_iommu_fault_isr(struct iommu *obj, u32 *ra)
{
int i;
u32 stat, da;
const char *err_msg[] = {
"tlb miss",
"translation fault",
"emulation miss",
"table walk fault",
"multi hit fault",
};

stat = iommu_read_reg(obj, MMU_IRQSTATUS);
stat &= MMU_IRQ_MASK;
Expand All @@ -163,14 +155,6 @@ static u32 omap2_iommu_fault_isr(struct iommu *obj, u32 *ra)
da = iommu_read_reg(obj, MMU_FAULT_AD);
*ra = da;

dev_err(obj->dev, "%s:\tda:%08x ", __func__, da);

for (i = 0; i < ARRAY_SIZE(err_msg); i++) {
if (stat & (1 << i))
printk("%s ", err_msg[i]);
}
printk("\n");

iommu_write_reg(obj, stat, MMU_IRQSTATUS);

return stat;
Expand Down

0 comments on commit 92e753d

Please sign in to comment.