diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/plat-omap/iommu.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/arch/arm/plat-omap/iommu.c b/arch/arm/plat-omap/iommu.c index 7af4a306537..b1deb228243 100644 --- a/arch/arm/plat-omap/iommu.c +++ b/arch/arm/plat-omap/iommu.c @@ -400,10 +400,10 @@ u32 iommu_save_tlb_entries(struct iommu *obj) for_each_iotlb_cr(obj, obj->nr_tlb_entries, i, cr_tmp) { iotlb_cr_to_e(&cr_tmp, e); + dev_dbg(obj->dev, "%s: %08x %08x %d %d %d", __func__, e->da, + e->pa, e->pgsz, e->prsvd, + e->valid); e++; - - dev_dbg(obj->dev, "%s: [%02x] %08x %08x\n", __func__, - i, cr_tmp.cam, cr_tmp.ram); } return 0; @@ -429,17 +429,17 @@ u32 iommu_restore_tlb_entries(struct iommu *obj) goto error; for (i = 0; i < obj->nr_tlb_entries; i++) { - if (!e->valid) { + if (!e->prsvd) { e++; continue; } + dev_dbg(obj->dev, "%s: %08x %08x %d %d %d", __func__, e->da, + e->pa, e->pgsz, e->prsvd, + e->valid); status = load_iotlb_entry(obj, e); if (status) goto error; e++; - - dev_dbg(obj->dev, "%s: [%02x] %08x\n", __func__, - i, e->pa); } return 0; @@ -862,12 +862,12 @@ static irqreturn_t iommu_fault_handler(int irq, void *data) eventfd_notification(obj); /* Dynamic loading TLB or PTE */ - err = iommu_notify_event(obj, IOMMU_FAULT, data); + errs = iommu_notify_event(obj, IOMMU_FAULT, data); - if (err == NOTIFY_OK) + if (errs == NOTIFY_OK) return IRQ_HANDLED; - stat = iommu_report_fault(obj, &da); - if (!stat) + errs = iommu_report_fault(obj, &da); + if (!errs) return IRQ_HANDLED; iommu_disable(obj); |