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 10/13] iommu/amd: Refactor fetch_pte to use struct amd_io_pgtable
Date:   Tue, 15 Dec 2020 01:37:02 -0600
Message-Id: <20201215073705.123786-11-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:48 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-HT: Tenant
X-MS-Office365-Filtering-Correlation-Id: 05b86f93-9aa3-4eac-54b6-08d8a0cbe786
X-MS-TrafficTypeDiagnostic: BYAPR12MB3127:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <BYAPR12MB31277C43B1695F9C5248AF0EF3C60@BYAPR12MB3127.namprd12.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:4303;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: rhl0jiYs3salZzo5uB5eV32vIOhUL6uEWbmO/IBKQwZbmU3uRhNrfWorIQoSgn32nFHgnXZzWSdG2wRlh5pC9cAhsdRnK8+XwuxpUK+OnXAaNnP7HHRNv9AeIQe6f290w33B63I75uSDzY1RlEzMgSAeRPSvLqbOAYpSZe6EgF5Fn+rx+/Zga9XhiD/pZlA2IiCWMy58tdnsA10GRioLpM+8Ipb1pzhcXFGKbn3ApsE8C1fzjR9jqiUrYA7NFlaWnlbIhZnXCCwyWHFomhK0QsZyzF8vgbwiIL/FCBkm3fQlI+twpFBeZ/k/HGPrLHKAj7jXCO4Vwo5/cg9KdCDU+6M8esC52OoCmDxwubOQGr19FkZblCVIT5CE0LipqLwM
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)(66556008)(66476007)(66946007)(6486002)(34490700003)(2906002)(186003)(4326008)(508600001)(8676002)(956004)(6666004)(86362001)(2616005)(52116002)(7696005)(44832011)(36756003)(1076003)(5660300002)(16526019)(26005)(8936002)(83380400001);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?NT4qswGcF5LhcpyVR5qJynoGP/Le9Ibc8i15aInkpB9RpcAapm7hJUD2j4Sm?=
 =?us-ascii?Q?3MpxGMEPRjoluIIZhIwbw6z18KPIbxyzs+vZMAJtimFNFsFzcYWwcEKFxetl?=
 =?us-ascii?Q?J1VtWYE/2/lPkYuWRc+R946fgYtF7uSTh4+21uxzluBw+oj/kpFXYDlTvscO?=
 =?us-ascii?Q?nAockN3+56GqhywpKQPEZp9Cd4Az4Lz458zZ7q00h+Q1cKy0Dei64FvYkUgs?=
 =?us-ascii?Q?AkuGD8dAg+MomyvV4ajRsQ30gM+BoR0vHT4zFe4+pTn9mKXWoY19EM9eRNIe?=
 =?us-ascii?Q?iJj2C1Sz+31DV6Q7zliL2+2Md26KdUEWC634XW+yyoGJT9W5DZwtJZ0YnVHE?=
 =?us-ascii?Q?bNSlKoIWqxhKP2cfVYd3Mps8XIv09O1yiE1n487l5vLtKLPnAQ9Xa+4dBEJX?=
 =?us-ascii?Q?yQllw2jKRFuaao9JZuKUgzagGGqFZjvNnl1jDlSuSGO087KZcsbzc2Z2FPFZ?=
 =?us-ascii?Q?A33cAk76Za2bdHlX+BJlkeNznCHDFKtRnGltoF+gml0uzFod22mt2Nq2gnuC?=
 =?us-ascii?Q?M2ru446/X5gWdEeOuy381pEZDQ2JSHdGBixnCqab/1ne9Sc4myp10Ae+X46N?=
 =?us-ascii?Q?2R/JGiLmfRlyYZeCoc0svW3PWtmin3kWXnfsf+sR0XF6Xyi+neLyrvnaKDW4?=
 =?us-ascii?Q?DWgIUfIjbahpMT8KQE3Z5ZSyKL6aiTL7R2aPiVHatMT9A7Kt+KPiWqbFvY6b?=
 =?us-ascii?Q?P2kBgNHcYrSQZr9FCm6TSadXgNxPiGRTBlf1tBc2gPqbqtRi5+46daJKw/lw?=
 =?us-ascii?Q?//bErij+Fe2AH3E1zOIhvFecignFsvdqdZ369qTdOgtoewg+f8+hnVS1SHVp?=
 =?us-ascii?Q?yP+7n2EGiLyKCLMGRBUuTw65txNVGuWoGXP+WDLlfojtT7Fe2jJKyBuRg9hL?=
 =?us-ascii?Q?68DZG6dfnQ44ZIl9tEOI+1UOv+UtpHb5ihWSg42qoY0FBCI/Za+AGvlOB6rU?=
 =?us-ascii?Q?SojDiLnzRv5GZkiD+sBC7sifGJ1vZp+I7Vr3QpRecNWuv2uJJueA0w4SYRY+?=
 =?us-ascii?Q?tLwV?=
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:49.5591
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-Network-Message-Id: 05b86f93-9aa3-4eac-54b6-08d8a0cbe786
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 6Id+trp1fMyFLR/5o7NTfY748vM2v+4rVthvJJToBZQPsPltcBQhJ69N/mQz2oigsITlr2KvCYOs7Yzz3crkaQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB3127
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

To simplify the fetch_pte function. There is no functional change.

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

diff --git a/drivers/iommu/amd/amd_iommu.h b/drivers/iommu/amd/amd_iommu.h
index 76276d9e463c..83ca822c5349 100644
--- a/drivers/iommu/amd/amd_iommu.h
+++ b/drivers/iommu/amd/amd_iommu.h
@@ -143,7 +143,7 @@ extern int iommu_map_page(struct protection_domain *dom,
 extern unsigned long iommu_unmap_page(struct protection_domain *dom,
 				      unsigned long bus_addr,
 				      unsigned long page_size);
-extern u64 *fetch_pte(struct protection_domain *domain,
+extern u64 *fetch_pte(struct amd_io_pgtable *pgtable,
 		      unsigned long address,
 		      unsigned long *page_size);
 extern void amd_iommu_domain_set_pgtable(struct protection_domain *domain,
diff --git a/drivers/iommu/amd/io_pgtable.c b/drivers/iommu/amd/io_pgtable.c
index 35dd9153e6b7..87184b6cee0f 100644
--- a/drivers/iommu/amd/io_pgtable.c
+++ b/drivers/iommu/amd/io_pgtable.c
@@ -317,7 +317,7 @@ static u64 *alloc_pte(struct protection_domain *domain,
  * This function checks if there is a PTE for a given dma address. If
  * there is one, it returns the pointer to it.
  */
-u64 *fetch_pte(struct protection_domain *domain,
+u64 *fetch_pte(struct amd_io_pgtable *pgtable,
 	       unsigned long address,
 	       unsigned long *page_size)
 {
@@ -326,11 +326,11 @@ u64 *fetch_pte(struct protection_domain *domain,
 
 	*page_size = 0;
 
-	if (address > PM_LEVEL_SIZE(domain->iop.mode))
+	if (address > PM_LEVEL_SIZE(pgtable->mode))
 		return NULL;
 
-	level	   =  domain->iop.mode - 1;
-	pte	   = &domain->iop.root[PM_LEVEL_INDEX(level, address)];
+	level	   =  pgtable->mode - 1;
+	pte	   = &pgtable->root[PM_LEVEL_INDEX(level, address)];
 	*page_size =  PTE_LEVEL_PAGE_SIZE(level);
 
 	while (level > 0) {
@@ -465,6 +465,8 @@ unsigned long iommu_unmap_page(struct protection_domain *dom,
 			       unsigned long iova,
 			       unsigned long size)
 {
+	struct io_pgtable_ops *ops = &dom->iop.iop.ops;
+	struct amd_io_pgtable *pgtable = io_pgtable_ops_to_data(ops);
 	unsigned long long unmapped;
 	unsigned long unmap_size;
 	u64 *pte;
@@ -474,8 +476,7 @@ unsigned long iommu_unmap_page(struct protection_domain *dom,
 	unmapped = 0;
 
 	while (unmapped < size) {
-		pte = fetch_pte(dom, iova, &unmap_size);
-
+		pte = fetch_pte(pgtable, iova, &unmap_size);
 		if (pte) {
 			int i, count;
 
diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c
index 2963a37b7c16..76f61dd6b89f 100644
--- a/drivers/iommu/amd/iommu.c
+++ b/drivers/iommu/amd/iommu.c
@@ -2100,13 +2100,15 @@ static phys_addr_t amd_iommu_iova_to_phys(struct iommu_domain *dom,
 					  dma_addr_t iova)
 {
 	struct protection_domain *domain = to_pdomain(dom);
+	struct io_pgtable_ops *ops = &domain->iop.iop.ops;
+	struct amd_io_pgtable *pgtable = io_pgtable_ops_to_data(ops);
 	unsigned long offset_mask, pte_pgsize;
 	u64 *pte, __pte;
 
 	if (domain->iop.mode == PAGE_MODE_NONE)
 		return iova;
 
-	pte = fetch_pte(domain, iova, &pte_pgsize);
+	pte = fetch_pte(pgtable, iova, &pte_pgsize);
 
 	if (!pte || !IOMMU_PTE_PRESENT(*pte))
 		return 0;
-- 
2.17.1