Message ID | 1409327670-3495-4-git-send-email-will.deacon@arm.com |
---|---|
State | New |
Headers | show |
On Fri, Aug 29, 2014 at 04:54:26PM +0100, Will Deacon wrote: > This patch adds a new function to the iommu_ops structure to allow a > device to be added to a specific IOMMU instance along with a set of > opaque IDs that are used internally by the IOMMU for identifying and > configuring translations. > > Signed-off-by: Will Deacon <will.deacon@arm.com> > --- > include/linux/iommu.h | 2 ++ > 1 file changed, 2 insertions(+) I don't really see the point of this new callback. As I understand it, the strength of the current .add_device() callback is that it uses only the struct device and figures out which exact IOMMU to associate it with in case there are multiple IOMMUs. Although that doesn't seem to be the general case either. That's really been one of the difficulties in dealing with IOMMU. Every driver seems to do things very differently and the IOMMU subsystem itself is fairly different from other subsystems too. > diff --git a/include/linux/iommu.h b/include/linux/iommu.h > index 20f9a527922a..3dd1b99c4542 100644 > --- a/include/linux/iommu.h > +++ b/include/linux/iommu.h > @@ -114,6 +114,8 @@ struct iommu_ops { > int (*domain_has_cap)(struct iommu_domain *domain, > unsigned long cap); > int (*add_device)(struct device *dev); > + int (*add_device_master_ids)(struct device *dev, int count, u32 *ids, > + void *data); If we want to pass around IOMMU instances I think we should make them proper objects rather than some loosely specified void *. Also the generic IOMMU binding doesn't require the IOMMU specifier to contain master IDs. So this seems to be a callback that would only be used by a restricted set of IOMMUs. Thierry
On Monday 01 September 2014 10:13:22 Thierry Reding wrote: > On Fri, Aug 29, 2014 at 04:54:26PM +0100, Will Deacon wrote: > > This patch adds a new function to the iommu_ops structure to allow a > > device to be added to a specific IOMMU instance along with a set of > > opaque IDs that are used internally by the IOMMU for identifying and > > configuring translations. > > > > Signed-off-by: Will Deacon <will.deacon@arm.com> > > --- > > include/linux/iommu.h | 2 ++ > > 1 file changed, 2 insertions(+) > > I don't really see the point of this new callback. As I understand it, > the strength of the current .add_device() callback is that it uses only > the struct device and figures out which exact IOMMU to associate it with > in case there are multiple IOMMUs. > > Although that doesn't seem to be the general case either. That's really > been one of the difficulties in dealing with IOMMU. Every driver seems > to do things very differently and the IOMMU subsystem itself is fairly > different from other subsystems too. The problem with add_device is that it assumes that each bus_type only has one IOMMU instance, and that we know which one that is. Current implementations do more or less nasty hacks to work around this where necessary, and we should try to remove those hacks rather than adding more of them into future drivers. A smaller issue with the add_device callback is the point at which it gets called: the caller is in the bus_notifier when the device gets added, but at a time when we don't have access to the bus-specific information. > > diff --git a/include/linux/iommu.h b/include/linux/iommu.h > > index 20f9a527922a..3dd1b99c4542 100644 > > --- a/include/linux/iommu.h > > +++ b/include/linux/iommu.h > > @@ -114,6 +114,8 @@ struct iommu_ops { > > int (*domain_has_cap)(struct iommu_domain *domain, > > unsigned long cap); > > int (*add_device)(struct device *dev); > > + int (*add_device_master_ids)(struct device *dev, int count, u32 *ids, > > + void *data); > > If we want to pass around IOMMU instances I think we should make them > proper objects rather than some loosely specified void *. Agreed. > Also the generic IOMMU binding doesn't require the IOMMU specifier to > contain master IDs. So this seems to be a callback that would only be > used by a restricted set of IOMMUs. No, it should be used by all of them, but we might be passing empty arguments. Arnd
On Mon, Sep 01, 2014 at 03:39:16PM +0100, Arnd Bergmann wrote: > On Monday 01 September 2014 10:13:22 Thierry Reding wrote: > > On Fri, Aug 29, 2014 at 04:54:26PM +0100, Will Deacon wrote: > > > diff --git a/include/linux/iommu.h b/include/linux/iommu.h > > > index 20f9a527922a..3dd1b99c4542 100644 > > > --- a/include/linux/iommu.h > > > +++ b/include/linux/iommu.h > > > @@ -114,6 +114,8 @@ struct iommu_ops { > > > int (*domain_has_cap)(struct iommu_domain *domain, > > > unsigned long cap); > > > int (*add_device)(struct device *dev); > > > + int (*add_device_master_ids)(struct device *dev, int count, u32 *ids, > > > + void *data); > > > > If we want to pass around IOMMU instances I think we should make them > > proper objects rather than some loosely specified void *. > > Agreed. For OF, this data argument is the data field of the device_node for the IOMMU. That's private to the corresponding IOMMU driver and I don't see what we gain by making that a generic structure. It's likely going to represent some internal driver data structures anyway, so that the IDs can be recorded in the relevant place and for the relevant group etc. In other words, I have no idea what a generic data structure would look like for this. > > Also the generic IOMMU binding doesn't require the IOMMU specifier to > > contain master IDs. So this seems to be a callback that would only be > > used by a restricted set of IOMMUs. > > No, it should be used by all of them, but we might be passing empty > arguments. Yup; I'd hope to remove/replace the add_device callback in the future, but that's a lot of work right now. Will
On Monday 01 September 2014 17:34:00 Will Deacon wrote: > On Mon, Sep 01, 2014 at 03:39:16PM +0100, Arnd Bergmann wrote: > > On Monday 01 September 2014 10:13:22 Thierry Reding wrote: > > > On Fri, Aug 29, 2014 at 04:54:26PM +0100, Will Deacon wrote: > > > > diff --git a/include/linux/iommu.h b/include/linux/iommu.h > > > > index 20f9a527922a..3dd1b99c4542 100644 > > > > --- a/include/linux/iommu.h > > > > +++ b/include/linux/iommu.h > > > > @@ -114,6 +114,8 @@ struct iommu_ops { > > > > int (*domain_has_cap)(struct iommu_domain *domain, > > > > unsigned long cap); > > > > int (*add_device)(struct device *dev); > > > > + int (*add_device_master_ids)(struct device *dev, int count, u32 *ids, > > > > + void *data); > > > > > > If we want to pass around IOMMU instances I think we should make them > > > proper objects rather than some loosely specified void *. > > > > Agreed. > > For OF, this data argument is the data field of the device_node for the > IOMMU. That's private to the corresponding IOMMU driver and I don't see > what we gain by making that a generic structure. It's likely going to > represent some internal driver data structures anyway, so that the IDs can > be recorded in the relevant place and for the relevant group etc. > > In other words, I have no idea what a generic data structure would look > like for this. Something like struct iommu { struct device *dev; const struct iommu_ops *ops; struct list_head domains; void *private; }; There are probably a few more fields we will need in the long run. Arnd
diff --git a/include/linux/iommu.h b/include/linux/iommu.h index 20f9a527922a..3dd1b99c4542 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -114,6 +114,8 @@ struct iommu_ops { int (*domain_has_cap)(struct iommu_domain *domain, unsigned long cap); int (*add_device)(struct device *dev); + int (*add_device_master_ids)(struct device *dev, int count, u32 *ids, + void *data); void (*remove_device)(struct device *dev); int (*device_group)(struct device *dev, unsigned int *groupid); int (*domain_get_attr)(struct iommu_domain *domain,
This patch adds a new function to the iommu_ops structure to allow a device to be added to a specific IOMMU instance along with a set of opaque IDs that are used internally by the IOMMU for identifying and configuring translations. Signed-off-by: Will Deacon <will.deacon@arm.com> --- include/linux/iommu.h | 2 ++ 1 file changed, 2 insertions(+)