From patchwork Tue May 19 13:20:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 6437131 Return-Path: X-Original-To: patchwork-linux-samsung-soc@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 D2297C0432 for ; Tue, 19 May 2015 13:21:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1E9EF2052F for ; Tue, 19 May 2015 13:21:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 329BE20574 for ; Tue, 19 May 2015 13:21:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755938AbbESNVM (ORCPT ); Tue, 19 May 2015 09:21:12 -0400 Received: from mailout4.w1.samsung.com ([210.118.77.14]:41252 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755893AbbESNVG (ORCPT ); Tue, 19 May 2015 09:21:06 -0400 Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NOL000W3MF4S010@mailout4.w1.samsung.com> for linux-samsung-soc@vger.kernel.org; Tue, 19 May 2015 14:21:04 +0100 (BST) X-AuditID: cbfec7f5-f794b6d000001495-c9-555b38c0d5ec Received: from eusync2.samsung.com ( [203.254.199.212]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id 33.09.05269.0C83B555; Tue, 19 May 2015 14:21:04 +0100 (BST) Received: from amdc1339.digital.local ([106.116.147.30]) by eusync2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NOL00MHWMEO0V20@eusync2.samsung.com>; Tue, 19 May 2015 14:21:04 +0100 (BST) From: Marek Szyprowski To: iommu@lists.linux-foundation.org, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Marek Szyprowski , linaro-mm-sig@lists.linaro.org, Arnd Bergmann , Shaik Ameer Basha , Cho KyongHo , Joerg Roedel , Thierry Reding , Olof Johansson , Laurent Pinchart , Rob Herring , Will Deacon , David Wodhouse , Inki Dae , Kukjin Kim , Tomasz Figa , Kyungmin Park , Joonyoung Shim , Seung-Woo Kim , Javier Martinez Canillas , Krzysztof Kozlowski Subject: [PATCH v7 09/25] iommu/exynos: Use struct exynos_iommu_domain in internal structures Date: Tue, 19 May 2015 15:20:29 +0200 Message-id: <1432041645-11172-10-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.2 In-reply-to: <1432041645-11172-1-git-send-email-m.szyprowski@samsung.com> References: <1432041645-11172-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprAIsWRmVeSWpSXmKPExsVy+t/xK7oHLKJDDdY081n8nXSM3WLiysnM FpPuT2CxWLDf2uLa7xlsFp2zN7BbvLh3kcXi9QtDi/7Hr5ktzja9YbfonLiE3eLLlYdMFpse X2O1mHF+H5PF2iN32S1OXf/MZvGv9yCjxf89O9gtjjzczW4xY/JLNotVu/4wWtz+zWfx8uMJ FgdxjycH5zF5rJm3htHj969JjB5/Z7cye+ycdZfdY3bHTFaPzSu0PDat6mTz2Lyk3uP2v8fM HpNvLGf0uHKiidWjt/kdm0ffllWMHp83yQXwR3HZpKTmZJalFunbJXBlvGptYyw4z19xtfMy awPjG54uRg4OCQETiXvvjLsYOYFMMYkL99azdTFycQgJLGWUmDn1JTOE08Qk8WrLK0aQKjYB Q4mut11sILaIQL7Ei71/WUCKmAUWsElce/caLCEsEC9x4nM3mM0ioCqxsHUhE8g2XgFPiXsN OhDb5CT+v1zBBGJzAoUbXi5hB7GFBDwk2k58YpvAyLuAkWEVo2hqaXJBcVJ6rpFecWJucWle ul5yfu4mRkg8fd3BuPSY1SFGAQ5GJR7eH9zRoUKsiWXFlbmHGCU4mJVEeF21gEK8KYmVValF +fFFpTmpxYcYpTlYlMR5Z+56HyIkkJ5YkpqdmlqQWgSTZeLglGpgvPJ7Vt6CmxlbJs5q+R3j +471sLOCpV9IWu4eZY5b/2yu/lL8VZt4tnGfrC3jtX//Bey6mIuv3mR9W11v8vPopXPJbfef bODw//5/Ltfqms0tW5cZsx/h8j5clT3z5voLqxr/BsyOnbldtvxR19Ks3YvC5VJ36Z8N+ybC tD31SOV738awWb5mqkosxRmJhlrMRcWJAGMEuROjAgAA Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 1cb3c27e9125..33118aa9fdc1 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; phys_addr_t pgtable; unsigned int version; @@ -337,7 +337,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); } @@ -436,7 +436,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; @@ -444,7 +444,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); @@ -702,7 +702,7 @@ static int exynos_iommu_attach_device(struct iommu_domain *iommu_domain, data = dev_get_drvdata(owner->sysmmu); if (data) { - ret = __sysmmu_enable(data, pagetable, iommu_domain); + ret = __sysmmu_enable(data, pagetable, domain); if (ret >= 0) { data->master = dev;