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 11/13] iommu/amd: Introduce iommu_v1_iova_to_phys
Date:   Tue, 15 Dec 2020 01:37:03 -0600
Message-Id: <20201215073705.123786-12-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:49 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-HT: Tenant
X-MS-Office365-Filtering-Correlation-Id: cafd9b72-cbec-4285-16fe-08d8a0cbe813
X-MS-TrafficTypeDiagnostic: BYAPR12MB3127:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <BYAPR12MB31271ECB830EF9DE5F866FEDF3C60@BYAPR12MB3127.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: fIs1e/De00lrZ6jsPaM1C0TqZ9nNZgwkPe3ZZmKjp01sRC38DQZy8vmoSoKYvZnKfchHECeE22IFylRYbTMi16T67zhR8izQgG5rCT7WspywqxYvSyOExtLlBT1FKUGy/ilaVt4VGfkmoIiqMtg3ttgIhmvuM9F7VpIFSlmMEG50L2W5gbA7SGa2AG+S1vDTxceXmQptmOzCYLDtDViI8FnETJ8ZnHWjheGQhiGVvVgySWR0GZijXnvsFSFAIRuvk5rKJfw4A0kKOxCKiHGQtp2xSSi5Mp1ALwKU8mUqvOBF92W+qC/zw4PUdx4LzMftiVkoXOLNvFjo/eg+ihaZUYLD2IPZKZ+10UBjKqM4mgxtxpuzPs09Bt1ay3qy2a9/
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?tbAvmBk7Jfz0qj0DTWOziScdzFy5ctbP42tyLkyAaQsaaMqG5wev5jXQS3eb?=
 =?us-ascii?Q?ScuiPpDfPlAq4OwHKWJ+QApqoNGxcuCt/of4fw4WjwO2cmX5s6dVlmdjgZDV?=
 =?us-ascii?Q?sQLlonIHu3k0FMRSv9skb6Qrg/xOySZHFwTjz7EQxcG1fRAM41y8kJGha0Lu?=
 =?us-ascii?Q?8k9PCzfIEQNpsAhGTAiMbFrNsquPvRsiU21vLTnr6Vbv862quzpu7ymJfFu/?=
 =?us-ascii?Q?qssA2x/+m2ZSrq6ROlgkuxPFE0ssvcOxKUbq4zX6X4YgBmAV4YhOpEx2ZS5F?=
 =?us-ascii?Q?v3Z1+tHg3u2KC3TfiOCa6icNfK2+cmgvhvly864tYKCUoTjsJFNeKN/otHhx?=
 =?us-ascii?Q?SeVuKZ4zLV4pPh8BbysN2IaxS5aDOg5f3oER2M7/Jp/Um5VtFhgkMUREkLuD?=
 =?us-ascii?Q?9pSxaKz/5llky9dYm7aGuLivEbVORGgWmR7Fv9L9eqiFP6msHX39bvKhTFBy?=
 =?us-ascii?Q?nXurpvQ7QeBzenu84iKTNZjkPPYMjZ8XoYsEVPsn1vm6++Og/VSlb44a9xbv?=
 =?us-ascii?Q?SISnxENmv02MCKqHdh0Aqj/q8EbwIxwEYftTGS08HDSKV81FlEXUIl/t0XUu?=
 =?us-ascii?Q?F/BuDxBXMxDTgplS09X7U0UQua2mats3MxjNTnGt75kE4ECLau1RptGWvks8?=
 =?us-ascii?Q?JIykNphSiATxMyj8VOdkZ2YcTqZjtZfe8FG6HJBNgllzmi2S6J64PZr6YuHk?=
 =?us-ascii?Q?1Ewk1WMB9VPDtBKYNfanRsB/iKR3diYaIch2i8qqjBupzRr3VVMnDIKJ8gYO?=
 =?us-ascii?Q?udr0uCRJxb8abJtGp3YiAX7ngIGQw/1dE9oeR1ZHaNv1i9hTyhSWqvE7JYW6?=
 =?us-ascii?Q?aKLPST4t93BzxItlY+R7Iq5cgRs9eWYWmGNJTeJMH+IFiFrGD39/l0/V3t8t?=
 =?us-ascii?Q?6cTl6b2fAWe9AlvvLrbLOcqe3u/HDdvrips6MymOpLGAiIjVS/ZluJdTS6P8?=
 =?us-ascii?Q?vqjFXAPBKS8zoYh2YZkac8LkxcFt2im4PcwQEQupQCiH1jlBxFh3kwHi8wxj?=
 =?us-ascii?Q?mu5Q?=
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:50.4615
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-Network-Message-Id: cafd9b72-cbec-4285-16fe-08d8a0cbe813
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: hJz0SdJJHXCEskLABHYquQwfO7cbsdcjMPTN0ELrIAD8SdFKtIzwExL8DyQIQhQ2yt1XoXbmzMnSAGrZ64iG3g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB3127
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

This implements iova_to_phys for AMD IOMMU v1 pagetable,
which will be used by the IO page table framework.

Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
---
 drivers/iommu/amd/io_pgtable.c | 22 ++++++++++++++++++++++
 drivers/iommu/amd/iommu.c      | 16 +---------------
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/drivers/iommu/amd/io_pgtable.c b/drivers/iommu/amd/io_pgtable.c
index 87184b6cee0f..a293b69b38b9 100644
--- a/drivers/iommu/amd/io_pgtable.c
+++ b/drivers/iommu/amd/io_pgtable.c
@@ -494,6 +494,26 @@ unsigned long iommu_unmap_page(struct protection_domain *dom,
 	return unmapped;
 }
 
+static phys_addr_t iommu_v1_iova_to_phys(struct io_pgtable_ops *ops, unsigned long iova)
+{
+	struct amd_io_pgtable *pgtable = io_pgtable_ops_to_data(ops);
+	unsigned long offset_mask, pte_pgsize;
+	u64 *pte, __pte;
+
+	if (pgtable->mode == PAGE_MODE_NONE)
+		return iova;
+
+	pte = fetch_pte(pgtable, iova, &pte_pgsize);
+
+	if (!pte || !IOMMU_PTE_PRESENT(*pte))
+		return 0;
+
+	offset_mask = pte_pgsize - 1;
+	__pte	    = __sme_clr(*pte & PM_ADDR_MASK);
+
+	return (__pte & ~offset_mask) | (iova & offset_mask);
+}
+
 /*
  * ----------------------------------------------------
  */
@@ -534,6 +554,8 @@ static struct io_pgtable *v1_alloc_pgtable(struct io_pgtable_cfg *cfg, void *coo
 	cfg->oas            = IOMMU_OUT_ADDR_BIT_SIZE,
 	cfg->tlb            = &v1_flush_ops;
 
+	pgtable->iop.ops.iova_to_phys = iommu_v1_iova_to_phys;
+
 	return &pgtable->iop;
 }
 
diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c
index 76f61dd6b89f..29b7fefc8485 100644
--- a/drivers/iommu/amd/iommu.c
+++ b/drivers/iommu/amd/iommu.c
@@ -2101,22 +2101,8 @@ static phys_addr_t amd_iommu_iova_to_phys(struct iommu_domain *dom,
 {
 	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(pgtable, iova, &pte_pgsize);
-
-	if (!pte || !IOMMU_PTE_PRESENT(*pte))
-		return 0;
-
-	offset_mask = pte_pgsize - 1;
-	__pte	    = __sme_clr(*pte & PM_ADDR_MASK);
-
-	return (__pte & ~offset_mask) | (iova & offset_mask);
+	return ops->iova_to_phys(ops, iova);
 }
 
 static bool amd_iommu_capable(enum iommu_cap cap)
-- 
2.17.1