iommu/omap: Migrate to the generic fault report mechanism

Start using the generic fault report mechanism, as provided by
the IOMMU core, and remove its now-redundant omap_iommu_set_isr API.

Currently we're only interested in letting upper layers know about the
fault, so in case the faulting device is a remote processor, they could
restart it.

Dynamic PTE/TLB loading is not supported.

Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>

1 files changed, 3 insertions, 28 deletions

diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c
index bd5f6064c74a..7e0188f5cdcd 100644
--- a/drivers/iommu/omap-iommu.c
+++ b/drivers/iommu/omap-iommu.c
@@ -775,6 +775,7 @@ static irqreturn_t iommu_fault_handler(int irq, void *data)
         u32 da, errs;
         u32 *iopgd, *iopte;
         struct omap_iommu *obj = data;
+        struct iommu_domain *domain = obj->domain;
 
         if (!obj->refcount)
                 return IRQ_NONE;
@@ -786,7 +787,7 @@ static irqreturn_t iommu_fault_handler(int irq, void *data)
                 return IRQ_HANDLED;
 
         /* Fault callback or TLB/PTE Dynamic loading */
-        if (obj->isr && !obj->isr(obj, da, errs, obj->isr_priv))
+        if (!report_iommu_fault(domain, obj->dev, da, 0))
                 return IRQ_HANDLED;
 
         iommu_disable(obj);
@@ -904,33 +905,6 @@ static void omap_iommu_detach(struct omap_iommu *obj)
         dev_dbg(obj->dev, "%s: %s\n", __func__, obj->name);
 }
 
-int omap_iommu_set_isr(const char *name,
-                  int (*isr)(struct omap_iommu *obj, u32 da, u32 iommu_errs,
-                             void *priv),
-                  void *isr_priv)
-{
-        struct device *dev;
-        struct omap_iommu *obj;
-
-        dev = driver_find_device(&omap_iommu_driver.driver, NULL, (void *)name,
-                                 device_match_by_alias);
-        if (!dev)
-                return -ENODEV;
-
-        obj = to_iommu(dev);
-        spin_lock(&obj->iommu_lock);
-        if (obj->refcount != 0) {
-                spin_unlock(&obj->iommu_lock);
-                return -EBUSY;
-        }
-        obj->isr = isr;
-        obj->isr_priv = isr_priv;
-        spin_unlock(&obj->iommu_lock);
-
-        return 0;
-}
-EXPORT_SYMBOL_GPL(omap_iommu_set_isr);
-
 /*
  *      OMAP Device MMU(IOMMU) detection
  */
@@ -1115,6 +1089,7 @@ omap_iommu_attach_dev(struct iommu_domain *domain, struct device *dev)
         }
 
         omap_domain->iommu_dev = oiommu;
+        oiommu->domain = domain;
 
 out:
         spin_unlock(&omap_domain->lock);