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, will@kernel.org,
        Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Subject: [PATCH v4 03/13] iommu/amd: Move pt_root to struct amd_io_pgtable
Date:   Tue, 15 Dec 2020 01:36:55 -0600
Message-Id: <20201215073705.123786-4-suravee.suthikulpanit@amd.com>
In-Reply-To: <20201215073705.123786-1-suravee.suthikulpanit@amd.com>
References: <20201215073705.123786-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 SN2PR01CA0060.prod.exchangelabs.com (2603:10b6:800::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3654.12 via Frontend Transport; Tue, 15 Dec 2020 07:34:39 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-HT: Tenant
X-MS-Office365-Filtering-Correlation-Id: d883e935-61e2-4f04-c5c9-08d8a0cbe214
X-MS-TrafficTypeDiagnostic: BY5PR12MB3794:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <BY5PR12MB3794B1E0B28630307882F586F3C60@BY5PR12MB3794.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: 31kQJZJuDTt4aP5F6TM2/abaYAJTYZnZbTRnVTvBeJy5O2jajhQ9gxaVnTLNfC88bbqq1thjbXYroA2jTOMKEgpmYzmshg9Js9twjkY8VunDT5LvU31usqB0Prolq17So0NLOApngsyfbcwqyegaKZOzdm+qIkvSOrwLM61KvUxKGJlnsqD3fstEk0yCX9jnWuxkj7pYWDkhh/G+xshKWo1uhQhomZ/RisTU9QWw4Z/l5gyEBWxcLg8v7O3Xhz4bp7zNreJ6zu3VZavHCej1XQx3RGqbrBJPKzrBwYjR+YKRDE1GkcNgP5F1OYzxi0yXXSt+f88G2BQRcT1UEONh8mbTl6rQfBasvolJpntn6+sYzA1Loyr37Y9v9Lop4WbA
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR12MB4597.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(136003)(366004)(346002)(376002)(6666004)(2616005)(66556008)(16526019)(86362001)(956004)(66946007)(6486002)(34490700003)(26005)(52116002)(186003)(66476007)(1076003)(7696005)(36756003)(83380400001)(5660300002)(44832011)(2906002)(8676002)(508600001)(8936002)(4326008);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?zMIW9omQf/gB+PpnlXcQY6OGhcs403rqWiZVtxhx+1ZTFxdF4Avx+b2EH0JR?=
 =?us-ascii?Q?F5tgQ51Rfc6nGyzUjW+aG7CHHsg9dVKky+RyYnJppT3nvqjLTE5vcAISi7eA?=
 =?us-ascii?Q?drzP7J8NPjQrp0pPOnBjvMB8n7cqzfRix/kWKbGqpfBrSo3F+0pYT2CtoBts?=
 =?us-ascii?Q?qMFifPm6vuS+AuhO5l9cbuxFjh7zuMq9oioLQfHNtDRUZuSQ4xk6iixLipa/?=
 =?us-ascii?Q?kIsqqXg2AqrsBKZXTrnQ3cHw1M/BWs0P3TCXDL5BY7Y4HXuLBN6AfFsoyt17?=
 =?us-ascii?Q?T4XoO+CAtykyLnnYi23xWsUBqa62Nu6vuE4BJedDMUip7YFwK78yluJZ1Ant?=
 =?us-ascii?Q?hCm9RLrJbRtORtenegHaj37KzYPEs3WfM7gqbLDeRtAICo2ccb6V30SaB7xO?=
 =?us-ascii?Q?WLhkonJcBTjxv6wr5ilGyRiGqgUzpVaqFiGGr+bQmG9lgCbm/lXS0brQRRLJ?=
 =?us-ascii?Q?vtiL801x2jojf7D6FgA7IuiuAhYn15R3dMEkWaxGgs8ZYRHOqb6cbaYwBz8A?=
 =?us-ascii?Q?KzZseEjwJrkuynm4IyMhtWjtWd7qIQQGyOj+G00D0zofmoE1Uw3ttnYQildU?=
 =?us-ascii?Q?Gv40WxHqI55E4OrIkDW6CLiyn4n9i6AQz9aiaG0WOQr5zqMsk5UvQYvVO1JM?=
 =?us-ascii?Q?5cN4Tz60zZXv9pspKg1A1NZlPmX9wAuKUMwav3O5J1m7DX190ob2O5rI06e6?=
 =?us-ascii?Q?lU3yZg8EMYEFPIJLnuPgwUtMY8QhNYDAHUqXl9FnSRuWNs14ELhs2d4tIcvQ?=
 =?us-ascii?Q?JXo1g9W+oZ8jr2fcO4KABUzLc86gHzIF2aeGEtwcT0od4PYVO7+CFk7acB0N?=
 =?us-ascii?Q?YNv3K9GE29/U2enNdEGZgONtRzHdXtHlupGIVIeE3GZAKUDQTgB09QwtF4Yl?=
 =?us-ascii?Q?prr3SWnwx7fYpOxzF9SE17CToEFSk8OGVfmMIpr29GWSEKrOG+w0tPJE9jrV?=
 =?us-ascii?Q?C5M5kqJfcBl07hn5kgbCTWtAi90m+16U7rY2ON6RDq8CZPTfy9L8TFbx+sl2?=
 =?us-ascii?Q?OOVf?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-AuthSource: BYAPR12MB4597.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2020 07:34:40.1674
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-Network-Message-Id: d883e935-61e2-4f04-c5c9-08d8a0cbe214
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: uYu6h/lktEuz5MJxa4TEhMvhDHdEjUAsqxGpd+TvffPsvkw901MHalecW12g7lLQqu940j0TuoSsEsItolb+EQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB3794
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 0817bc732d1a..b8dae3941f0f 100644
--- a/drivers/iommu/amd/amd_iommu.h
+++ b/drivers/iommu/amd/amd_iommu.h
@@ -105,7 +105,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 5d77f34e0fda..7c971c76d685 100644
--- a/drivers/iommu/amd/amd_iommu_types.h
+++ b/drivers/iommu/amd/amd_iommu_types.h
@@ -497,6 +497,7 @@ struct amd_io_pgtable {
 	struct io_pgtable	iop;
 	int			mode;
 	u64			*root;
+	atomic64_t		pt_root;    /* pgtable root and pgtable mode */
 };
 
 /*
@@ -510,7 +511,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 45d3977d6c00..5b93536d6877 100644
--- a/drivers/iommu/amd/iommu.c
+++ b/drivers/iommu/amd/iommu.c
@@ -145,7 +145,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