Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
To:     linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org
Cc:     joro@8bytes.org, robin.murphy@arm.com,
        Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Subject: [PATCH v3 03/14] iommu/amd: Move pt_root to to struct amd_io_pgtable
Date:   Sun,  4 Oct 2020 01:45:38 +0000
Message-Id: <20201004014549.16065-4-suravee.suthikulpanit@amd.com>
In-Reply-To: <20201004014549.16065-1-suravee.suthikulpanit@amd.com>
References: <20201004014549.16065-1-suravee.suthikulpanit@amd.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from ethanolx5673host.amd.com (165.204.78.2) by SN4PR0701CA0004.namprd07.prod.outlook.com (2603:10b6:803:28::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3433.34 via Frontend Transport; Sun, 4 Oct 2020 01:41:55 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-HT: Tenant
X-MS-Office365-Filtering-Correlation-Id: 79eca430-d2e8-41e2-61b5-08d86806ad69
X-MS-TrafficTypeDiagnostic: DM5PR12MB1451:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <DM5PR12MB1451B997EA12F57CDC303FABF30F0@DM5PR12MB1451.namprd12.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:4714;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: JmLmH57PspJKu6MFDHbvE/cPvwKdYvsLgMD3SoehveJZ+CJuu8jWo75fuyw5f63AIVtZ8fCGxBGBM04ZfUaAZf63HAy2U+RGN9+o5KRcjcBEkwzKtA8vZjbtzfACVSVdfMkqQ4/FmYk1U8bQHYwNzGEQOKeZVd+acga89RQh58JbkrAM6OX6k88p+YGJeJsnuIFm3+5+3OEa//PVdFlofeydCoJE2qt2jnbmku40lacEeqo7AeHeD2s4u+Lav53c/mF4pubBO8MiiqW4lc0/JTCXjSMlQj9fZAoVbbKFZ/1FtbYhavPLLzx4JwMYB+hBCUG0mSMrONCL2ZE7GuVZJg==
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM5PR12MB1163.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(396003)(346002)(376002)(136003)(366004)(39850400004)(2616005)(956004)(6486002)(316002)(66946007)(66476007)(66556008)(6666004)(478600001)(44832011)(1076003)(5660300002)(86362001)(8936002)(7696005)(52116002)(2906002)(36756003)(16526019)(26005)(186003)(4326008)(83380400001)(8676002);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData: G2QGSBWSdxfB8mNezL2pqnL35nNR9R2x2rw4i3zMRhAiTtnW3PdUNnMm/iUw7fi7SvfIVXmGeVdTZqGwxdK7/KoS63EiPEDJzzqlUSovLpzc1bAEKD+6UiO9R2jxWYSGkBmyf5DG2ZkIvYBMXWGXkNs6pfWAivAoBCunRX0/vucUlQBNh+PX8F2/qRf3ehA1BHbhtFzFVzGpT5tq0NjsdHZVhE8DKCz3u/ZscXVjjS+39e20DjFaAhnbGi2aRg+/2fm7xt+gdIuh/gjDnRXR86j6sUq2pKNmQejhdga/bhXUBRUmmv2fm7J+9SY340AYq2H4dd1+wnQhSIdxvuEvNs8zKBeVCeyYEvhXz6Brw5ZAJHvKbTg7AxySAKiqqx1V2vr0CM24P6/OobtGF/PpS/+9vtpYwNc3T8AIC74jHNjAT2MP3+lbBnvMou8GWlT96NxBLdN8FxI+IhLFWBa2kJQr77aAnw8MDphSkePxyJ6Jr/kV43buP4PESPjyRozQnAl6y3cagzhnhaPrCKDlNxDCxTmDrGnc2n7tehimMBYqBVDmNQb/+xGsdNZ+oLiT403fokae/06uwfpGDGaHoFThYhneQNkqe8ub7qQBpFlMZlD+QR/a1SzVe4NhWZm3CKbKs7b5p6bKb/DCAxClNA==
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 79eca430-d2e8-41e2-61b5-08d86806ad69
X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1163.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Oct 2020 01:41:56.3251
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: eLrqAe5mvYb62gsEVfMRUwe2P8Fy5l7a1rzR7mlJuD3AmKFHErbzL1X6OKdg+JHMEAGXJIu4is1hkFSE4tihOA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1451
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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 e3ac3e57e507..80b5c34357ed 100644
--- a/drivers/iommu/amd/amd_iommu_types.h
+++ b/drivers/iommu/amd/amd_iommu_types.h
@@ -493,6 +493,7 @@ struct amd_io_pgtable {
 	struct io_pgtable	iop;
 	int			mode;
 	u64			*root;
+	atomic64_t pt_root;	/* pgtable root and pgtable mode */
 };
 
 /*
@@ -506,7 +507,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