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 13/13] iommu/amd: Adopt IO page table framework
Date:   Fri,  2 Oct 2020 12:28:30 +0000
Message-Id: <20201002122830.4051-14-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:25:00 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-HT: Tenant
X-MS-Office365-Filtering-Correlation-Id: 2033f1b7-768b-43a2-ec22-08d866ce2ef4
X-MS-TrafficTypeDiagnostic: DM5PR12MB1163:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <DM5PR12MB11632D3E6475B92F1B6A41E0F3310@DM5PR12MB1163.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: 9Hae6Pf+02K5N46x+fe/AByyp0MwXVwFtW95YDKSFpHzPu3H18vEuNjfdAX1vCda5p8JgBU0E2hAqRF4NACCGSXIYka5qZD9L+5mPA+LSmoyHHquf2p8+3qHv8eOQgENdHKEnYzyf4PjUUuFRhVYijwhIlJLhiyUgy5IurYBj8dPbQn77eJXTFz4413JUIKuhHg/Q91sJArES63DZt1VTc3zXfGQSjxo2qNEp0vKY5Aj5C/w2NsmrkVJYTXuV6+HbBJ/ThtB0itQpVt0sB2zuCuU5zpBmCeIQLdKABwNzG2/XXiuFR3a3u1rP2GMg53T8hhMv8C6YyVf67OtgY7meQ==
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)(8676002)(2906002)(86362001);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData: /iTD7S22KKTN83TqGRWoA6beNML4suRwlDk3EIihNZYdmp7Il0oBKb2zgLl4flWcCosrvlmQnOtbWPy4sWGyvklVmVomc35yJeEa7DEgd3TItDOBcwzQG0u2ROwWpGuKqrPHBlcV3bfK+qz5Sk/YJE8O3/T83JV9Ox1CEWuEqToc0XC0Zi+A5K8atbCjmaqxeZGKNE+9asWH8cIASgJpcN5p/3VBCrYHQwgYnLgkS80952HsATs1tKwrXQqv1vkkd/1nzcsVIBt+OpiWJh9yTDOA0b/VM8ZowYAVB9x1LmTLrukQ7InqopQiAgcAaOPl+6lZpik7o2MlrqiJ5ObrmyoYDnnu9EV8tFpk41z2Cr4N8PFmWahuxnlmRQb4RduLHsh6AxHoqp9zIpmZ2/VXo33aT13AYoGctqk8Nyx1YvyFmgp1yMOOZUgagHhQeZfw4QohuuCAi9eMXO7SiWtGMK7oANyiKWkTfWQZcfclUCI2XlWILJuUEY4IXQ1d8720ST/vk8t92foqzC3G9083eeAuAMBKVP4/6t5k6ucCbx/EZ3vymY0j5eRIFhcsxTLvkUsdHYny4EEmjggjSXu8uqFL3awj4zcFZfrpQ5D0c3sZwcAu+Qpqd3JzRsl4vMB/wjRGQDIUrjV1OK0lLR4WiQ==
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 2033f1b7-768b-43a2-ec22-08d866ce2ef4
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:25:01.2113
 (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: DAZds+SFXBxbaqjn7ffxZBHWXkJpibGZPiYrRwqqaUE+AaLidD84gvGYUipTV9Kf0yg06m6Px3D1M3fslsOdHw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1163
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 | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c
index 77f44b927ae7..c28949be3442 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,20 @@ 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)
+{
+	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	= &dev_data->pdev->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 +1595,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 +1639,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 +1980,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