mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Joerg Roedel <joro@8bytes.org>
To: iommu@lists.linux-foundation.org
Cc: linux-kernel@vger.kernel.org, Joerg Roedel <jroedel@suse.de>
Subject: [PATCH 02/12] iommu/amd: Do not iterate over alias-list in __[attach|detach]_device
Date: Tue, 20 Oct 2015 17:33:35 +0200	[thread overview]
Message-ID: <1445355225-17557-3-git-send-email-joro@8bytes.org> (raw)
In-Reply-To: <1445355225-17557-1-git-send-email-joro@8bytes.org>

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


  parent reply	other threads:[~2015-10-20 15:33 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-20 15:33 [PATCH 00/12] AMD IOMMU alias handling cleanups and code removal Joerg Roedel
2015-10-20 15:33 ` [PATCH 01/12] iommu/amd: Do not BUG_ON in __detach_device() Joerg Roedel
2015-10-20 15:33 ` Joerg Roedel [this message]
2015-10-20 15:33 ` [PATCH 03/12] iommu/amd: Don't disable IRQs in __detach_device Joerg Roedel
2015-10-20 15:33 ` [PATCH 04/12] iommu/amd: WARN when __[attach|detach]_device are called with irqs enabled Joerg Roedel
2015-10-20 15:33 ` [PATCH 05/12] iommu/amd: Set alias DTE in do_attach/do_detach Joerg Roedel
2015-10-20 15:33 ` [PATCH 06/12] iommu/amd: Remove old alias handling code Joerg Roedel
2015-10-20 15:33 ` [PATCH 07/12] iommu/amd: Align DTE flag definitions Joerg Roedel
2015-10-20 15:33 ` [PATCH 08/12] iommu/amd: Remove cmd_buf_size and evt_buf_size from struct amd_iommu Joerg Roedel
2015-10-20 15:33 ` [PATCH 09/12] iommu/amd: Cleanup buffer allocation Joerg Roedel
2015-10-20 15:33 ` [PATCH 10/12] iommu/amd: Initialize amd_iommu_last_bdf for DEV_ALL Joerg Roedel
2015-10-20 15:33 ` [PATCH 11/12] iommu/amd: Remove first/last_device handling Joerg Roedel
2015-10-20 15:33 ` [PATCH 12/12] iommu/amd: Remove find_last_devid_on_pci() Joerg Roedel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1445355225-17557-3-git-send-email-joro@8bytes.org \
    --to=joro@8bytes.org \
    --cc=iommu@lists.linux-foundation.org \
    --cc=jroedel@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®