iommu/omap: ->unmap() should return order of unmapped page

[firefly-linux-kernel-4.4.55.git] / drivers / iommu / omap-iommu.c

diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c
index dad45ab8cce3e09a78552bd86bd6e5d890852042..bd5f6064c74adb0287a76ce74f7ba24a3e3b3ba9 100644 (file)
--- a/drivers/iommu/omap-iommu.c
+++ b/drivers/iommu/omap-iommu.c
@@ -918,14 +918,14 @@ int omap_iommu_set_isr(const char *name,
                return -ENODEV;
 
        obj = to_iommu(dev);
-       mutex_lock(&obj->iommu_lock);
+       spin_lock(&obj->iommu_lock);
        if (obj->refcount != 0) {
-               mutex_unlock(&obj->iommu_lock);
+               spin_unlock(&obj->iommu_lock);
                return -EBUSY;
        }
        obj->isr = isr;
        obj->isr_priv = isr_priv;
-       mutex_unlock(&obj->iommu_lock);
+       spin_unlock(&obj->iommu_lock);
 
        return 0;
 }
@@ -1069,12 +1069,10 @@ static int omap_iommu_map(struct iommu_domain *domain, unsigned long da,
        iotlb_init_entry(&e, da, pa, flags);
 
        ret = omap_iopgtable_store_entry(oiommu, &e);
-       if (ret) {
+       if (ret)
                dev_err(dev, "omap_iopgtable_store_entry failed: %d\n", ret);
-               return ret;
-       }
 
-       return 0;
+       return ret;
 }
 
 static int omap_iommu_unmap(struct iommu_domain *domain, unsigned long da,
@@ -1083,18 +1081,13 @@ static int omap_iommu_unmap(struct iommu_domain *domain, unsigned long da,
        struct omap_iommu_domain *omap_domain = domain->priv;
        struct omap_iommu *oiommu = omap_domain->iommu_dev;
        struct device *dev = oiommu->dev;
-       size_t bytes = PAGE_SIZE << order;
-       size_t ret;
+       size_t unmap_size;
 
-       dev_dbg(dev, "unmapping da 0x%lx size 0x%x\n", da, bytes);
+       dev_dbg(dev, "unmapping da 0x%lx order %d\n", da, order);
 
-       ret = iopgtable_clear_entry(oiommu, da);
-       if (ret != bytes) {
-               dev_err(dev, "entry @ 0x%lx was %d; not %d\n", da, ret, bytes);
-               return -EINVAL;
-       }
+       unmap_size = iopgtable_clear_entry(oiommu, da);
 
-       return 0;
+       return unmap_size ? get_order(unmap_size) : -EINVAL;
 }
 
 static int