iommu: Revive device_group iommu-ops call-back
That call-back is currently unused, change it into a call-back function for finding the right IOMMU group for a device. This is a first step to remove the hard-coded PCI dependency in the iommu-group code. Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
parent
876945dbf6
commit
46c6b2bc88
2 changed files with 7 additions and 4 deletions
|
@ -814,6 +814,7 @@ static struct iommu_group *iommu_group_get_for_pci_dev(struct pci_dev *pdev)
|
||||||
*/
|
*/
|
||||||
struct iommu_group *iommu_group_get_for_dev(struct device *dev)
|
struct iommu_group *iommu_group_get_for_dev(struct device *dev)
|
||||||
{
|
{
|
||||||
|
const struct iommu_ops *ops = dev->bus->iommu_ops;
|
||||||
struct iommu_group *group;
|
struct iommu_group *group;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
@ -821,10 +822,12 @@ struct iommu_group *iommu_group_get_for_dev(struct device *dev)
|
||||||
if (group)
|
if (group)
|
||||||
return group;
|
return group;
|
||||||
|
|
||||||
if (!dev_is_pci(dev))
|
group = ERR_PTR(-EINVAL);
|
||||||
return ERR_PTR(-EINVAL);
|
|
||||||
|
|
||||||
group = iommu_group_get_for_pci_dev(to_pci_dev(dev));
|
if (ops && ops->device_group)
|
||||||
|
group = ops->device_group(dev);
|
||||||
|
else if (dev_is_pci(dev))
|
||||||
|
group = iommu_group_get_for_pci_dev(to_pci_dev(dev));
|
||||||
|
|
||||||
if (IS_ERR(group))
|
if (IS_ERR(group))
|
||||||
return group;
|
return group;
|
||||||
|
|
|
@ -168,7 +168,7 @@ struct iommu_ops {
|
||||||
phys_addr_t (*iova_to_phys)(struct iommu_domain *domain, dma_addr_t iova);
|
phys_addr_t (*iova_to_phys)(struct iommu_domain *domain, dma_addr_t iova);
|
||||||
int (*add_device)(struct device *dev);
|
int (*add_device)(struct device *dev);
|
||||||
void (*remove_device)(struct device *dev);
|
void (*remove_device)(struct device *dev);
|
||||||
int (*device_group)(struct device *dev, unsigned int *groupid);
|
struct iommu_group *(*device_group)(struct device *dev);
|
||||||
int (*domain_get_attr)(struct iommu_domain *domain,
|
int (*domain_get_attr)(struct iommu_domain *domain,
|
||||||
enum iommu_attr attr, void *data);
|
enum iommu_attr attr, void *data);
|
||||||
int (*domain_set_attr)(struct iommu_domain *domain,
|
int (*domain_set_attr)(struct iommu_domain *domain,
|
||||||
|
|
Loading…
Reference in a new issue