diff options
author | David Cohen <dacohen@gmail.com> | 2011-02-16 14:35:50 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-02-24 17:22:30 -0500 |
commit | 92e753d7984db36f0a3c0bbf0f377da114768775 (patch) | |
tree | 4a5394e8cf215d2b5eca1db2e25a021e16a182f1 /arch/arm/mach-omap2/iommu2.c | |
parent | 82d2a5db5296834a4317e554f57b8883d7abb86d (diff) |
OMAP2+: IOMMU: don't print fault warning on specific layer
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>
Diffstat (limited to 'arch/arm/mach-omap2/iommu2.c')
-rw-r--r-- | arch/arm/mach-omap2/iommu2.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/arm/mach-omap2/iommu2.c b/arch/arm/mach-omap2/iommu2.c index 14ee686b6492..49a1e5e841ca 100644 --- a/arch/arm/mach-omap2/iommu2.c +++ b/arch/arm/mach-omap2/iommu2.c | |||
@@ -145,15 +145,7 @@ static void omap2_iommu_set_twl(struct iommu *obj, bool on) | |||
145 | 145 | ||
146 | static u32 omap2_iommu_fault_isr(struct iommu *obj, u32 *ra) | 146 | static u32 omap2_iommu_fault_isr(struct iommu *obj, u32 *ra) |
147 | { | 147 | { |
148 | int i; | ||
149 | u32 stat, da; | 148 | u32 stat, da; |
150 | const char *err_msg[] = { | ||
151 | "tlb miss", | ||
152 | "translation fault", | ||
153 | "emulation miss", | ||
154 | "table walk fault", | ||
155 | "multi hit fault", | ||
156 | }; | ||
157 | 149 | ||
158 | stat = iommu_read_reg(obj, MMU_IRQSTATUS); | 150 | stat = iommu_read_reg(obj, MMU_IRQSTATUS); |
159 | stat &= MMU_IRQ_MASK; | 151 | stat &= MMU_IRQ_MASK; |
@@ -163,14 +155,6 @@ static u32 omap2_iommu_fault_isr(struct iommu *obj, u32 *ra) | |||
163 | da = iommu_read_reg(obj, MMU_FAULT_AD); | 155 | da = iommu_read_reg(obj, MMU_FAULT_AD); |
164 | *ra = da; | 156 | *ra = da; |
165 | 157 | ||
166 | dev_err(obj->dev, "%s:\tda:%08x ", __func__, da); | ||
167 | |||
168 | for (i = 0; i < ARRAY_SIZE(err_msg); i++) { | ||
169 | if (stat & (1 << i)) | ||
170 | printk("%s ", err_msg[i]); | ||
171 | } | ||
172 | printk("\n"); | ||
173 | |||
174 | iommu_write_reg(obj, stat, MMU_IRQSTATUS); | 158 | iommu_write_reg(obj, stat, MMU_IRQSTATUS); |
175 | 159 | ||
176 | return stat; | 160 | return stat; |