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 14/14] iommu/amd: Adopt IO page table framework
Date:   Sun,  4 Oct 2020 01:45:49 +0000
Message-Id: <20201004014549.16065-15-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:42:06 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-HT: Tenant
X-MS-Office365-Filtering-Correlation-Id: 8ca58a61-bada-4fd4-b574-08d86806b3d5
X-MS-TrafficTypeDiagnostic: DM5PR12MB1451:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <DM5PR12MB145178410C4DA5D652E5B8A3F30F0@DM5PR12MB1451.namprd12.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:5516;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: /xdo+jtWuSrUk+fPn6Q2jeY38ioNYlYky1WqeeODnAYuYxzNNkdQQ/1CrhSUucrIAIr2CCt4WQEpV9fWa6mspYN9kQ+m5vr01RtwW+AbRTNTdWKhpSkrsniDgeZHTzKIDXSk5I+yf9KTDQOWS/tEeWb4TMqW2nTvBbXHeZOWdW+cfPNn/vtdpP98tjJwUzNlNrFN9xWhybAK+lcgFlrs/dAciqrPqTlLf3KR1S7WIpB56x07uJ5GqP4f66lPfDL1rx4Qrek+2927LGgO8rw2GMuayHT4F+RfKXICHiGgxvolalC13/ar5XeAPZuZs75ratR5BgpW/VkfcC2n8jQ5Ew==
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)(8676002);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData: cH3dOujC/laRVc3A1VWTP6j2wpP7EP+QuJ4ryhgQ/q526YFy6BNgDff/n3gYLrfGaaXkqLhqJkFk4OSVaB2EZL2VO2udzcJCcXRwU8yUVxmY0ne9zwAIsM3Gf1WNHz4SpXpmd5CpYF70thcmCNPu2ZpqURudNxKg7Y4tq2ZisY2GDKt6owA2finccSbS3yu6uSU4ncfO9ySPtN7IRpWoQBax9L9QZutFZhmq29/sc1qEdrfax1oBND5jFNiJcBxS46hazfbBxO+CJTR9yp+OUzHeQpnuSq1RRdI5zu9ZQ7vOLWSu8EtF99Nj7lhYbi8po2OwxZaG5ymrGM2Atm4c4VnENlMuQgpphll5xjiwRfMVshl9mIZCMGE8tjGFKxV93ZrcoM2KyxjG+jtCoYJ9gfcAd9DCBvLHBtKnuxHNo0yUeBp+ObEwnuTJvhmC+lyVTSQNqdVnrC6q4kLMX0nMeDq/vsFNLrt5xHoFt2tE+m+ikui0+8giGiC6Kos/hRbRnsFGuD7ePuBQD+jdwsr8gQB3bss2jyRAtrW1Xoy+Nz8kE+od7niCLYXWj69YKRJ13iO8jtIHM1yYRBn6OBDPBZA0vwqMuW0hmcO4adFsmg8SLyNgtshaCl2eARtypHN5ESIDiTYBdMwrfKzUJM8MgQ==
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8ca58a61-bada-4fd4-b574-08d86806b3d5
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:42:07.0754
 (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: 2qabKNKNE+iE4QCBG03KziizZeduHiooPfEU8p/Osm9FsIbtyS4jy90cHe27FS8XNb60N6wM99lEF7NH3sKFzw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1451
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Switch to using IO page table framework for AMD IOMMU v1 page table.

Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
---
 drivers/iommu/amd/iommu.c | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c
index 77f44b927ae7..6f8316206fb8 100644
--- a/drivers/iommu/amd/iommu.c
+++ b/drivers/iommu/amd/iommu.c
@@ -32,6 +32,7 @@
 #include <linux/irqdomain.h>
 #include <linux/percpu.h>
 #include <linux/iova.h>
+#include <linux/io-pgtable.h>
 #include <asm/irq_remapping.h>
 #include <asm/io_apic.h>
 #include <asm/apic.h>
@@ -1573,6 +1574,22 @@ static int pdev_iommuv2_enable(struct pci_dev *pdev)
 	return ret;
 }
 
+struct io_pgtable_ops *
+amd_iommu_setup_io_pgtable_ops(struct iommu_dev_data *dev_data,
+			       struct protection_domain *domain)
+{
+	struct amd_iommu *iommu = amd_iommu_rlookup_table[dev_data->devid];
+
+	domain->iop.pgtbl_cfg = (struct io_pgtable_cfg) {
+		.pgsize_bitmap	= AMD_IOMMU_PGSIZES,
+		.ias		= IOMMU_IN_ADDR_BIT_SIZE,
+		.oas		= IOMMU_OUT_ADDR_BIT_SIZE,
+		.iommu_dev	= &iommu->dev->dev,
+	};
+
+	return alloc_io_pgtable_ops(AMD_IOMMU_V1, &domain->iop.pgtbl_cfg, domain);
+}
+
 /*
  * If a device is not yet associated with a domain, this function makes the
  * device visible in the domain
@@ -1580,6 +1597,7 @@ static int pdev_iommuv2_enable(struct pci_dev *pdev)
 static int attach_device(struct device *dev,
 			 struct protection_domain *domain)
 {
+	struct io_pgtable_ops *pgtbl_ops;
 	struct iommu_dev_data *dev_data;
 	struct pci_dev *pdev;
 	unsigned long flags;
@@ -1623,6 +1641,12 @@ static int attach_device(struct device *dev,
 skip_ats_check:
 	ret = 0;
 
+	pgtbl_ops = amd_iommu_setup_io_pgtable_ops(dev_data, domain);
+	if (!pgtbl_ops) {
+		ret = -ENOMEM;
+		goto out;
+	}
+
 	do_attach(dev_data, domain);
 
 	/*
@@ -1958,6 +1982,8 @@ static void amd_iommu_domain_free(struct iommu_domain *dom)
 	if (domain->dev_cnt > 0)
 		cleanup_domain(domain);
 
+	free_io_pgtable_ops(&domain->iop.iop.ops);
+
 	BUG_ON(domain->dev_cnt != 0);
 
 	if (!dom)
-- 
2.17.1