mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

iommu: Move more initialization to __iommu_probe_device() 

Move the calls to dev_iommu_get() and try_module_get() into
__iommu_probe_device(), so that the callers don't have to do it on
their own.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
Link: https://lore.kernel.org/r/20200429133712.31431-34-joro@8bytes.org
Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Joerg Roedel 2020-04-29 15:37:11 +02:00
parent 3eeeb45c6d
commit 4e8906f0d8
1 changed files with 18 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
drivers/iommu/iommu.c
View File

@ -194,9 +194,19 @@ static int __iommu_probe_device(struct device *dev, struct list_head *group_list
struct iommu_group *group;
int ret;
if (!dev_iommu_get(dev))
return -ENOMEM;
if (!try_module_get(ops->owner)) {
ret = -EINVAL;
goto err_free;
}
iommu_dev = ops->probe_device(dev);
if (IS_ERR(iommu_dev))
return PTR_ERR(iommu_dev);
if (IS_ERR(iommu_dev)) {
ret = PTR_ERR(iommu_dev);
goto out_module_put;
}
dev->iommu->iommu_dev = iommu_dev;
@ -217,6 +227,12 @@ static int __iommu_probe_device(struct device *dev, struct list_head *group_list
out_release:
ops->release_device(dev);
out_module_put:
module_put(ops->owner);
err_free:
dev_iommu_free(dev);
return ret;
}
@ -226,14 +242,6 @@ int iommu_probe_device(struct device *dev)
struct iommu_group *group;
int ret;
if (!dev_iommu_get(dev))
return -ENOMEM;
if (!try_module_get(ops->owner)) {
ret = -EINVAL;
goto err_out;
}
ret = __iommu_probe_device(dev, NULL);
if (ret)
goto err_out;
@ -1532,14 +1540,10 @@ struct iommu_domain *iommu_group_default_domain(struct iommu_group *group)
static int probe_iommu_group(struct device *dev, void *data)
{
const struct iommu_ops *ops = dev->bus->iommu_ops;
struct list_head *group_list = data;
struct iommu_group *group;
int ret;
if (!dev_iommu_get(dev))
return -ENOMEM;
/* Device is probed already if in a group */
group = iommu_group_get(dev);
if (group) {
@ -1547,22 +1551,7 @@ static int probe_iommu_group(struct device *dev, void *data)
return 0;
}
if (!try_module_get(ops->owner)) {
ret = -EINVAL;
goto err_free_dev_iommu;
}
ret = __iommu_probe_device(dev, group_list);
if (ret)
goto err_module_put;
return 0;
err_module_put:
module_put(ops->owner);
err_free_dev_iommu:
dev_iommu_free(dev);
if (ret == -ENODEV)
ret = 0;