Linux IOMMU Development
 help / color / mirror / Atom feed
From: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
To: linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org
Subject: [PATCH 13/13] iommu: amd: Adopt IO page table framework
Date: Wed, 23 Sep 2020 10:14:42 +0000	[thread overview]
Message-ID: <20200923101442.73157-14-suravee.suthikulpanit@amd.com> (raw)
In-Reply-To: <20200923101442.73157-1-suravee.suthikulpanit@amd.com>

Switch to using IO page table framework for AMD IOMMU v1 page table.

Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
---
 drivers/iommu/amd/amd_iommu.h |  3 +++
 drivers/iommu/amd/iommu.c     | 10 ++++++++++
 2 files changed, 13 insertions(+)

diff --git a/drivers/iommu/amd/amd_iommu.h b/drivers/iommu/amd/amd_iommu.h
index 2e8dc2a1ec0f..046ea81a3b77 100644
--- a/drivers/iommu/amd/amd_iommu.h
+++ b/drivers/iommu/amd/amd_iommu.h
@@ -127,4 +127,7 @@ static inline void amd_iommu_apply_ivrs_quirks(void) { }
 extern void amd_iommu_domain_set_pgtable(struct protection_domain *domain,
 					 u64 *root, int mode);
 extern void amd_iommu_free_pgtable(struct amd_io_pgtable *pgtable);
+extern struct io_pgtable_ops *
+amd_iommu_setup_io_pgtable_ops(struct iommu_dev_data *dev_data,
+			       struct protection_domain *pdom);
 #endif
diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c
index 77f44b927ae7..df304d8a630a 100644
--- a/drivers/iommu/amd/iommu.c
+++ b/drivers/iommu/amd/iommu.c
@@ -32,6 +32,7 @@
 #include <linux/irqdomain.h>
 #include <linux/percpu.h>
 #include <linux/iova.h>
+#include <linux/io-pgtable.h>
 #include <asm/irq_remapping.h>
 #include <asm/io_apic.h>
 #include <asm/apic.h>
@@ -1580,6 +1581,7 @@ static int pdev_iommuv2_enable(struct pci_dev *pdev)
 static int attach_device(struct device *dev,
 			 struct protection_domain *domain)
 {
+	struct io_pgtable_ops *pgtbl_ops;
 	struct iommu_dev_data *dev_data;
 	struct pci_dev *pdev;
 	unsigned long flags;
@@ -1623,6 +1625,12 @@ static int attach_device(struct device *dev,
 skip_ats_check:
 	ret = 0;
 
+	pgtbl_ops = amd_iommu_setup_io_pgtable_ops(dev_data, domain);
+	if (!pgtbl_ops) {
+		ret = -ENOMEM;
+		goto out;
+	}
+
 	do_attach(dev_data, domain);
 
 	/*
@@ -1958,6 +1966,8 @@ static void amd_iommu_domain_free(struct iommu_domain *dom)
 	if (domain->dev_cnt > 0)
 		cleanup_domain(domain);
 
+	free_io_pgtable_ops(&domain->iop.iop.ops);
+
 	BUG_ON(domain->dev_cnt != 0);
 
 	if (!dom)
-- 
2.17.1

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

  parent reply	other threads:[~2020-09-23 10:12 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-23 10:14 [PATCH 00/13] iommu: amd: Add Generic IO Page Table Framework Support Suravee Suthikulpanit
2020-09-23 10:14 ` [PATCH 01/13] iommu: amd: Re-define amd_iommu_domain_encode_pgtable as inline Suravee Suthikulpanit
2020-09-23 10:14 ` [PATCH 02/13] iommu: amd: Prepare for generic IO page table framework Suravee Suthikulpanit
2020-09-24 12:25   ` Robin Murphy
2020-09-25  9:58     ` Suravee Suthikulpanit
2020-09-23 10:14 ` [PATCH 03/13] iommu: amd: Move pt_root to to struct amd_io_pgtable Suravee Suthikulpanit
2020-09-23 10:14 ` [PATCH 04/13] iommu: amd: Convert to using amd_io_pgtable Suravee Suthikulpanit
2020-09-23 10:14 ` [PATCH 05/13] iommu: amd: Declare functions as extern Suravee Suthikulpanit
2020-09-23 10:14 ` [PATCH 06/13] iommu: amd: Move IO page table related functions Suravee Suthikulpanit
2020-09-23 10:14 ` [PATCH 07/13] iommu: amd: Restructure code for freeing page table Suravee Suthikulpanit
2020-09-23 10:14 ` [PATCH 08/13] iommu: amd: Remove amd_iommu_domain_get_pgtable Suravee Suthikulpanit
2020-09-23 10:14 ` [PATCH 09/13] iommu: amd: Rename variables to be consistent with struct io_pgtable_ops Suravee Suthikulpanit
2020-09-23 10:14 ` [PATCH 10/13] iommu: amd: Refactor fetch_pte to use struct amd_io_pgtable Suravee Suthikulpanit
2020-09-23 10:14 ` [PATCH 11/13] iommu: amd: Introduce iommu_v1_iova_to_phys Suravee Suthikulpanit
2020-09-23 10:14 ` [PATCH 12/13] iommu: amd: Introduce iommu_v1_map_page and iommu_v1_unmap_page Suravee Suthikulpanit
2020-09-23 10:14 ` Suravee Suthikulpanit [this message]
2020-09-24 10:34 ` [PATCH 00/13] iommu: amd: Add Generic IO Page Table Framework Support Joerg Roedel
2020-09-24 10:50   ` Suravee Suthikulpanit
2020-10-01 12:59     ` Joerg Roedel
2020-10-01 14:51       ` Suravee Suthikulpanit
2020-10-01 14:55         ` 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=20200923101442.73157-14-suravee.suthikulpanit@amd.com \
    --to=suravee.suthikulpanit@amd.com \
    --cc=iommu@lists.linux-foundation.org \
    --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