iommu/omap: Migrate to hwmod framework (72b15b6a) · Commits · 戴 / test

arch/arm/mach-omap2/devices.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -214,7 +214,7 @@ static struct platform_device omap3isp_device = {
	};		};

	static struct omap_iommu_arch_data omap3_isp_iommu = {		static struct omap_iommu_arch_data omap3_isp_iommu = {
	.name = "isp",		.name = "mmu_isp",
	};		};

	int omap3_init_camera(struct isp_platform_data *pdata)		int omap3_init_camera(struct isp_platform_data *pdata)

arch/arm/mach-omap2/omap-iommu.c

+38 −130

Original line number	Original line	Diff line number	Diff line
	@@ -12,153 +12,61 @@

	#include <linux/module.h>		#include <linux/module.h>
	#include <linux/platform_device.h>		#include <linux/platform_device.h>
			#include <linux/err.h>
			#include <linux/slab.h>

	#include <linux/platform_data/iommu-omap.h>		#include <linux/platform_data/iommu-omap.h>
			#include <plat/omap_hwmod.h>
			#include <plat/omap_device.h>

	#include "soc.h"		static int __init omap_iommu_dev_init(struct omap_hwmod oh, void unused)
	#include "common.h"

	struct iommu_device {
	resource_size_t base;
	int irq;
	struct iommu_platform_data pdata;
	struct resource res[2];
	};
	static struct iommu_device *devices;
	static int num_iommu_devices;

	#ifdef CONFIG_ARCH_OMAP3
	static struct iommu_device omap3_devices[] = {
	{
	.base = 0x480bd400,
	.irq = 24 + OMAP_INTC_START,
	.pdata = {
	.name = "isp",
	.nr_tlb_entries = 8,
	.clk_name = "cam_ick",
	.da_start = 0x0,
	.da_end = 0xFFFFF000,
	},
	},
	#if defined(CONFIG_OMAP_IOMMU_IVA2)
	{
	.base = 0x5d000000,
	.irq = 28 + OMAP_INTC_START,
	.pdata = {
	.name = "iva2",
	.nr_tlb_entries = 32,
	.clk_name = "iva2_ck",
	.da_start = 0x11000000,
	.da_end = 0xFFFFF000,
	},
	},
	#endif
	};
	#define NR_OMAP3_IOMMU_DEVICES ARRAY_SIZE(omap3_devices)
	static struct platform_device *omap3_iommu_pdev[NR_OMAP3_IOMMU_DEVICES];
	#else
	#define omap3_devices NULL
	#define NR_OMAP3_IOMMU_DEVICES 0
	#define omap3_iommu_pdev NULL
	#endif

	#ifdef CONFIG_ARCH_OMAP4
	static struct iommu_device omap4_devices[] = {
	{
	.base = OMAP4_MMU1_BASE,
	.irq = 100 + OMAP44XX_IRQ_GIC_START,
	.pdata = {
	.name = "ducati",
	.nr_tlb_entries = 32,
	.clk_name = "ipu_fck",
	.da_start = 0x0,
	.da_end = 0xFFFFF000,
	},
	},
	{
	.base = OMAP4_MMU2_BASE,
	.irq = 28 + OMAP44XX_IRQ_GIC_START,
	.pdata = {
	.name = "tesla",
	.nr_tlb_entries = 32,
	.clk_name = "dsp_fck",
	.da_start = 0x0,
	.da_end = 0xFFFFF000,
	},
	},
	};
	#define NR_OMAP4_IOMMU_DEVICES ARRAY_SIZE(omap4_devices)
	static struct platform_device *omap4_iommu_pdev[NR_OMAP4_IOMMU_DEVICES];
	#else
	#define omap4_devices NULL
	#define NR_OMAP4_IOMMU_DEVICES 0
	#define omap4_iommu_pdev NULL
	#endif

	static struct platform_device **omap_iommu_pdev;

	static int __init omap_iommu_init(void)
	{		{
	int i, err;		struct platform_device *pdev;
	struct resource res[] = {		struct iommu_platform_data *pdata;
	{ .flags = IORESOURCE_MEM },		struct omap_mmu_dev_attr a = (struct omap_mmu_dev_attr )oh->dev_attr;
	{ .flags = IORESOURCE_IRQ },		static int i;
	};
			pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
			if (!pdata)
			return -ENOMEM;

			pdata->name = oh->name;
			pdata->clk_name = oh->main_clk;
			pdata->nr_tlb_entries = a->nr_tlb_entries;
			pdata->da_start = a->da_start;
			pdata->da_end = a->da_end;

			if (oh->rst_lines_cnt == 1) {
			pdata->reset_name = oh->rst_lines->name;
			pdata->assert_reset = omap_device_assert_hardreset;
			pdata->deassert_reset = omap_device_deassert_hardreset;
			}

	if (cpu_is_omap34xx()) {		pdev = omap_device_build("omap-iommu", i, oh, pdata, sizeof(*pdata),
	devices = omap3_devices;		NULL, 0, 0);
	omap_iommu_pdev = omap3_iommu_pdev;
	num_iommu_devices = NR_OMAP3_IOMMU_DEVICES;
	} else if (cpu_is_omap44xx()) {
	devices = omap4_devices;
	omap_iommu_pdev = omap4_iommu_pdev;
	num_iommu_devices = NR_OMAP4_IOMMU_DEVICES;
	} else
	return -ENODEV;

	for (i = 0; i < num_iommu_devices; i++) {		kfree(pdata);
	struct platform_device *pdev;
	const struct iommu_device *d = &devices[i];

	pdev = platform_device_alloc("omap-iommu", i);		if (IS_ERR(pdev)) {
	if (!pdev) {		pr_err("%s: device build err: %ld\n", __func__, PTR_ERR(pdev));
	err = -ENOMEM;		return PTR_ERR(pdev);
	goto err_out;
	}		}

	res[0].start = d->base;		i++;
	res[0].end = d->base + MMU_REG_SIZE - 1;
	res[1].start = res[1].end = d->irq;

	err = platform_device_add_resources(pdev, res,
	ARRAY_SIZE(res));
	if (err)
	goto err_out;
	err = platform_device_add_data(pdev, &d->pdata,
	sizeof(d->pdata));
	if (err)
	goto err_out;
	err = platform_device_add(pdev);
	if (err)
	goto err_out;
	omap_iommu_pdev[i] = pdev;
	}
	return 0;		return 0;
			}

	err_out:		static int __init omap_iommu_init(void)
	while (i--)		{
	platform_device_put(omap_iommu_pdev[i]);		return omap_hwmod_for_each_by_class("mmu", omap_iommu_dev_init, NULL);
	return err;
	}		}
	/* must be ready before omap3isp is probed */		/* must be ready before omap3isp is probed */
	subsys_initcall(omap_iommu_init);		subsys_initcall(omap_iommu_init);

	static void __exit omap_iommu_exit(void)		static void __exit omap_iommu_exit(void)
	{		{
	int i;		/* Do nothing */

	for (i = 0; i < num_iommu_devices; i++)
	platform_device_unregister(omap_iommu_pdev[i]);
	}		}
	module_exit(omap_iommu_exit);		module_exit(omap_iommu_exit);

drivers/iommu/omap-iommu.c

+18 −5

Original line number	Original line	Diff line number	Diff line
	@@ -143,13 +143,23 @@ EXPORT_SYMBOL_GPL(omap_iommu_arch_version);
	static int iommu_enable(struct omap_iommu *obj)		static int iommu_enable(struct omap_iommu *obj)
	{		{
	int err;		int err;
			struct platform_device *pdev = to_platform_device(obj->dev);
			struct iommu_platform_data *pdata = pdev->dev.platform_data;

	if (!obj)		if (!obj \|\| !pdata)
	return -EINVAL;		return -EINVAL;

	if (!arch_iommu)		if (!arch_iommu)
	return -ENODEV;		return -ENODEV;

			if (pdata->deassert_reset) {
			err = pdata->deassert_reset(pdev, pdata->reset_name);
			if (err) {
			dev_err(obj->dev, "deassert_reset failed: %d\n", err);
			return err;
			}
			}

	clk_enable(obj->clk);		clk_enable(obj->clk);

	err = arch_iommu->enable(obj);		err = arch_iommu->enable(obj);
	@@ -159,12 +169,18 @@ static int iommu_enable(struct omap_iommu *obj)

	static void iommu_disable(struct omap_iommu *obj)		static void iommu_disable(struct omap_iommu *obj)
	{		{
	if (!obj)		struct platform_device *pdev = to_platform_device(obj->dev);
			struct iommu_platform_data *pdata = pdev->dev.platform_data;

			if (!obj \|\| !pdata)
	return;		return;

	arch_iommu->disable(obj);		arch_iommu->disable(obj);

	clk_disable(obj->clk);		clk_disable(obj->clk);

			if (pdata->assert_reset)
			pdata->assert_reset(pdev, pdata->reset_name);
	}		}

	/*		/*
	@@ -926,9 +942,6 @@ static int __devinit omap_iommu_probe(struct platform_device *pdev)
	struct resource *res;		struct resource *res;
	struct iommu_platform_data *pdata = pdev->dev.platform_data;		struct iommu_platform_data *pdata = pdev->dev.platform_data;

	if (pdev->num_resources != 2)
	return -EINVAL;

	obj = kzalloc(sizeof(*obj) + MMU_REG_SIZE, GFP_KERNEL);		obj = kzalloc(sizeof(*obj) + MMU_REG_SIZE, GFP_KERNEL);
	if (!obj)		if (!obj)
	return -ENOMEM;		return -ENOMEM;

drivers/iommu/omap-iommu2.c

+0 −19

Original line number	Original line	Diff line number	Diff line
	@@ -35,12 +35,8 @@
	#define MMU_SYS_IDLE_SMART (2 << MMU_SYS_IDLE_SHIFT)		#define MMU_SYS_IDLE_SMART (2 << MMU_SYS_IDLE_SHIFT)
	#define MMU_SYS_IDLE_MASK (3 << MMU_SYS_IDLE_SHIFT)		#define MMU_SYS_IDLE_MASK (3 << MMU_SYS_IDLE_SHIFT)

	#define MMU_SYS_SOFTRESET (1 << 1)
	#define MMU_SYS_AUTOIDLE 1		#define MMU_SYS_AUTOIDLE 1

	/* SYSSTATUS */
	#define MMU_SYS_RESETDONE 1

	/* IRQSTATUS & IRQENABLE */		/* IRQSTATUS & IRQENABLE */
	#define MMU_IRQ_MULTIHITFAULT (1 << 4)		#define MMU_IRQ_MULTIHITFAULT (1 << 4)
	#define MMU_IRQ_TABLEWALKFAULT (1 << 3)		#define MMU_IRQ_TABLEWALKFAULT (1 << 3)
	@@ -97,7 +93,6 @@ static void __iommu_set_twl(struct omap_iommu *obj, bool on)
	static int omap2_iommu_enable(struct omap_iommu *obj)		static int omap2_iommu_enable(struct omap_iommu *obj)
	{		{
	u32 l, pa;		u32 l, pa;
	unsigned long timeout;

	if (!obj->iopgd \|\| !IS_ALIGNED((u32)obj->iopgd, SZ_16K))		if (!obj->iopgd \|\| !IS_ALIGNED((u32)obj->iopgd, SZ_16K))
	return -EINVAL;		return -EINVAL;
	@@ -106,20 +101,6 @@ static int omap2_iommu_enable(struct omap_iommu *obj)
	if (!IS_ALIGNED(pa, SZ_16K))		if (!IS_ALIGNED(pa, SZ_16K))
	return -EINVAL;		return -EINVAL;

	iommu_write_reg(obj, MMU_SYS_SOFTRESET, MMU_SYSCONFIG);

	timeout = jiffies + msecs_to_jiffies(20);
	do {
	l = iommu_read_reg(obj, MMU_SYSSTATUS);
	if (l & MMU_SYS_RESETDONE)
	break;
	} while (!time_after(jiffies, timeout));

	if (!(l & MMU_SYS_RESETDONE)) {
	dev_err(obj->dev, "can't take mmu out of reset\n");
	return -ENODEV;
	}

	l = iommu_read_reg(obj, MMU_REVISION);		l = iommu_read_reg(obj, MMU_REVISION);
	dev_info(obj->dev, "%s: version %d.%d\n", obj->name,		dev_info(obj->dev, "%s: version %d.%d\n", obj->name,
	(l >> 4) & 0xf, l & 0xf);		(l >> 4) & 0xf, l & 0xf);

include/linux/platform_data/iommu-omap.h

+7 −1

Original line number	Original line	Diff line number	Diff line
	@@ -10,6 +10,8 @@
	* published by the Free Software Foundation.		* published by the Free Software Foundation.
	*/		*/

			#include <linux/platform_device.h>

	#define MMU_REG_SIZE 256		#define MMU_REG_SIZE 256

	/**		/**
	@@ -43,7 +45,11 @@ struct omap_mmu_dev_attr {
	struct iommu_platform_data {		struct iommu_platform_data {
	const char *name;		const char *name;
	const char *clk_name;		const char *clk_name;
	const int nr_tlb_entries;		const char *reset_name;
			int nr_tlb_entries;
	u32 da_start;		u32 da_start;
	u32 da_end;		u32 da_end;

			int (assert_reset)(struct platform_device pdev, const char *name);
			int (deassert_reset)(struct platform_device pdev, const char *name);
	};		};

Admin message