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 03/13] iommu: amd: Move pt_root to to struct amd_io_pgtable
Date: Wed, 23 Sep 2020 10:14:32 +0000	[thread overview]
Message-ID: <20200923101442.73157-4-suravee.suthikulpanit@amd.com> (raw)
In-Reply-To: <20200923101442.73157-1-suravee.suthikulpanit@amd.com>

To better organize the data structure since it contains IO page table
related information.

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

diff --git a/drivers/iommu/amd/amd_iommu.h b/drivers/iommu/amd/amd_iommu.h
index 97cdb235ce69..da6e09657e00 100644
--- a/drivers/iommu/amd/amd_iommu.h
+++ b/drivers/iommu/amd/amd_iommu.h
@@ -96,7 +96,7 @@ static inline void *iommu_phys_to_virt(unsigned long paddr)
 static inline
 void amd_iommu_domain_set_pt_root(struct protection_domain *domain, u64 root)
 {
-	atomic64_set(&domain->pt_root, root);
+	atomic64_set(&domain->iop.pt_root, root);
 }
 
 static inline
diff --git a/drivers/iommu/amd/amd_iommu_types.h b/drivers/iommu/amd/amd_iommu_types.h
index 77cd8d966fbc..5d53b7bec256 100644
--- a/drivers/iommu/amd/amd_iommu_types.h
+++ b/drivers/iommu/amd/amd_iommu_types.h
@@ -490,6 +490,7 @@ struct amd_io_pgtable {
 	struct io_pgtable	iop;
 	int			mode;
 	u64			*root;
+	atomic64_t pt_root;	/* pgtable root and pgtable mode */
 };
 
 /*
@@ -503,7 +504,6 @@ struct protection_domain {
 	struct amd_io_pgtable iop;
 	spinlock_t lock;	/* mostly used to lock the page table*/
 	u16 id;			/* the domain id written to the device table */
-	atomic64_t pt_root;	/* pgtable root and pgtable mode */
 	int glx;		/* Number of levels for GCR3 table */
 	u64 *gcr3_tbl;		/* Guest CR3 table */
 	unsigned long flags;	/* flags to find out type of domain */
diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c
index 2b7eb51dcbb8..c8b8619cc744 100644
--- a/drivers/iommu/amd/iommu.c
+++ b/drivers/iommu/amd/iommu.c
@@ -146,7 +146,7 @@ static struct protection_domain *to_pdomain(struct iommu_domain *dom)
 static void amd_iommu_domain_get_pgtable(struct protection_domain *domain,
 					 struct domain_pgtable *pgtable)
 {
-	u64 pt_root = atomic64_read(&domain->pt_root);
+	u64 pt_root = atomic64_read(&domain->iop.pt_root);
 
 	pgtable->root = (u64 *)(pt_root & PAGE_MASK);
 	pgtable->mode = pt_root & 7; /* lowest 3 bits encode pgtable mode */
-- 
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:11 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 ` Suravee Suthikulpanit [this message]
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 ` [PATCH 13/13] iommu: amd: Adopt IO page table framework Suravee Suthikulpanit
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-4-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