mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-03 07:38:10 +00:00
iommu: add new iommu_ops callback for adding an OF device
This patch adds a new function to the iommu_ops structure to allow an OF device to be added to a specific IOMMU instance using the recently merged generic devicetree binding for IOMMUs. The callback (of_xlate) takes a struct device representing the master and an of_phandle_args representing the IOMMU and the correspondong IDs for the new master. Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Joerg Roedel <jroedel@suse.de> Acked-by: Marek Szyprowski <m.szyprowski@samsung.com> Tested-by: Robin Murphy <robin.murphy@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
This commit is contained in:
parent
a3a60f81ee
commit
d0f60a44f5
1 changed files with 6 additions and 0 deletions
|
@ -21,6 +21,7 @@
|
||||||
|
|
||||||
#include <linux/errno.h>
|
#include <linux/errno.h>
|
||||||
#include <linux/err.h>
|
#include <linux/err.h>
|
||||||
|
#include <linux/of.h>
|
||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
#include <trace/events/iommu.h>
|
#include <trace/events/iommu.h>
|
||||||
|
|
||||||
|
@ -102,6 +103,7 @@ enum iommu_attr {
|
||||||
* @remove_device: remove device from iommu grouping
|
* @remove_device: remove device from iommu grouping
|
||||||
* @domain_get_attr: Query domain attributes
|
* @domain_get_attr: Query domain attributes
|
||||||
* @domain_set_attr: Change domain attributes
|
* @domain_set_attr: Change domain attributes
|
||||||
|
* @of_xlate: add OF master IDs to iommu grouping
|
||||||
* @pgsize_bitmap: bitmap of supported page sizes
|
* @pgsize_bitmap: bitmap of supported page sizes
|
||||||
* @priv: per-instance data private to the iommu driver
|
* @priv: per-instance data private to the iommu driver
|
||||||
*/
|
*/
|
||||||
|
@ -133,6 +135,10 @@ struct iommu_ops {
|
||||||
/* Get the numer of window per domain */
|
/* Get the numer of window per domain */
|
||||||
u32 (*domain_get_windows)(struct iommu_domain *domain);
|
u32 (*domain_get_windows)(struct iommu_domain *domain);
|
||||||
|
|
||||||
|
#ifdef CONFIG_OF_IOMMU
|
||||||
|
int (*of_xlate)(struct device *dev, struct of_phandle_args *args);
|
||||||
|
#endif
|
||||||
|
|
||||||
unsigned long pgsize_bitmap;
|
unsigned long pgsize_bitmap;
|
||||||
void *priv;
|
void *priv;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue