From: Marek Szyprowski <m.szyprowski@samsung.com> To: iommu@lists.linux-foundation.org, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Marek Szyprowski <m.szyprowski@samsung.com>, linaro-mm-sig@lists.linaro.org, Arnd Bergmann <arnd@arndb.de>, Shaik Ameer Basha <shaik.ameer@samsung.com>, Cho KyongHo <pullip.cho@samsung.com>, Joerg Roedel <joro@8bytes.org>, Thierry Reding <treding@nvidia.com>, Olof Johansson <olof@lixom.net>, Laurent Pinchart <laurent.pinchart@ideasonboard.com>, Rob Herring <robh@kernel.org>, Will Deacon <will.deacon@arm.com>, David Wodhouse <dwmw2@infradead.org>, Inki Dae <inki.dae@samsung.com>, Kukjin Kim <kgene@kernel.org>, Tomasz Figa <tomasz.figa@gmail.com>, Kyungmin Park <kyungmin.park@samsung.com>, Joonyoung Shim <jy0922.shim@samsung.com>, Seung-Woo Kim <sw0312.kim@samsung.com>, Javier Martinez Canillas <javier@dowhile0.org>, Krzysztof Kozlowski <k.kozlowski@samsung.com> Subject: [PATCH v7 09/25] iommu/exynos: Use struct exynos_iommu_domain in internal structures Date: Tue, 19 May 2015 15:20:29 +0200 [thread overview] Message-ID: <1432041645-11172-10-git-send-email-m.szyprowski@samsung.com> (raw) In-Reply-To: <1432041645-11172-1-git-send-email-m.szyprowski@samsung.com> Replace all remaining usage of struct iommu_domain with struct exynos_iommu_domain in all internal structures and functions. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> --- 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; -- 1.9.2
WARNING: multiple messages have this Message-ID (diff)
From: m.szyprowski@samsung.com (Marek Szyprowski) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v7 09/25] iommu/exynos: Use struct exynos_iommu_domain in internal structures Date: Tue, 19 May 2015 15:20:29 +0200 [thread overview] Message-ID: <1432041645-11172-10-git-send-email-m.szyprowski@samsung.com> (raw) In-Reply-To: <1432041645-11172-1-git-send-email-m.szyprowski@samsung.com> Replace all remaining usage of struct iommu_domain with struct exynos_iommu_domain in all internal structures and functions. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> --- 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; -- 1.9.2
next prev parent reply other threads:[~2015-05-19 13:21 UTC|newest] Thread overview: 100+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-05-19 13:20 [PATCH v7 00/25] Exynos SYSMMU (IOMMU) integration with DT and DMA-mapping subsystem Marek Szyprowski 2015-05-19 13:20 ` Marek Szyprowski 2015-05-19 13:20 ` [PATCH v7 01/25] drm/exynos: iommu: detach from default dma-mapping domain on init Marek Szyprowski 2015-05-19 13:20 ` Marek Szyprowski 2015-05-19 13:20 ` [PATCH v7 02/25] drm/exynos: fimd: ensure proper hw state in fimd_clear_channel() Marek Szyprowski 2015-05-19 13:20 ` Marek Szyprowski 2015-05-19 13:20 ` [PATCH v7 03/25] iommu: Init iommu-groups support earlier, in core_initcall Marek Szyprowski 2015-05-19 13:20 ` Marek Szyprowski [not found] ` <1432041645-11172-4-git-send-email-m.szyprowski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> 2015-05-23 16:23 ` Laurent Pinchart 2015-05-23 16:23 ` Laurent Pinchart 2015-05-25 7:28 ` Marek Szyprowski 2015-05-25 7:28 ` Marek Szyprowski 2015-05-29 8:33 ` Joerg Roedel 2015-05-29 8:33 ` Joerg Roedel 2015-05-19 13:20 ` [PATCH v7 04/25] iommu/exynos: Don't read version register on every tlb operation Marek Szyprowski 2015-05-19 13:20 ` Marek Szyprowski 2015-05-19 13:20 ` [PATCH v7 05/25] iommu/exynos: Remove unused functions Marek Szyprowski 2015-05-19 13:20 ` Marek Szyprowski 2015-05-19 13:20 ` [PATCH v7 06/25] iommu/exynos: Remove useless members from exynos_iommu_owner structure Marek Szyprowski 2015-05-19 13:20 ` Marek Szyprowski 2015-05-19 13:20 ` [PATCH v7 07/25] iommu/exynos: Refactor function parameters to simplify code Marek Szyprowski 2015-05-19 13:20 ` Marek Szyprowski 2015-05-19 13:20 ` [PATCH v7 08/25] iommu/exynos: Rename variables to reflect their purpose Marek Szyprowski 2015-05-19 13:20 ` Marek Szyprowski 2015-05-19 13:20 ` Marek Szyprowski [this message] 2015-05-19 13:20 ` [PATCH v7 09/25] iommu/exynos: Use struct exynos_iommu_domain in internal structures Marek Szyprowski 2015-05-19 13:20 ` [PATCH v7 10/25] iommu/exynos: Remove excessive includes and sort others alphabetically Marek Szyprowski 2015-05-19 13:20 ` Marek Szyprowski 2015-05-19 13:20 ` [PATCH v7 11/25] iommu/exynos: Document internal structures Marek Szyprowski 2015-05-19 13:20 ` Marek Szyprowski 2015-05-19 13:20 ` [PATCH v7 12/25] iommu/exynos: Add/remove callbacks should fail if no iommu is available Marek Szyprowski 2015-05-19 13:20 ` Marek Szyprowski 2015-05-19 13:20 ` [PATCH v7 13/25] iommu/exynos: Add support for binding more than one sysmmu to master device Marek Szyprowski 2015-05-19 13:20 ` Marek Szyprowski 2015-05-19 13:20 ` [PATCH v7 14/25] iommu/exynos: Add support for runtime_pm Marek Szyprowski 2015-05-19 13:20 ` Marek Szyprowski 2015-05-19 13:20 ` [PATCH v7 15/25] iommu/exynos: Add system suspend/resume support Marek Szyprowski 2015-05-19 13:20 ` Marek Szyprowski 2015-05-19 13:20 ` [PATCH v7 16/25] iommu/exynos: Init from dt-specific callback instead of initcall Marek Szyprowski 2015-05-19 13:20 ` Marek Szyprowski 2015-05-19 13:20 ` [PATCH v7 17/25] iommu/exynos: Add callback for initializing devices from device tree Marek Szyprowski 2015-05-19 13:20 ` Marek Szyprowski 2015-05-19 13:20 ` [PATCH v7 18/25] ARM: Exynos: pm_domains: register power domain driver from core_initcall Marek Szyprowski 2015-05-19 13:20 ` Marek Szyprowski 2015-05-20 0:51 ` Krzysztof Kozlowski 2015-05-20 0:51 ` Krzysztof Kozlowski [not found] ` <1432041645-11172-1-git-send-email-m.szyprowski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> 2015-05-19 13:20 ` [PATCH v7 19/25] ARM: dts: exynos4: add sysmmu nodes Marek Szyprowski 2015-05-19 13:20 ` Marek Szyprowski 2015-05-29 8:52 ` [PATCH v7 00/25] Exynos SYSMMU (IOMMU) integration with DT and DMA-mapping subsystem Joerg Roedel 2015-05-29 8:52 ` Joerg Roedel 2015-05-19 13:20 ` [PATCH v7 20/25] ARM: dts: exynos3250: add sysmmu nodes Marek Szyprowski 2015-05-19 13:20 ` Marek Szyprowski 2015-05-19 13:20 ` [PATCH v7 21/25] ARM: dts: exynos4415: " Marek Szyprowski 2015-05-19 13:20 ` Marek Szyprowski 2015-05-19 13:20 ` [PATCH v7 22/25] ARM: dts: exynos5250: " Marek Szyprowski 2015-05-19 13:20 ` Marek Szyprowski 2015-05-19 13:20 ` [PATCH v7 23/25] ARM: dts: exynos5420: " Marek Szyprowski 2015-05-19 13:20 ` Marek Szyprowski 2015-05-19 13:20 ` [PATCH v7 24/25] ARM: DMA-mapping: add support for creating reserved mappings in iova space Marek Szyprowski 2015-05-19 13:20 ` Marek Szyprowski 2015-05-19 13:20 ` [PATCH v7 25/25] ARM: dts: exynos: add iommu reserved regions for bootloader's splash screen Marek Szyprowski 2015-05-19 13:20 ` Marek Szyprowski 2015-05-20 7:31 ` [PATCH v7 00/25] Exynos SYSMMU (IOMMU) integration with DT and DMA-mapping subsystem Javier Martinez Canillas 2015-05-20 7:31 ` Javier Martinez Canillas 2015-05-23 3:56 ` [PATCH v7 00/25] Exynos SYSMMU (IOMMU) integration with DT andDMA-mapping subsystem Kukjin Kim 2015-05-23 3:56 ` Kukjin Kim 2015-05-28 23:54 ` Krzysztof Kozlowski 2015-05-28 23:54 ` Krzysztof Kozlowski 2015-06-01 10:10 ` [PATCH 0/6] Exynos SYSMMU (IOMMU) dts and arch updates Marek Szyprowski 2015-06-01 10:10 ` Marek Szyprowski 2015-06-01 10:10 ` [PATCH 1/6] ARM: Exynos: pm_domains: register power domain driver from core_initcall Marek Szyprowski 2015-06-01 10:10 ` Marek Szyprowski 2015-06-01 10:10 ` [PATCH 2/6] ARM: dts: exynos4: add sysmmu nodes Marek Szyprowski 2015-06-01 10:10 ` Marek Szyprowski 2015-06-01 10:10 ` [PATCH 3/6] ARM: dts: exynos3250: " Marek Szyprowski 2015-06-01 10:10 ` Marek Szyprowski 2015-06-01 10:10 ` [PATCH 4/6] ARM: dts: exynos4415: " Marek Szyprowski 2015-06-01 10:10 ` Marek Szyprowski 2015-06-01 10:10 ` [PATCH 5/6] ARM: dts: exynos5250: " Marek Szyprowski 2015-06-01 10:10 ` Marek Szyprowski 2015-06-01 10:10 ` [PATCH 6/6] ARM: dts: exynos5420: " Marek Szyprowski 2015-06-01 10:10 ` Marek Szyprowski 2015-06-01 19:12 ` Exynos 5410 support (was [PATCH 6/6] ARM: dts: exynos5420: add sysmmu nodes) Ben Gamari 2015-06-01 19:12 ` Ben Gamari 2015-06-01 23:51 ` Krzysztof Kozłowski 2015-06-01 23:51 ` Krzysztof Kozłowski 2015-06-02 8:13 ` Ben Gamari 2015-06-02 8:13 ` Ben Gamari 2015-06-02 8:26 ` Krzysztof Kozłowski 2015-06-02 8:26 ` Krzysztof Kozłowski 2015-06-04 19:28 ` Ben Gamari 2015-06-04 19:28 ` Ben Gamari 2015-06-01 11:34 ` [PATCH 0/6] Exynos SYSMMU (IOMMU) dts and arch updates Krzysztof Kozlowski 2015-06-01 11:34 ` Krzysztof Kozlowski 2015-06-03 23:11 ` Kukjin Kim 2015-06-03 23:11 ` Kukjin Kim 2015-06-04 3:51 ` Krzysztof Kozlowski 2015-06-04 3:51 ` Krzysztof Kozlowski 2015-06-04 6:10 ` Krzysztof Kozlowski 2015-06-04 6:10 ` Krzysztof Kozlowski
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1432041645-11172-10-git-send-email-m.szyprowski@samsung.com \ --to=m.szyprowski@samsung.com \ --cc=arnd@arndb.de \ --cc=dwmw2@infradead.org \ --cc=inki.dae@samsung.com \ --cc=iommu@lists.linux-foundation.org \ --cc=javier@dowhile0.org \ --cc=joro@8bytes.org \ --cc=jy0922.shim@samsung.com \ --cc=k.kozlowski@samsung.com \ --cc=kgene@kernel.org \ --cc=kyungmin.park@samsung.com \ --cc=laurent.pinchart@ideasonboard.com \ --cc=linaro-mm-sig@lists.linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=olof@lixom.net \ --cc=pullip.cho@samsung.com \ --cc=robh@kernel.org \ --cc=shaik.ameer@samsung.com \ --cc=sw0312.kim@samsung.com \ --cc=tomasz.figa@gmail.com \ --cc=treding@nvidia.com \ --cc=will.deacon@arm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.