iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iommu/arm-smmu: Switch to device_group call-back

Browse Source 
This converts the ARM SMMU and the SMMUv3 driver to use the
new device_group call-back.

Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Joerg Roedel 2015-10-21 23:51:41 +02:00
parent d5e5829715
commit af65993224
2 changed files with 47 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/iommu/arm-smmu-v3.c
View File

@ -1898,6 +1898,7 @@ static struct iommu_ops arm_smmu_ops = {
.iova_to_phys = arm_smmu_iova_to_phys, .iova_to_phys = arm_smmu_iova_to_phys,
.add_device = arm_smmu_add_device, .add_device = arm_smmu_add_device,
.remove_device = arm_smmu_remove_device, .remove_device = arm_smmu_remove_device,
.device_group = pci_device_group,
.domain_get_attr = arm_smmu_domain_get_attr, .domain_get_attr = arm_smmu_domain_get_attr,
.domain_set_attr = arm_smmu_domain_set_attr, .domain_set_attr = arm_smmu_domain_set_attr,
.pgsize_bitmap = -1UL, /* Restricted during device attach */ .pgsize_bitmap = -1UL, /* Restricted during device attach */

77
drivers/iommu/arm-smmu.c
View File

@ -1292,33 +1292,25 @@ static void __arm_smmu_release_pci_iommudata(void *data)
kfree(data); kfree(data);
} }
static int arm_smmu_add_pci_device(struct pci_dev *pdev) static int arm_smmu_init_pci_device(struct pci_dev *pdev,
struct iommu_group *group)
{ {
int i, ret;
u16 sid;
struct iommu_group *group;
struct arm_smmu_master_cfg *cfg; struct arm_smmu_master_cfg *cfg;
u16 sid;
group = iommu_group_get_for_dev(&pdev->dev); int i;
if (IS_ERR(group))
return PTR_ERR(group);
cfg = iommu_group_get_iommudata(group); cfg = iommu_group_get_iommudata(group);
if (!cfg) { if (!cfg) {
cfg = kzalloc(sizeof(*cfg), GFP_KERNEL); cfg = kzalloc(sizeof(*cfg), GFP_KERNEL);
if (!cfg) { if (!cfg)
ret = -ENOMEM; return -ENOMEM;
goto out_put_group;
}
iommu_group_set_iommudata(group, cfg, iommu_group_set_iommudata(group, cfg,
__arm_smmu_release_pci_iommudata); __arm_smmu_release_pci_iommudata);
} }
if (cfg->num_streamids >= MAX_MASTER_STREAMIDS) { if (cfg->num_streamids >= MAX_MASTER_STREAMIDS)
ret = -ENOSPC; return -ENOSPC;
goto out_put_group;
}
/* /*
* Assume Stream ID == Requester ID for now. * Assume Stream ID == Requester ID for now.
@ -1334,16 +1326,13 @@ static int arm_smmu_add_pci_device(struct pci_dev *pdev)
cfg->streamids[cfg->num_streamids++] = sid; cfg->streamids[cfg->num_streamids++] = sid;
return 0; return 0;
out_put_group:
iommu_group_put(group);
return ret;
} }
static int arm_smmu_add_platform_device(struct device *dev) static int arm_smmu_init_platform_device(struct device *dev,
struct iommu_group *group)
{ {
struct iommu_group *group;
struct arm_smmu_master *master;
struct arm_smmu_device *smmu = find_smmu_for_device(dev); struct arm_smmu_device *smmu = find_smmu_for_device(dev);
struct arm_smmu_master *master;
if (!smmu) if (!smmu)
return -ENODEV; return -ENODEV;
@ -1352,21 +1341,20 @@ static int arm_smmu_add_platform_device(struct device *dev)
if (!master) if (!master)
return -ENODEV; return -ENODEV;
/* No automatic group creation for platform devices */
group = iommu_group_alloc();
if (IS_ERR(group))
return PTR_ERR(group);
iommu_group_set_iommudata(group, &master->cfg, NULL); iommu_group_set_iommudata(group, &master->cfg, NULL);
return iommu_group_add_device(group, dev);
return 0;
} }
static int arm_smmu_add_device(struct device *dev) static int arm_smmu_add_device(struct device *dev)
{ {
if (dev_is_pci(dev)) struct iommu_group *group;
return arm_smmu_add_pci_device(to_pci_dev(dev));
return arm_smmu_add_platform_device(dev); group = iommu_group_get_for_dev(dev);
if (IS_ERR(group))
return PTR_ERR(group);
return 0;
} }
static void arm_smmu_remove_device(struct device *dev) static void arm_smmu_remove_device(struct device *dev)
@ -1374,6 +1362,32 @@ static void arm_smmu_remove_device(struct device *dev)
iommu_group_remove_device(dev); iommu_group_remove_device(dev);
} }
static struct iommu_group *arm_smmu_device_group(struct device *dev)
{
struct iommu_group *group;
int ret;
if (dev_is_pci(dev))
group = pci_device_group(dev);
else
group = generic_device_group(dev);
if (IS_ERR(group))
return group;
if (dev_is_pci(dev))
ret = arm_smmu_init_pci_device(to_pci_dev(dev), group);
else
ret = arm_smmu_init_platform_device(dev, group);
if (ret) {
iommu_group_put(group);
group = ERR_PTR(ret);
}
return group;
}
static int arm_smmu_domain_get_attr(struct iommu_domain *domain, static int arm_smmu_domain_get_attr(struct iommu_domain *domain,
enum iommu_attr attr, void *data) enum iommu_attr attr, void *data)
{ {
@ -1430,6 +1444,7 @@ static struct iommu_ops arm_smmu_ops = {
.iova_to_phys = arm_smmu_iova_to_phys, .iova_to_phys = arm_smmu_iova_to_phys,
.add_device = arm_smmu_add_device, .add_device = arm_smmu_add_device,
.remove_device = arm_smmu_remove_device, .remove_device = arm_smmu_remove_device,
.device_group = arm_smmu_device_group,
.domain_get_attr = arm_smmu_domain_get_attr, .domain_get_attr = arm_smmu_domain_get_attr,
.domain_set_attr = arm_smmu_domain_set_attr, .domain_set_attr = arm_smmu_domain_set_attr,
.pgsize_bitmap = -1UL, /* Restricted during device attach */ .pgsize_bitmap = -1UL, /* Restricted during device attach */