aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/iommu/omap-iommu2.c20
1 files changed, 1 insertions, 19 deletions
diff --git a/drivers/iommu/omap-iommu2.c b/drivers/iommu/omap-iommu2.c
index 372141b2267d..ce2fff37aa61 100644
--- a/drivers/iommu/omap-iommu2.c
+++ b/drivers/iommu/omap-iommu2.c
@@ -53,13 +53,6 @@
53 ((pgsz) == MMU_CAM_PGSZ_64K) ? 0xffff0000 : \ 53 ((pgsz) == MMU_CAM_PGSZ_64K) ? 0xffff0000 : \
54 ((pgsz) == MMU_CAM_PGSZ_4K) ? 0xfffff000 : 0) 54 ((pgsz) == MMU_CAM_PGSZ_4K) ? 0xfffff000 : 0)
55 55
56/* IOMMU errors */
57#define OMAP_IOMMU_ERR_TLB_MISS (1 << 0)
58#define OMAP_IOMMU_ERR_TRANS_FAULT (1 << 1)
59#define OMAP_IOMMU_ERR_EMU_MISS (1 << 2)
60#define OMAP_IOMMU_ERR_TBLWALK_FAULT (1 << 3)
61#define OMAP_IOMMU_ERR_MULTIHIT_FAULT (1 << 4)
62
63static void __iommu_set_twl(struct omap_iommu *obj, bool on) 56static void __iommu_set_twl(struct omap_iommu *obj, bool on)
64{ 57{
65 u32 l = iommu_read_reg(obj, MMU_CNTL); 58 u32 l = iommu_read_reg(obj, MMU_CNTL);
@@ -122,7 +115,6 @@ static void omap2_iommu_set_twl(struct omap_iommu *obj, bool on)
122static u32 omap2_iommu_fault_isr(struct omap_iommu *obj, u32 *ra) 115static u32 omap2_iommu_fault_isr(struct omap_iommu *obj, u32 *ra)
123{ 116{
124 u32 stat, da; 117 u32 stat, da;
125 u32 errs = 0;
126 118
127 stat = iommu_read_reg(obj, MMU_IRQSTATUS); 119 stat = iommu_read_reg(obj, MMU_IRQSTATUS);
128 stat &= MMU_IRQ_MASK; 120 stat &= MMU_IRQ_MASK;
@@ -134,19 +126,9 @@ static u32 omap2_iommu_fault_isr(struct omap_iommu *obj, u32 *ra)
134 da = iommu_read_reg(obj, MMU_FAULT_AD); 126 da = iommu_read_reg(obj, MMU_FAULT_AD);
135 *ra = da; 127 *ra = da;
136 128
137 if (stat & MMU_IRQ_TLBMISS)
138 errs |= OMAP_IOMMU_ERR_TLB_MISS;
139 if (stat & MMU_IRQ_TRANSLATIONFAULT)
140 errs |= OMAP_IOMMU_ERR_TRANS_FAULT;
141 if (stat & MMU_IRQ_EMUMISS)
142 errs |= OMAP_IOMMU_ERR_EMU_MISS;
143 if (stat & MMU_IRQ_TABLEWALKFAULT)
144 errs |= OMAP_IOMMU_ERR_TBLWALK_FAULT;
145 if (stat & MMU_IRQ_MULTIHITFAULT)
146 errs |= OMAP_IOMMU_ERR_MULTIHIT_FAULT;
147 iommu_write_reg(obj, stat, MMU_IRQSTATUS); 129 iommu_write_reg(obj, stat, MMU_IRQSTATUS);
148 130
149 return errs; 131 return stat;
150} 132}
151 133
152static void omap2_tlb_read_cr(struct omap_iommu *obj, struct cr_regs *cr) 134static void omap2_tlb_read_cr(struct omap_iommu *obj, struct cr_regs *cr)