From patchwork Mon May 4 08:16:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 6324251 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id F157BBEEE1 for ; Mon, 4 May 2015 08:30:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2878020165 for ; Mon, 4 May 2015 08:30:11 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4D80520155 for ; Mon, 4 May 2015 08:30:10 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YpBiT-0003tH-M7; Mon, 04 May 2015 08:27:05 +0000 Received: from mailout3.w1.samsung.com ([210.118.77.13]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YpBZN-0002xb-CO for linux-arm-kernel@lists.infradead.org; Mon, 04 May 2015 08:17:46 +0000 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NNT007XCGCQWY50@mailout3.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Mon, 04 May 2015 09:17:14 +0100 (BST) X-AuditID: cbfec7f4-f79c56d0000012ee-70-55472b0ac2ef Received: from eusync1.samsung.com ( [203.254.199.211]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id F6.D6.04846.A0B27455; Mon, 4 May 2015 09:17:14 +0100 (BST) Received: from amdc1339.digital.local ([106.116.147.30]) by eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NNT008X3GC52F50@eusync1.samsung.com>; Mon, 04 May 2015 09:17:14 +0100 (BST) From: Marek Szyprowski To: iommu@lists.linux-foundation.org, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v6 14/25] iommu: exynos: use struct exynos_iommu_domain in internal structures Date: Mon, 04 May 2015 10:16:09 +0200 Message-id: <1430727380-10912-15-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.2 In-reply-to: <1430727380-10912-1-git-send-email-m.szyprowski@samsung.com> References: <1430727380-10912-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupikeLIzCtJLcpLzFFi42I5/e/4ZV0ubfdQgz+tGhZ/Jx1jt5i4cjKz xaT7E1gsFuy3trj2ewabRefsDewWL+5dZLHof/ya2eJs0xt2i86JS9gtvlx5yGSx6fE1VosZ 5/cxWaw9cpfd4tT1z2wW/3oPMlr837OD3eLIw93sFjMmv2SzWLXrD6PF7d98Fi8/nmBxEPN4 cnAek8eaeWsYPX7/msTo8Xd2K7PHzll32T1md8xk9di8Qstj06pONo/NS+o9bv97zOwx+cZy Ro8rJ5pYPXqb37F59G1ZxejxeZNcAH8Ul01Kak5mWWqRvl0CV8bx5ceZCxoEKhp3+DcwzuXt YuTkkBAwkWi984ANwhaTuHBvPZgtJLCUUeLlQRYIu4lJYstCBRCbTcBQouttF1iNiEC+xIu9 f8FqmAXes0pM+RYIYgsLJEgsn3CJEcRmEVCV2LX2GTOIzSvgKXHk8VwWiF1yEv9frmACsTmB 4u/at7NC7PKQONO6mXUCI+8CRoZVjKKppckFxUnpuYZ6xYm5xaV56XrJ+bmbGCEx9GUH4+Jj VocYBTgYlXh4F8i6hwqxJpYVV+YeYpTgYFYS4X3y0S1UiDclsbIqtSg/vqg0J7X4EKM0B4uS OO/cXe9DhATSE0tSs1NTC1KLYLJMHJxSDYzzN/MbHpE/azrv6J2chD9a9y2r9zee7mE7NTu8 +cOizY/cXv+cwrrwe2glb4FGq/iFeqbMcqlHx/8L7Ll6WGzLhVVMk0TEN/5f9/jaj92T3Sc8 57rXoPH91cVqDh+ZQ6em55QdfFTP+OSben5emYmTA0PdDWN90beNyf9PxV2eve/tiTrFlYtU lFiKMxINtZiLihMBudovvJ0CAAA= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150504_011741_639676_54B8F86A X-CRM114-Status: GOOD ( 10.76 ) X-Spam-Score: -5.0 (-----) Cc: Rob Herring , Thierry Reding , Shaik Ameer Basha , Joonyoung Shim , Arnd Bergmann , Inki Dae , Seung-Woo Kim , Joerg Roedel , Will Deacon , Tomasz Figa , linaro-mm-sig@lists.linaro.org, Kyungmin Park , Kukjin Kim , Laurent Pinchart , Olof Johansson , Javier Martinez Canillas , Cho KyongHo , David Wodhouse , Marek Szyprowski X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Replace all remaining usage of struct iommu_domain with struct exynos_iommu_domain in all internal structures and functions. Signed-off-by: Marek Szyprowski --- drivers/iommu/exynos-iommu.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c index a58f4a4c91d0..67e0633b8080 100644 --- a/drivers/iommu/exynos-iommu.c +++ b/drivers/iommu/exynos-iommu.c @@ -206,7 +206,7 @@ struct sysmmu_drvdata { struct clk *clk_master; int activations; spinlock_t lock; - struct iommu_domain *domain; + struct exynos_iommu_domain *domain; struct list_head domain_node; struct list_head owner_node; phys_addr_t pgtable; @@ -338,7 +338,7 @@ static irqreturn_t exynos_sysmmu_irq(int irq, void *dev_id) show_fault_information(dev_name(data->sysmmu), itype, base, addr); if (data->domain) - ret = report_iommu_fault(data->domain, + ret = report_iommu_fault(&data->domain->domain, data->master, addr, itype); } @@ -437,7 +437,7 @@ static void __sysmmu_enable_nocount(struct sysmmu_drvdata *data) } static int __sysmmu_enable(struct sysmmu_drvdata *data, phys_addr_t pgtable, - struct iommu_domain *iommu_domain) + struct exynos_iommu_domain *domain) { int ret = 0; unsigned long flags; @@ -445,7 +445,7 @@ static int __sysmmu_enable(struct sysmmu_drvdata *data, phys_addr_t pgtable, spin_lock_irqsave(&data->lock, flags); if (set_sysmmu_active(data)) { data->pgtable = pgtable; - data->domain = iommu_domain; + data->domain = domain; __sysmmu_enable_nocount(data); @@ -703,7 +703,7 @@ static int exynos_iommu_attach_device(struct iommu_domain *iommu_domain, list_for_each_entry(data, &owner->clients, owner_node) { pm_runtime_get_sync(data->sysmmu); - ret = __sysmmu_enable(data, pagetable, iommu_domain); + ret = __sysmmu_enable(data, pagetable, domain); if (ret >= 0) { data->master = dev;