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 v2 03/13] iommu/amd: Move pt_root to to struct amd_io_pgtable
Date:   Fri,  2 Oct 2020 12:28:20 +0000
Message-Id: <20201002122830.4051-4-suravee.suthikulpanit@amd.com>
In-Reply-To: <20201002122830.4051-1-suravee.suthikulpanit@amd.com>
References: <20201002122830.4051-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 SN6PR05CA0010.namprd05.prod.outlook.com (2603:10b6:805:de::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.13 via Frontend Transport; Fri, 2 Oct 2020 12:24:49 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-HT: Tenant
X-MS-Office365-Filtering-Correlation-Id: 2adbec18-6636-473a-dd21-08d866ce286a
X-MS-TrafficTypeDiagnostic: DM5PR12MB1163:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <DM5PR12MB11632B162B7C7AAFA70D6E6EF3310@DM5PR12MB1163.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: rfBaleWH3bLca1r8tWAdTs8112UXNcCT7tUsmbUDsHD5tbmzctxnBjTB/4Dpp3psL22InC+tQ6Zy9JCczweL0TeM79nn2jkAPK+qSeHGb662nkRozSUGAl+Byv6jKrqakc6iwzScziXiKFnaxJIBVqsrB1D8PUNjbfXCTeuFcvLHil3hOA5mcdb31BKGedG6wcUf61rW3ULNhU4nj8B/ihUlUxJZc2P//aSO+DqnN3mXu+LxCsp5k5oc+ikKpjbxYmG83/ElQnD8di88h2Hnru3O1s2pYcpNLcFuutgCRVn0VkBES3fSc5MCGrGmkK5ObmhPRIN21uQ9sKjwEe8LjA==
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)(136003)(366004)(39860400002)(396003)(346002)(376002)(66556008)(52116002)(66946007)(66476007)(7696005)(5660300002)(8936002)(4326008)(6666004)(1076003)(26005)(6486002)(16526019)(186003)(44832011)(316002)(2616005)(36756003)(956004)(478600001)(83380400001)(8676002)(2906002)(86362001);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData: ic+X9hRvn1dYMaSP7rXIYeJGzgF6HdSNsuJQ5KXcyKdBH2wuuoeu+j8AdRdqG90dFQpQN8wbaYQg4sPbNt3qVmPPR1ImCphuZdW4kjURt55en3EKp09L06YB+0/3CRmp61XSMJsdsb4ynAc43q5CVq5dkR5qJbA2d8bBxZ8VBkarzwweWSHsp/OuzdIxUU2ZLsKlvTiaus52vWYQtNJP2S/1YZxQwlNipm6IcIBVR4AilpCMburvxubKkhdCfjXDOTSiuWZ/EWvWOoj/p0UQWqXlYLNY++GXz7apFf1qRCLyft+Nc6zGdy3K7sKX1yJNuMteBGy3hQZt2mVJvg0Mu/ZMRgPXtU2mCRcjr6U95ZLWYnufbqctwQpBDq0h9Q0aB7YRh6Z3IXJNrzWLio7ROIlkBdIJ0+hXAPCf4P9vdLmA8hSZ8dUVUb6H3SvSvUuSPAid5LciTq89bJH3Zl6hQhMJWmFUMmcPPpNeT9ZdgNoSNceUhm7tRfAksbfG2IBFOJv99OAulqPhCG/YmsXfpWmZHru741CToDqEpb7550f5f1TG4UF2pn32x64IcIxT36r2rnq6ASkOkm6gsMV+TsqAAe743HvZRe2FtEJzOaa5L4RsmaEyUXOgU8sbXxcTD1yE74WQ/HwDkFHSnLUqQg==
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 2adbec18-6636-473a-dd21-08d866ce286a
X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1163.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Oct 2020 12:24:50.2982
 (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: s9JhdtUO4W0nhvI45APaMP2bRdrhTHoPr1fdYTG44CCuKDzqQ9jmi3LJXMqUf3LDlT5o473Dj10+DqbRpi2rOQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1163
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 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