Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e1b612c authored by Ohad Ben-Cohen's avatar Ohad Ben-Cohen Committed by Joerg Roedel
Browse files

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



Users of the IOMMU API (kvm specifically) assume that iommu_unmap()
returns the order of the unmapped page.

Fix omap_iommu_unmap() to do so and adopt omap-iovmm accordingly.

Signed-off-by: default avatarOhad Ben-Cohen <ohad@wizery.com>
Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
parent b4550d41

drivers/iommu/omap-iommu.c

+4 −9
Original line number Diff line number Diff line
@@ -1081,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

drivers/iommu/omap-iovmm.c

+1 −1
Original line number Diff line number Diff line
@@ -480,7 +480,7 @@ static void unmap_iovm_area(struct iommu_domain *domain, struct omap_iommu *obj, 
		order = get_order(bytes);



		err = iommu_unmap(domain, start, order);

		if (err)

		if (err < 0)

			break;



		dev_dbg(obj->dev, "%s: unmap %08x(%x) %08x\n",