iommu/omap: Add support for iommu-groups and 'struct iommu_device'
Joerg Roedel
maintainerv2 cover iommu/omap: Add support for iommu-groups and 'struct iommu_device'
Hi,
here is a small patch-set for the omap-iommu driver to make it use new features of the iommu-core. Please review.
Thanks,
Joerg
Changes since v1:
* Dropped patch 2 and moved device-link and group-handling to attach/detach_dev call-backs for now.
Joerg Roedel (4):
iommu/omap: Move data structures to omap-iommu.h iommu/omap: Set dev->archdata.iommu = NULL in omap_iommu_remove_device iommu/omap: Make use of 'struct iommu_device'
iommu/omap: Add iommu-group support
drivers/iommu/omap-iommu.c | 82 +++++++++++++++++++++++++------- drivers/iommu/omap-iommu.h | 35 ++++++++++++++ include/linux/platform_data/iommu-omap.h | 17 ------- 3 files changed, 101 insertions(+), 33 deletions(-)
Signature · 1 line
1.9.1
Joerg Roedel
maintainerPATCH v2 1/4 iommu/omap: Move data structures to omap-iommu.h
From: Joerg Roedel <[email protected]>
The internal data-structures are scattered over various header and C files. Consolidate them in omap-iommu.h.
--- drivers/iommu/omap-iommu.c | 16 ---------------- drivers/iommu/omap-iommu.h | 32 ++++++++++++++++++++++++++++++++ include/linux/platform_data/iommu-omap.h | 17 ----------------- 3 files changed, 32 insertions(+), 33 deletions(-)
drivers/iommu/omap-iommu.c +0 -16
@@ -42,22 +42,6 @@/* bitmap of the page sizes currently supported */ #define OMAP_IOMMU_PGSIZES (SZ_4K | SZ_64K | SZ_1M | SZ_16M) -/** -* struct omap_iommu_domain - omap iommu domain -* @pgtable: the page table -* @iommu_dev: an omap iommu device attached to this domain. only a single -* iommu device can be attached for now. -* @dev: Device using this domain. -* @lock: domain lock, should be taken when attaching/detaching -*/ -struct omap_iommu_domain { -u32 *pgtable; -struct omap_iommu *iommu_dev; -struct device *dev; -spinlock_t lock; -struct iommu_domain domain; -}; -#define MMU_LOCK_BASE_SHIFT 10#define MMU_LOCK_BASE_MASK (0x1f << MMU_LOCK_BASE_SHIFT)#define MMU_LOCK_BASE (x) \
drivers/iommu/omap-iommu.h +32 -0
@@ -14,6 +14,7 @@#define _OMAP_IOMMU_H#include <linux/bitops.h> +#include <linux/iommu.h> #define for_each_iotlb_cr (obj, n, __i, cr) \ for (__i = 0; \
@@ -27,6 +28,22 @@ struct iotlb_entry {u32 endian, elsz, mixed; }; +/** +* struct omap_iommu_domain - omap iommu domain +* @pgtable: the page table +* @iommu_dev: an omap iommu device attached to this domain. only a single +* iommu device can be attached for now. +* @dev: Device using this domain. +* @lock: domain lock, should be taken when attaching/detaching +*/ +struct omap_iommu_domain { +u32 *pgtable; +struct omap_iommu *iommu_dev; +struct device *dev; +spinlock_t lock; +struct iommu_domain domain; +}; +struct omap_iommu {const char *name;void __iomem *regbase;
@@ -52,6 +69,21 @@ struct omap_iommu {u32 id; }; +/** +* struct iommu_arch_data - omap iommu private data +* @name: name of the iommu device +* @iommu_dev: handle of the iommu device +* +* This is an omap iommu private data object, which binds an iommu user +* to its iommu device. This object should be placed at the iommu user's +* dev_archdata so generic IOMMU API can be used without having to +* utilize omap-specific plumbing anymore. +*/ +struct omap_iommu_arch_data { +const char *name; +struct omap_iommu *iommu_dev; +}; +struct cr_regs {u32 cam;u32 ram;
include/linux/platform_data/iommu-omap.h +0 -17
@@ -12,23 +12,6 @@#include <linux/platform_device.h> -#define MMU_REG_SIZE 256 - -/** -* struct iommu_arch_data - omap iommu private data -* @name: name of the iommu device -* @iommu_dev: handle of the iommu device -* -* This is an omap iommu private data object, which binds an iommu user -* to its iommu device. This object should be placed at the iommu user's -* dev_archdata so generic IOMMU API can be used without having to -* utilize omap-specific plumbing anymore. -*/ -struct omap_iommu_arch_data { -const char *name; -struct omap_iommu *iommu_dev; -}; -struct iommu_platform_data {const char *name;const char *reset_name;
Signature · 1 line
1.9.1
Re: [PATCH 1/4] iommu/omap: Move data structures to omap-iommu.h
Quoted 6 lines · Joerg Roedel
From: Joerg Roedel <[email protected]>
The internal data-structures are scattered over various header and C files. Consolidate them in
omap-iommu.h.Signed-off-by Joerg Roedel <[email protected]>
[snip]
Joerg Roedel
maintainerPATCH v2 2/4 iommu/omap: Set dev->archdata.iommu = NULL in omap_iommu_remove_device
In reply to Joerg RoedelFrom: Joerg Roedel <[email protected]>
Don't leave a stale pointer in case the device continues to exist for some more time.
--- drivers/iommu/omap-iommu.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/iommu/omap-iommu.c +2 -0
@@ -1259,6 +1259,8 @@ static void omap_iommu_remove_device(struct device *dev)if (!dev->of_node || !arch_data)return ; + dev->archdata.iommu =NULL ; +kfree (arch_data->name);kfree (arch_data); }
Signature · 1 line
1.9.1
Re: [PATCH 2/4] iommu/omap: Set dev->archdata.iommu = NULL in omap_iommu_remove_device
Quoted 6 lines · Joerg Roedel
From: Joerg Roedel <[email protected]>
Don't leave a stale pointer in case the device continues to exist for some more time.
Signed-off-by Joerg Roedel <[email protected]>
Quoted 18 lines
--- drivers/iommu/omap-iommu.c | 2 ++ 1 file changed, 2 insertions(+)drivers/iommu/omap-iommu.c +2
-0@@ -1259,6 +1259,8 @@ static void omap_iommu_remove_device(struct device *dev)if (!dev->of_node || !arch_data)return ; + dev->archdata.iommu =NULL ; +kfree (arch_data->name);kfree (arch_data); }
Joerg Roedel
maintainerPATCH v2 3/4 iommu/omap: Make use of 'struct iommu_device'
In reply to Joerg RoedelFrom: Joerg Roedel <[email protected]>
Modify the driver to register individual iommus and establish links between devices and iommus in sysfs.
--- drivers/iommu/omap-iommu.c | 25 +++++++++++++++++++++++++ drivers/iommu/omap-iommu.h | 2 ++ 2 files changed, 27 insertions(+)
drivers/iommu/omap-iommu.c +25 -0
@@ -36,6 +36,8 @@#include "omap-iopgtable.h" #include "omap-iommu.h" +static const struct iommu_ops omap_iommu_ops; +#define to_iommu (dev) \ ((struct omap_iommu *)platform_get_drvdata(to_platform_device(dev)))
@@ -963,6 +965,16 @@ static int omap_iommu_probe(struct platform_device *pdev)pm_runtime_irq_safe (obj->dev);pm_runtime_enable (obj->dev); + err =iommu_device_sysfs_add (&obj->iommu, obj->dev,NULL , obj->name); +if (err) +return err; + +iommu_device_set_ops (&obj->iommu, &omap_iommu_ops); + + err =iommu_device_register (&obj->iommu); +if (err) +return err; +omap_iommu_debugfs_add (obj);dev_info (&pdev->dev,"%s registered\n" , obj->name);
@@ -973,6 +985,9 @@ static int omap_iommu_remove(struct platform_device *pdev) {struct omap_iommu *obj =platform_get_drvdata (pdev); +iommu_device_sysfs_remove (&obj->iommu); +iommu_device_unregister (&obj->iommu); +omap_iommu_debugfs_remove (obj);pm_runtime_disable (obj->dev);
@@ -1087,6 +1102,12 @@ static size_t omap_iommu_unmap(struct iommu_domain *domain, unsigned long da, goto out; } + ret =iommu_device_link (&oiommu->iommu, dev); +if (ret) { +dev_err (dev,"can't link device to iommu\n" ); + goto out; + } + omap_domain->iommu_dev = arch_data->iommu_dev = oiommu; omap_domain->dev = dev; oiommu->domain = domain;
@@ -1121,8 +1142,11 @@ static void omap_iommu_detach_dev(struct iommu_domain *domain, struct device *dev) {struct omap_iommu_domain *omap_domain =to_omap_domain (domain); +struct omap_iommu_arch_data *arch_data = dev->archdata.iommu;spin_lock (&omap_domain->lock); +if (arch_data) +iommu_device_unlink (&arch_data->iommu_dev->iommu, dev);_omap_iommu_detach_dev (omap_domain, dev);spin_unlock (&omap_domain->lock); }
@@ -1263,6 +1287,7 @@ static void omap_iommu_remove_device(struct device *dev)kfree (arch_data->name);kfree (arch_data); + }static const struct iommu_ops omap_iommu_ops = {
drivers/iommu/omap-iommu.h +2 -0
@@ -67,6 +67,8 @@ struct omap_iommu {int has_bus_err_back;u32 id; + +struct iommu_device iommu; };/**
Signature · 1 line
1.9.1
Re: [PATCH 3/4] iommu/omap: Make use of 'struct iommu_device'
Hi Joerg,
Quoted 28 lines · Joerg Roedel
From: Joerg Roedel <[email protected]>
Modify the driver to register individual iommus and establish links between devices and iommus in sysfs.
Signed-off-by Joerg Roedel <[email protected]>--- drivers/iommu/omap-iommu.c | 25 +++++++++++++++++++++++++ drivers/iommu/omap-iommu.h | 2 ++ 2 files changed, 27 insertions(+)drivers/iommu/omap-iommu.c +2
-0@@ -36,6 +36,8 @@#include "omap-iopgtable.h" #include "omap-iommu.h" +static const struct iommu_ops omap_iommu_ops; +#define to_iommu (dev) \ ((struct omap_iommu *)platform_get_drvdata(to_platform_device(dev)))@@ -963,6 +965,16 @@ static int omap_iommu_probe(struct platform_device *pdev)pm_runtime_irq_safe (obj->dev);pm_runtime_enable (obj->dev);
drivers/iommu/omap-iommu.c static int omap_iommu_probe(struct platform_device *pdev) · line 977
Quoted 10 lines
drivers/iommu/omap-iommu.c +10
-0+ err =iommu_device_sysfs_add (&obj->iommu, obj->dev,NULL , obj->name); +if (err) +return err; + +iommu_device_set_ops (&obj->iommu, &omap_iommu_ops); + + err =iommu_device_register (&obj->iommu); +if (err) +return err; +
Some of the error cleanup from patch 4 can be moved here. Also, if you can move this to before the pm_runtime_ invocations above, the cleanup path can stay as in patch 4.
Quoted 14 lines
drivers/iommu/omap-iommu.c +3
-0omap_iommu_debugfs_add (obj);dev_info (&pdev->dev,"%s registered\n" , obj->name);@@ -973,6 +985,9 @@ static int omap_iommu_remove(struct platform_device *pdev) {struct omap_iommu *obj =platform_get_drvdata (pdev); +iommu_device_sysfs_remove (&obj->iommu); +iommu_device_unregister (&obj->iommu); +omap_iommu_debugfs_remove (obj);pm_runtime_disable (obj->dev);
drivers/iommu/omap-iommu.c static size_t omap_iommu_unmap(struct iommu_domain *domain, unsigned long da, · line 1108
Quoted 7 lines
drivers/iommu/omap-iommu.c +4
-0@@ -1087,6 +1102,12 @@ static size_t omap_iommu_unmap(struct iommu_domain *domain, unsigned long da, goto out; } + ret =iommu_device_link (&oiommu->iommu, dev); +if (ret) { +dev_err (dev,"can't link device to iommu\n" ); + goto out;
Will need to undo the omap_iommu_attach on failure here.
Quoted 18 lines
drivers/iommu/omap-iommu.c +5
-0+ } + omap_domain->iommu_dev = arch_data->iommu_dev = oiommu; omap_domain->dev = dev; oiommu->domain = domain;@@ -1121,8 +1142,11 @@ static void omap_iommu_detach_dev(struct iommu_domain *domain, struct device *dev) {struct omap_iommu_domain *omap_domain =to_omap_domain (domain); +struct omap_iommu_arch_data *arch_data = dev->archdata.iommu;spin_lock (&omap_domain->lock); +if (arch_data) +iommu_device_unlink (&arch_data->iommu_dev->iommu, dev);_omap_iommu_detach_dev (omap_domain, dev);spin_unlock (&omap_domain->lock); }
drivers/iommu/omap-iommu.c static void omap_iommu_remove_device(struct device *dev) · line 1290
Quoted 4 lines
drivers/iommu/omap-iommu.c +1
-0@@ -1263,6 +1287,7 @@ static void omap_iommu_remove_device(struct device *dev)kfree (arch_data->name);kfree (arch_data); +
stale blank line
regards
Suman
Quoted 17 lines
drivers/iommu/omap-iommu.c +0
-0}static const struct iommu_ops omap_iommu_ops = {drivers/iommu/omap-iommu.h +2
-0@@ -67,6 +67,8 @@ struct omap_iommu {int has_bus_err_back;u32 id; + +struct iommu_device iommu; };/**
Joerg Roedel
maintainerPATCH v2 4/4 iommu/omap: Add iommu-group support
In reply to Joerg RoedelFrom: Joerg Roedel <[email protected]>
Support for IOMMU groups will become mandatory for drivers, so add it to the omap iommu driver.
--- drivers/iommu/omap-iommu.c | 43 +++++++++++++++++++++++++++++++++++++++++-- drivers/iommu/omap-iommu.h | 1 + 2 files changed, 42 insertions(+), 2 deletions(-)
drivers/iommu/omap-iommu.c +41 -2
@@ -965,26 +965,42 @@ static int omap_iommu_probe(struct platform_device *pdev)pm_runtime_irq_safe (obj->dev);pm_runtime_enable (obj->dev); + obj->group =iommu_group_alloc (); +if (IS_ERR (obj->group)) +return PTR_ERR (obj->group); + err =iommu_device_sysfs_add (&obj->iommu, obj->dev,NULL , obj->name);if (err) -return err; + goto out_group;iommu_device_set_ops (&obj->iommu, &omap_iommu_ops); err =iommu_device_register (&obj->iommu);if (err) -return err; + goto out_sysfs;omap_iommu_debugfs_add (obj);dev_info (&pdev->dev,"%s registered\n" , obj->name); +return 0 ; + +out_sysfs: +iommu_device_sysfs_remove (&obj->iommu); + +out_group: +iommu_group_put (obj->group); + +return err; }static int omap_iommu_remove (struct platform_device *pdev) {struct omap_iommu *obj =platform_get_drvdata (pdev); +iommu_group_put (obj->group); + obj->group =NULL ; +iommu_device_sysfs_remove (&obj->iommu);iommu_device_unregister (&obj->iommu);
@@ -1078,6 +1094,7 @@ static size_t omap_iommu_unmap(struct iommu_domain *domain, unsigned long da,struct omap_iommu_domain *omap_domain =to_omap_domain (domain);struct omap_iommu *oiommu;struct omap_iommu_arch_data *arch_data = dev->archdata.iommu; +struct iommu_group *group;int ret =0 ;if (!arch_data || !arch_data->name) {
@@ -1108,6 +1125,15 @@ static size_t omap_iommu_unmap(struct iommu_domain *domain, unsigned long da, goto out; } +/* +* IOMMU group initialization calls into omap_device_group, which needs +* a valid dev->archdata.iommu pointer +*/ + group =iommu_group_get_for_dev (dev); +if (IS_ERR (group)) +return PTR_ERR (group); +iommu_group_put (group); + omap_domain->iommu_dev = arch_data->iommu_dev = oiommu; omap_domain->dev = dev; oiommu->domain = domain;
@@ -1145,6 +1171,7 @@ static void omap_iommu_detach_dev(struct iommu_domain *domain,struct omap_iommu_arch_data *arch_data = dev->archdata.iommu;spin_lock (&omap_domain->lock); +iommu_group_remove_device (dev);if (arch_data)iommu_device_unlink (&arch_data->iommu_dev->iommu, dev);_omap_iommu_detach_dev (omap_domain, dev);
@@ -1290,6 +1317,17 @@ static void omap_iommu_remove_device(struct device *dev) } +static struct iommu_group *omap_device_group (struct device *dev) +{ +struct omap_iommu_arch_data *arch_data = dev->archdata.iommu; +struct iommu_group *group =NULL ; + +if (arch_data->iommu_dev) + group = arch_data->iommu_dev->group; + +return group; +} +static const struct iommu_ops omap_iommu_ops = { .domain_alloc = omap_iommu_domain_alloc, .domain_free = omap_iommu_domain_free,
@@ -1301,6 +1339,7 @@ static void omap_iommu_remove_device(struct device *dev) .iova_to_phys = omap_iommu_iova_to_phys, .add_device = omap_iommu_add_device, .remove_device = omap_iommu_remove_device, + .device_group = omap_device_group, .pgsize_bitmap = OMAP_IOMMU_PGSIZES, };
drivers/iommu/omap-iommu.h +1 -0
@@ -69,6 +69,7 @@ struct omap_iommu {u32 id;struct iommu_device iommu; +struct iommu_group *group; };/**
Signature · 1 line
1.9.1
Re: [PATCH 4/4] iommu/omap: Add iommu-group support
Hi Joerg,
This patch is still causing couple of issues.
Adding Laurent and Sakari to the thread as we do have the OMAP3ISP driver which would need some changes once the iommu groups are implemented in the OMAP IOMMU driver. The OMAP3 ISP driver (drivers/media/platform/omap3isp/isp.c) is currently using the iommu_group API.
Quoted 16 lines · Joerg Roedel
From: Joerg Roedel <[email protected]>
Support for IOMMU groups will become mandatory for drivers, so add it to the omap iommu driver.
Signed-off-by Joerg Roedel <[email protected]>--- drivers/iommu/omap-iommu.c | 43 +++++++++++++++++++++++++++++++++++++++++-- drivers/iommu/omap-iommu.h | 1 + 2 files changed, 42 insertions(+), 2 deletions(-)drivers/iommu/omap-iommu.c +0
-0
drivers/iommu/omap-iommu.c static int omap_iommu_probe(struct platform_device *pdev) · line 971
Quoted 7 lines
drivers/iommu/omap-iommu.c +4
-0@@ -965,26 +965,42 @@ static int omap_iommu_probe(struct platform_device *pdev)pm_runtime_irq_safe (obj->dev);pm_runtime_enable (obj->dev); + obj->group =iommu_group_alloc (); +if (IS_ERR (obj->group)) +return PTR_ERR (obj->group); +
Similar comment as in patch 3, PM runtime status is not handled during cleanup. Moving this block above the pm_runtime API should avoid handling the cleanup scenarios.
drivers/iommu/omap-iommu.c static int omap_iommu_probe(struct platform_device *pdev) · line 980
Quoted 11 lines
drivers/iommu/omap-iommu.c +2
-2err =iommu_device_sysfs_add (&obj->iommu, obj->dev,NULL , obj->name);if (err) -return err; + goto out_group;iommu_device_set_ops (&obj->iommu, &omap_iommu_ops); err =iommu_device_register (&obj->iommu);if (err) -return err; + goto out_sysfs;
Some of this cleanup should be part of Patch 3.
Quoted 37 lines
drivers/iommu/omap-iommu.c +13
-0omap_iommu_debugfs_add (obj);dev_info (&pdev->dev,"%s registered\n" , obj->name); +return 0 ; + +out_sysfs: +iommu_device_sysfs_remove (&obj->iommu); + +out_group: +iommu_group_put (obj->group); + +return err; }static int omap_iommu_remove (struct platform_device *pdev) {struct omap_iommu *obj =platform_get_drvdata (pdev); +iommu_group_put (obj->group); + obj->group =NULL ; +iommu_device_sysfs_remove (&obj->iommu);iommu_device_unregister (&obj->iommu);@@ -1078,6 +1094,7 @@ static size_t omap_iommu_unmap(struct iommu_domain *domain, unsigned long da,struct omap_iommu_domain *omap_domain =to_omap_domain (domain);struct omap_iommu *oiommu;struct omap_iommu_arch_data *arch_data = dev->archdata.iommu; +struct iommu_group *group;int ret =0 ;if (!arch_data || !arch_data->name) {@@ -1108,6 +1125,15 @@ static size_t omap_iommu_unmap(struct iommu_domain *domain, unsigned long da, goto out; }
drivers/iommu/omap-iommu.c static size_t omap_iommu_unmap(struct iommu_domain *domain, unsigned long da, · line 1136
Quoted 10 lines
drivers/iommu/omap-iommu.c +9
-0+/* +* IOMMU group initialization calls into omap_device_group, which needs +* a valid dev->archdata.iommu pointer +*/ + group =iommu_group_get_for_dev (dev); +if (IS_ERR (group)) +return PTR_ERR (group); +iommu_group_put (group); +
The arch_data->iommu_dev is not initialized yet here, so omap_device_group returns NULL and iommu_group_get_for_dev crashes due to a NULL pointer dereference.
drivers/iommu/omap-iommu.c static size_t omap_iommu_unmap(struct iommu_domain *domain, unsigned long da, · line 1139
Quoted 3 lines
drivers/iommu/omap-iommu.c +0
-0omap_domain->iommu_dev = arch_data->iommu_dev = oiommu; omap_domain->dev = dev; oiommu->domain = domain;
I tested it by moving it down here, in which case the attach_dev passes and I can program the IOMMU for the client devices. But during removal, I get a dependency deadlock between the iommu_group's lock and the OMAP domain's lock due to the different paths taken during iommu_attach_device() and iommu_detach_device().
regards
Suman
Quoted 47 lines
drivers/iommu/omap-iommu.c +13
-0@@ -1145,6 +1171,7 @@ static void omap_iommu_detach_dev(struct iommu_domain *domain,struct omap_iommu_arch_data *arch_data = dev->archdata.iommu;spin_lock (&omap_domain->lock); +iommu_group_remove_device (dev);if (arch_data)iommu_device_unlink (&arch_data->iommu_dev->iommu, dev);_omap_iommu_detach_dev (omap_domain, dev);@@ -1290,6 +1317,17 @@ static void omap_iommu_remove_device(struct device *dev) } +static struct iommu_group *omap_device_group (struct device *dev) +{ +struct omap_iommu_arch_data *arch_data = dev->archdata.iommu; +struct iommu_group *group =NULL ; + +if (arch_data->iommu_dev) + group = arch_data->iommu_dev->group; + +return group; +} +static const struct iommu_ops omap_iommu_ops = { .domain_alloc = omap_iommu_domain_alloc, .domain_free = omap_iommu_domain_free,@@ -1301,6 +1339,7 @@ static void omap_iommu_remove_device(struct device *dev) .iova_to_phys = omap_iommu_iova_to_phys, .add_device = omap_iommu_add_device, .remove_device = omap_iommu_remove_device, + .device_group = omap_device_group, .pgsize_bitmap = OMAP_IOMMU_PGSIZES, };drivers/iommu/omap-iommu.h +1
-0@@ -69,6 +69,7 @@ struct omap_iommu {u32 id;struct iommu_device iommu; +struct iommu_group *group; };/**