summaryrefslogtreecommitdiffstats
path: root/drivers/iommu
diff options
context:
space:
mode:
authorJoerg Roedel <jroedel@suse.de>2015-10-20 17:33:35 +0200
committerJoerg Roedel <jroedel@suse.de>2015-10-21 11:29:27 +0200
commit150952f96941cb13371770ce0cf47906647d8bba (patch)
tree678fd9e52ac4d03ac7f2ad5629c3bd9617cb0c53 /drivers/iommu
parentf34c73f55a06ac443c492fc11b85f7a44dfdc112 (diff)
downloadlinux-150952f96941cb13371770ce0cf47906647d8bba.tar.bz2
iommu/amd: Do not iterate over alias-list in __[attach|detach]_device
The alias list is handled aleady by iommu core code. No need anymore to handle it in this part of the AMD IOMMU code Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu')
-rw-r--r--drivers/iommu/amd_iommu.c26
1 files changed, 3 insertions, 23 deletions
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 6070b1504497..e8443e6ff1b1 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -2028,29 +2028,17 @@ static void do_detach(struct iommu_dev_data *dev_data)
static int __attach_device(struct iommu_dev_data *dev_data,
struct protection_domain *domain)
{
- struct iommu_dev_data *head, *entry;
int ret;
/* lock domain */
spin_lock(&domain->lock);
- head = dev_data;
-
- if (head->alias_data != NULL)
- head = head->alias_data;
-
- /* Now we have the root of the alias group, if any */
-
ret = -EBUSY;
- if (head->domain != NULL)
+ if (dev_data->domain != NULL)
goto out_unlock;
/* Attach alias group root */
- do_attach(head, domain);
-
- /* Attach other devices in the alias group */
- list_for_each_entry(entry, &head->alias_list, alias_list)
- do_attach(entry, domain);
+ do_attach(dev_data, domain);
ret = 0;
@@ -2200,7 +2188,6 @@ static int attach_device(struct device *dev,
*/
static void __detach_device(struct iommu_dev_data *dev_data)
{
- struct iommu_dev_data *head, *entry;
struct protection_domain *domain;
unsigned long flags;
@@ -2211,14 +2198,7 @@ static void __detach_device(struct iommu_dev_data *dev_data)
spin_lock_irqsave(&domain->lock, flags);
- head = dev_data;
- if (head->alias_data != NULL)
- head = head->alias_data;
-
- list_for_each_entry(entry, &head->alias_list, alias_list)
- do_detach(entry);
-
- do_detach(head);
+ do_detach(dev_data);
spin_unlock_irqrestore(&domain->lock, flags);
}