All of lore.kernel.org
 help / color / mirror / Atom feed
From: Joerg Roedel <joro@8bytes.org>
To: Joerg Roedel <joro@8bytes.org>
Cc: linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org,
	Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>,
	jroedel@suse.de
Subject: [PATCH 07/10] iommu/amd: Remove PD_DMA_OPS_MASK
Date: Wed, 27 May 2020 13:53:10 +0200	[thread overview]
Message-ID: <20200527115313.7426-8-joro@8bytes.org> (raw)
In-Reply-To: <20200527115313.7426-1-joro@8bytes.org>

From: Joerg Roedel <jroedel@suse.de>

This is covered by IOMMU_DOMAIN_DMA from the IOMMU core code already,
so remove it.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
 drivers/iommu/amd/iommu.c | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c
index 9e0737932e0c..7c87ef78f26a 100644
--- a/drivers/iommu/amd/iommu.c
+++ b/drivers/iommu/amd/iommu.c
@@ -1817,15 +1817,6 @@ static void free_gcr3_table(struct protection_domain *domain)
 	free_page((unsigned long)domain->gcr3_tbl);
 }
 
-/*
- * little helper function to check whether a given protection domain is a
- * dma_ops domain
- */
-static bool dma_ops_domain(struct protection_domain *domain)
-{
-	return domain->flags & PD_DMA_OPS_MASK;
-}
-
 static void set_dte_entry(u16 devid, struct protection_domain *domain,
 			  struct domain_pgtable *pgtable,
 			  bool ats, bool ppr)
@@ -2408,11 +2399,9 @@ static struct iommu_domain *amd_iommu_domain_alloc(unsigned type)
 	domain->domain.geometry.aperture_end   = ~0ULL;
 	domain->domain.geometry.force_aperture = true;
 
-	if (type == IOMMU_DOMAIN_DMA) {
-		if (iommu_get_dma_cookie(&domain->domain) == -ENOMEM)
-			goto free_domain;
-		domain->flags = PD_DMA_OPS_MASK;
-	}
+	if (type == IOMMU_DOMAIN_DMA &&
+	    iommu_get_dma_cookie(&domain->domain) == -ENOMEM)
+		goto free_domain;
 
 	return &domain->domain;
 
@@ -3024,17 +3013,18 @@ struct iommu_domain *amd_iommu_get_v2_domain(struct pci_dev *pdev)
 	if (!check_device(dev))
 		return NULL;
 
-	pdomain = get_dev_data(dev)->domain;
+	pdomain   = get_dev_data(dev)->domain;
+	io_domain = iommu_get_domain_for_dev(dev);
 	if (pdomain == NULL && get_dev_data(dev)->defer_attach) {
 		get_dev_data(dev)->defer_attach = false;
-		io_domain = iommu_get_domain_for_dev(dev);
 		pdomain = to_pdomain(io_domain);
 		attach_device(dev, pdomain);
 	}
+
 	if (pdomain == NULL)
 		return NULL;
 
-	if (!dma_ops_domain(pdomain))
+	if (io_domain->type != IOMMU_DOMAIN_DMA)
 		return NULL;
 
 	/* Only return IOMMUv2 domains */
-- 
2.17.1


WARNING: multiple messages have this Message-ID (diff)
From: Joerg Roedel <joro@8bytes.org>
To: Joerg Roedel <joro@8bytes.org>
Cc: iommu@lists.linux-foundation.org, jroedel@suse.de,
	linux-kernel@vger.kernel.org
Subject: [PATCH 07/10] iommu/amd: Remove PD_DMA_OPS_MASK
Date: Wed, 27 May 2020 13:53:10 +0200	[thread overview]
Message-ID: <20200527115313.7426-8-joro@8bytes.org> (raw)
In-Reply-To: <20200527115313.7426-1-joro@8bytes.org>

From: Joerg Roedel <jroedel@suse.de>

This is covered by IOMMU_DOMAIN_DMA from the IOMMU core code already,
so remove it.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
 drivers/iommu/amd/iommu.c | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c
index 9e0737932e0c..7c87ef78f26a 100644
--- a/drivers/iommu/amd/iommu.c
+++ b/drivers/iommu/amd/iommu.c
@@ -1817,15 +1817,6 @@ static void free_gcr3_table(struct protection_domain *domain)
 	free_page((unsigned long)domain->gcr3_tbl);
 }
 
-/*
- * little helper function to check whether a given protection domain is a
- * dma_ops domain
- */
-static bool dma_ops_domain(struct protection_domain *domain)
-{
-	return domain->flags & PD_DMA_OPS_MASK;
-}
-
 static void set_dte_entry(u16 devid, struct protection_domain *domain,
 			  struct domain_pgtable *pgtable,
 			  bool ats, bool ppr)
@@ -2408,11 +2399,9 @@ static struct iommu_domain *amd_iommu_domain_alloc(unsigned type)
 	domain->domain.geometry.aperture_end   = ~0ULL;
 	domain->domain.geometry.force_aperture = true;
 
-	if (type == IOMMU_DOMAIN_DMA) {
-		if (iommu_get_dma_cookie(&domain->domain) == -ENOMEM)
-			goto free_domain;
-		domain->flags = PD_DMA_OPS_MASK;
-	}
+	if (type == IOMMU_DOMAIN_DMA &&
+	    iommu_get_dma_cookie(&domain->domain) == -ENOMEM)
+		goto free_domain;
 
 	return &domain->domain;
 
@@ -3024,17 +3013,18 @@ struct iommu_domain *amd_iommu_get_v2_domain(struct pci_dev *pdev)
 	if (!check_device(dev))
 		return NULL;
 
-	pdomain = get_dev_data(dev)->domain;
+	pdomain   = get_dev_data(dev)->domain;
+	io_domain = iommu_get_domain_for_dev(dev);
 	if (pdomain == NULL && get_dev_data(dev)->defer_attach) {
 		get_dev_data(dev)->defer_attach = false;
-		io_domain = iommu_get_domain_for_dev(dev);
 		pdomain = to_pdomain(io_domain);
 		attach_device(dev, pdomain);
 	}
+
 	if (pdomain == NULL)
 		return NULL;
 
-	if (!dma_ops_domain(pdomain))
+	if (io_domain->type != IOMMU_DOMAIN_DMA)
 		return NULL;
 
 	/* Only return IOMMUv2 domains */
-- 
2.17.1

_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

  parent reply	other threads:[~2020-05-27 11:53 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-27 11:53 [PATCH 00/10] iommu/amd: Updates and Cleanups Joerg Roedel
2020-05-27 11:53 ` Joerg Roedel
2020-05-27 11:53 ` [PATCH 01/10] iommu/amd: Move AMD IOMMU driver to a subdirectory Joerg Roedel
2020-05-27 11:53   ` Joerg Roedel
2020-05-29 15:38   ` Joerg Roedel
2020-05-29 15:38     ` Joerg Roedel
2020-05-27 11:53 ` [PATCH 02/10] iommu/amd: Unexport get_dev_data() Joerg Roedel
2020-05-27 11:53   ` Joerg Roedel
2020-05-28  6:13   ` Christoph Hellwig
2020-05-28  6:13     ` Christoph Hellwig
2020-05-28  6:42     ` Joerg Roedel
2020-05-28  6:42       ` Joerg Roedel
2020-05-27 11:53 ` [PATCH 03/10] iommu/amd: Let free_pagetable() not rely on domain->pt_root Joerg Roedel
2020-05-27 11:53   ` Joerg Roedel
2020-05-27 11:53 ` [PATCH 04/10] iommu/amd: Allocate page-table in protection_domain_init() Joerg Roedel
2020-05-27 11:53   ` Joerg Roedel
2020-05-27 11:53 ` [PATCH 05/10] iommu/amd: Free page-table in protection_domain_free() Joerg Roedel
2020-05-27 11:53   ` Joerg Roedel
2020-05-27 11:53 ` [PATCH 06/10] iommu/amd: Consolidate domain allocation/freeing Joerg Roedel
2020-05-27 11:53   ` Joerg Roedel
2020-05-27 11:53 ` Joerg Roedel [this message]
2020-05-27 11:53   ` [PATCH 07/10] iommu/amd: Remove PD_DMA_OPS_MASK Joerg Roedel
2020-05-27 11:53 ` [PATCH 08/10] iommu/amd: Merge private header files Joerg Roedel
2020-05-27 11:53   ` Joerg Roedel
2020-05-27 11:53 ` [PATCH 09/10] iommu/amd: Store dev_data as device iommu private data Joerg Roedel
2020-05-27 11:53   ` Joerg Roedel
2020-05-27 11:53 ` [PATCH 10/10] iommu/amd: Remove redundant devid checks Joerg Roedel
2020-05-27 11:53   ` Joerg Roedel
2020-05-29 12:15 ` [PATCH 00/10] iommu/amd: Updates and Cleanups Suravee Suthikulpanit
2020-05-29 12:15   ` Suravee Suthikulpanit
2020-05-29 13:08   ` Joerg Roedel
2020-05-29 13:08     ` 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=20200527115313.7426-8-joro@8bytes.org \
    --to=joro@8bytes.org \
    --cc=iommu@lists.linux-foundation.org \
    --cc=jroedel@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=suravee.suthikulpanit@amd.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.