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

Commit baaa7b5d authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Joerg Roedel
Browse files

iommu/omap: Remove virtual memory manager 



The OMAP3 ISP driver was the only user of the OMAP IOVMM API. Now that
is has been ported to the DMA API, remove the unused virtual memory
manager.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 0f198890

drivers/iommu/Kconfig

+3 −7
Original line number Diff line number Diff line
@@ -143,16 +143,12 @@ config OMAP_IOMMU 
	depends on ARCH_OMAP2PLUS

	select IOMMU_API



config OMAP_IOVMM

	tristate "OMAP IO Virtual Memory Manager Support"

	depends on OMAP_IOMMU



config OMAP_IOMMU_DEBUG

       tristate "Export OMAP IOMMU/IOVMM internals in DebugFS"

       depends on OMAP_IOVMM && DEBUG_FS

       tristate "Export OMAP IOMMU internals in DebugFS"

       depends on OMAP_IOMMU && DEBUG_FS

       help

         Select this to see extensive information about

         the internal state of OMAP IOMMU/IOVMM in debugfs.

         the internal state of OMAP IOMMU in debugfs.



         Say N unless you know you need this.

drivers/iommu/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ obj-$(CONFIG_IPMMU_VMSA) += ipmmu-vmsa.o 
obj-$(CONFIG_IRQ_REMAP) += intel_irq_remapping.o irq_remapping.o

obj-$(CONFIG_OMAP_IOMMU) += omap-iommu.o

obj-$(CONFIG_OMAP_IOMMU) += omap-iommu2.o

obj-$(CONFIG_OMAP_IOVMM) += omap-iovmm.o

obj-$(CONFIG_OMAP_IOMMU_DEBUG) += omap-iommu-debug.o

obj-$(CONFIG_TEGRA_IOMMU_GART) += tegra-gart.o

obj-$(CONFIG_TEGRA_IOMMU_SMMU) += tegra-smmu.o

drivers/iommu/omap-iommu-debug.c

+0 −114
Original line number Diff line number Diff line
@@ -213,116 +213,6 @@ static ssize_t debug_read_pagetable(struct file *file, char __user *userbuf, 
	return bytes;

}



static ssize_t debug_read_mmap(struct file *file, char __user *userbuf,

			       size_t count, loff_t *ppos)

{

	struct device *dev = file->private_data;

	struct omap_iommu *obj = dev_to_omap_iommu(dev);

	char *p, *buf;

	struct iovm_struct *tmp;

	int uninitialized_var(i);

	ssize_t bytes;



	buf = (char *)__get_free_page(GFP_KERNEL);

	if (!buf)

		return -ENOMEM;

	p = buf;



	p += sprintf(p, "%-3s %-8s %-8s %6s %8s\n",

		     "No", "start", "end", "size", "flags");

	p += sprintf(p, "-------------------------------------------------\n");



	mutex_lock(&iommu_debug_lock);



	list_for_each_entry(tmp, &obj->mmap, list) {

		size_t len;

		const char *str = "%3d %08x-%08x %6x %8x\n";

		const int maxcol = 39;



		len = tmp->da_end - tmp->da_start;

		p += snprintf(p, maxcol, str,

			      i, tmp->da_start, tmp->da_end, len, tmp->flags);



		if (PAGE_SIZE - (p - buf) < maxcol)

			break;

		i++;

	}



	bytes = simple_read_from_buffer(userbuf, count, ppos, buf, p - buf);



	mutex_unlock(&iommu_debug_lock);

	free_page((unsigned long)buf);



	return bytes;

}



static ssize_t debug_read_mem(struct file *file, char __user *userbuf,

			      size_t count, loff_t *ppos)

{

	struct device *dev = file->private_data;

	char *p, *buf;

	struct iovm_struct *area;

	ssize_t bytes;



	count = min_t(ssize_t, count, PAGE_SIZE);



	buf = (char *)__get_free_page(GFP_KERNEL);

	if (!buf)

		return -ENOMEM;

	p = buf;



	mutex_lock(&iommu_debug_lock);



	area = omap_find_iovm_area(dev, (u32)ppos);

	if (!area) {

		bytes = -EINVAL;

		goto err_out;

	}

	memcpy(p, area->va, count);

	p += count;



	bytes = simple_read_from_buffer(userbuf, count, ppos, buf, p - buf);

err_out:

	mutex_unlock(&iommu_debug_lock);

	free_page((unsigned long)buf);



	return bytes;

}



static ssize_t debug_write_mem(struct file *file, const char __user *userbuf,

			       size_t count, loff_t *ppos)

{

	struct device *dev = file->private_data;

	struct iovm_struct *area;

	char *p, *buf;



	count = min_t(size_t, count, PAGE_SIZE);



	buf = (char *)__get_free_page(GFP_KERNEL);

	if (!buf)

		return -ENOMEM;

	p = buf;



	mutex_lock(&iommu_debug_lock);



	if (copy_from_user(p, userbuf, count)) {

		count =  -EFAULT;

		goto err_out;

	}



	area = omap_find_iovm_area(dev, (u32)ppos);

	if (!area) {

		count = -EINVAL;

		goto err_out;

	}

	memcpy(area->va, p, count);

err_out:

	mutex_unlock(&iommu_debug_lock);

	free_page((unsigned long)buf);



	return count;

}



#define DEBUG_FOPS(name)						\

	static const struct file_operations debug_##name##_fops = {	\

		.open = simple_open,					\
@@ -342,8 +232,6 @@ DEBUG_FOPS_RO(ver); 
DEBUG_FOPS_RO(regs);

DEBUG_FOPS_RO(tlb);

DEBUG_FOPS(pagetable);

DEBUG_FOPS_RO(mmap);

DEBUG_FOPS(mem);



#define __DEBUG_ADD_FILE(attr, mode)					\

	{								\
@@ -389,8 +277,6 @@ static int iommu_debug_register(struct device *dev, void *data) 
	DEBUG_ADD_FILE_RO(regs);

	DEBUG_ADD_FILE_RO(tlb);

	DEBUG_ADD_FILE(pagetable);

	DEBUG_ADD_FILE_RO(mmap);

	DEBUG_ADD_FILE(mem);



	return 0;

drivers/iommu/omap-iommu.c

+0 −13
Original line number Diff line number Diff line
@@ -959,31 +959,18 @@ static int omap_iommu_probe(struct platform_device *pdev) 
			return err;

		if (obj->nr_tlb_entries != 32 && obj->nr_tlb_entries != 8)

			return -EINVAL;

		/*

		 * da_start and da_end are needed for omap-iovmm, so hardcode

		 * these values as used by OMAP3 ISP - the only user for

		 * omap-iovmm

		 */

		obj->da_start = 0;

		obj->da_end = 0xfffff000;

		if (of_find_property(of, "ti,iommu-bus-err-back", NULL))

			obj->has_bus_err_back = MMU_GP_REG_BUS_ERR_BACK_EN;

	} else {

		obj->nr_tlb_entries = pdata->nr_tlb_entries;

		obj->name = pdata->name;

		obj->da_start = pdata->da_start;

		obj->da_end = pdata->da_end;

	}

	if (obj->da_end <= obj->da_start)

		return -EINVAL;



	obj->dev = &pdev->dev;

	obj->ctx = (void *)obj + sizeof(*obj);



	spin_lock_init(&obj->iommu_lock);

	mutex_init(&obj->mmap_lock);

	spin_lock_init(&obj->page_table_lock);

	INIT_LIST_HEAD(&obj->mmap);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	obj->regbase = devm_ioremap_resource(obj->dev, res);

drivers/iommu/omap-iommu.h

+3 −5
Original line number Diff line number Diff line
@@ -46,12 +46,7 @@ struct omap_iommu { 


	int		nr_tlb_entries;



	struct list_head	mmap;

	struct mutex		mmap_lock; /* protect mmap */



	void *ctx; /* iommu context: registres saved area */

	u32 da_start;

	u32 da_end;



	int has_bus_err_back;

};
@@ -154,9 +149,12 @@ static inline struct omap_iommu *dev_to_omap_iommu(struct device *dev) 
#define MMU_RAM_PADDR_MASK \

	((~0UL >> MMU_RAM_PADDR_SHIFT) << MMU_RAM_PADDR_SHIFT)



#define MMU_RAM_ENDIAN_SHIFT	9

#define MMU_RAM_ENDIAN_MASK	(1 << MMU_RAM_ENDIAN_SHIFT)

#define MMU_RAM_ENDIAN_LITTLE	(0 << MMU_RAM_ENDIAN_SHIFT)

#define MMU_RAM_ENDIAN_BIG	(1 << MMU_RAM_ENDIAN_SHIFT)



#define MMU_RAM_ELSZ_SHIFT	7

#define MMU_RAM_ELSZ_MASK	(3 << MMU_RAM_ELSZ_SHIFT)

#define MMU_RAM_ELSZ_8		(0 << MMU_RAM_ELSZ_SHIFT)

#define MMU_RAM_ELSZ_16		(1 << MMU_RAM_ELSZ_SHIFT)