Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1251821

[PATCH 02/12] iommu/amd: Do not iterate over alias-list in __[attach|detach]_device

Show all headers | View raw

From: Joerg Roedel <jroedel@suse.de>

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>
---
 drivers/iommu/amd_iommu.c | 26 +++-----------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index bde87be..b86c5f0 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -2037,29 +2037,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;
 
@@ -2209,7 +2197,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;
 
@@ -2220,14 +2207,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);
 }
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/12] AMD IOMMU alias handling cleanups and code removal Joerg Roedel <joro@8bytes.org> - 2015-10-20 17:40 +0200
  [PATCH 12/12] iommu/amd: Remove find_last_devid_on_pci() Joerg Roedel <joro@8bytes.org> - 2015-10-20 17:40 +0200
  [PATCH 10/12] iommu/amd: Initialize amd_iommu_last_bdf for DEV_ALL Joerg Roedel <joro@8bytes.org> - 2015-10-20 17:40 +0200
  [PATCH 03/12] iommu/amd: Don't disable IRQs in __detach_device Joerg Roedel <joro@8bytes.org> - 2015-10-20 17:40 +0200
  [PATCH 11/12] iommu/amd: Remove first/last_device handling Joerg Roedel <joro@8bytes.org> - 2015-10-20 17:40 +0200
  [PATCH 06/12] iommu/amd: Remove old alias handling code Joerg Roedel <joro@8bytes.org> - 2015-10-20 17:40 +0200
  [PATCH 01/12] iommu/amd: Do not BUG_ON in __detach_device() Joerg Roedel <joro@8bytes.org> - 2015-10-20 17:40 +0200
  [PATCH 02/12] iommu/amd: Do not iterate over alias-list in __[attach|detach]_device Joerg Roedel <joro@8bytes.org> - 2015-10-20 17:40 +0200
  [PATCH 09/12] iommu/amd: Cleanup buffer allocation Joerg Roedel <joro@8bytes.org> - 2015-10-20 17:40 +0200
  [PATCH 05/12] iommu/amd: Set alias DTE in do_attach/do_detach Joerg Roedel <joro@8bytes.org> - 2015-10-20 17:40 +0200
  [PATCH 07/12] iommu/amd: Align DTE flag definitions Joerg Roedel <joro@8bytes.org> - 2015-10-20 17:40 +0200

csiph-web