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, linux-kernel@vger.kernel.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>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, "Rafael J. Wysocki" <rjw@rjwysocki.net>, Inki Dae <inki.dae@samsung.com>, Kukjin Kim <kgene.kim@samsung.com>, Sylwester Nawrocki <s.nawrocki@samsung.com>, Tomasz Figa <tomasz.figa@gmail.com>, Kyungmin Park <kyungmin.park@samsung.com> Subject: [PATCH 29/29] temporary: media: s5p-mfc: add support for IOMMU Date: Tue, 05 Aug 2014 12:47:57 +0200 [thread overview] Message-ID: <1407235677-26324-30-git-send-email-m.szyprowski@samsung.com> (raw) In-Reply-To: <1407235677-26324-1-git-send-email-m.szyprowski@samsung.com> This patch is an example how to use more than one IOMMU controller in a device driver for hardware blocks, which have more then one dma master (memory interface with iommu controller). This patch is temporary, do not merge it yet. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> --- drivers/media/platform/s5p-mfc/s5p_mfc.c | 46 ++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c index 77b99ae..c2e95ab 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c @@ -22,7 +22,11 @@ #include <media/v4l2-event.h> #include <linux/workqueue.h> #include <linux/of.h> +#include <linux/of_platform.h> #include <media/videobuf2-core.h> + +#include <asm/dma-iommu.h> + #include "s5p_mfc_common.h" #include "s5p_mfc_ctrl.h" #include "s5p_mfc_debug.h" @@ -996,6 +1000,39 @@ static const struct v4l2_file_operations s5p_mfc_fops = { .mmap = s5p_mfc_mmap, }; +static struct device *s5p_mfc_alloc_memdev(struct device *dev, const char *name) +{ + struct device *child; + int ret; + + child = devm_kzalloc(dev, sizeof(struct device), GFP_KERNEL); + if (!child) + return NULL; + + device_initialize(child); + dev_set_name(child, "%s:%s", dev_name(dev), name); + child->parent = dev; + child->bus = dev->bus; + child->coherent_dma_mask = dev->coherent_dma_mask; + child->dma_mask = dev->dma_mask; + + if (device_add(child) == 0) { + ret = arm_iommu_create_default_mapping(child, 0x20000000, + SZ_256M); + if (ret == 0) + return child; + } + + put_device(child); + return NULL; +} + +void s5p_mfc_free_memdev(struct device *dev) +{ + arm_iommu_release_default_mapping(dev); + put_device(dev); +} + static void *mfc_get_drv_data(struct platform_device *pdev); /* MFC probe function */ @@ -1049,8 +1086,8 @@ static int s5p_mfc_probe(struct platform_device *pdev) goto err_res; } - dev->mem_dev_l = &dev->plat_dev->dev; - dev->mem_dev_r = &dev->plat_dev->dev; + dev->mem_dev_l = s5p_mfc_alloc_memdev(&dev->plat_dev->dev, "left"); + dev->mem_dev_r = s5p_mfc_alloc_memdev(&dev->plat_dev->dev, "right"); dev->alloc_ctx[0] = vb2_dma_contig_init_ctx(dev->mem_dev_l); if (IS_ERR(dev->alloc_ctx[0])) { @@ -1181,6 +1218,10 @@ static int s5p_mfc_remove(struct platform_device *pdev) s5p_mfc_release_firmware(dev); vb2_dma_contig_cleanup_ctx(dev->alloc_ctx[0]); vb2_dma_contig_cleanup_ctx(dev->alloc_ctx[1]); + if (dev->mem_dev_l) + s5p_mfc_free_memdev(dev->mem_dev_l); + if (dev->mem_dev_r) + s5p_mfc_free_memdev(dev->mem_dev_r); s5p_mfc_final_pm(dev); return 0; @@ -1436,6 +1477,7 @@ static struct platform_driver s5p_mfc_driver = { .owner = THIS_MODULE, .pm = &s5p_mfc_pm_ops, .of_match_table = exynos_mfc_match, + .flags = DRIVER_HAS_OWN_IOMMU_MANAGER, }, }; -- 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 29/29] temporary: media: s5p-mfc: add support for IOMMU Date: Tue, 05 Aug 2014 12:47:57 +0200 [thread overview] Message-ID: <1407235677-26324-30-git-send-email-m.szyprowski@samsung.com> (raw) In-Reply-To: <1407235677-26324-1-git-send-email-m.szyprowski@samsung.com> This patch is an example how to use more than one IOMMU controller in a device driver for hardware blocks, which have more then one dma master (memory interface with iommu controller). This patch is temporary, do not merge it yet. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> --- drivers/media/platform/s5p-mfc/s5p_mfc.c | 46 ++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c index 77b99ae..c2e95ab 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c @@ -22,7 +22,11 @@ #include <media/v4l2-event.h> #include <linux/workqueue.h> #include <linux/of.h> +#include <linux/of_platform.h> #include <media/videobuf2-core.h> + +#include <asm/dma-iommu.h> + #include "s5p_mfc_common.h" #include "s5p_mfc_ctrl.h" #include "s5p_mfc_debug.h" @@ -996,6 +1000,39 @@ static const struct v4l2_file_operations s5p_mfc_fops = { .mmap = s5p_mfc_mmap, }; +static struct device *s5p_mfc_alloc_memdev(struct device *dev, const char *name) +{ + struct device *child; + int ret; + + child = devm_kzalloc(dev, sizeof(struct device), GFP_KERNEL); + if (!child) + return NULL; + + device_initialize(child); + dev_set_name(child, "%s:%s", dev_name(dev), name); + child->parent = dev; + child->bus = dev->bus; + child->coherent_dma_mask = dev->coherent_dma_mask; + child->dma_mask = dev->dma_mask; + + if (device_add(child) == 0) { + ret = arm_iommu_create_default_mapping(child, 0x20000000, + SZ_256M); + if (ret == 0) + return child; + } + + put_device(child); + return NULL; +} + +void s5p_mfc_free_memdev(struct device *dev) +{ + arm_iommu_release_default_mapping(dev); + put_device(dev); +} + static void *mfc_get_drv_data(struct platform_device *pdev); /* MFC probe function */ @@ -1049,8 +1086,8 @@ static int s5p_mfc_probe(struct platform_device *pdev) goto err_res; } - dev->mem_dev_l = &dev->plat_dev->dev; - dev->mem_dev_r = &dev->plat_dev->dev; + dev->mem_dev_l = s5p_mfc_alloc_memdev(&dev->plat_dev->dev, "left"); + dev->mem_dev_r = s5p_mfc_alloc_memdev(&dev->plat_dev->dev, "right"); dev->alloc_ctx[0] = vb2_dma_contig_init_ctx(dev->mem_dev_l); if (IS_ERR(dev->alloc_ctx[0])) { @@ -1181,6 +1218,10 @@ static int s5p_mfc_remove(struct platform_device *pdev) s5p_mfc_release_firmware(dev); vb2_dma_contig_cleanup_ctx(dev->alloc_ctx[0]); vb2_dma_contig_cleanup_ctx(dev->alloc_ctx[1]); + if (dev->mem_dev_l) + s5p_mfc_free_memdev(dev->mem_dev_l); + if (dev->mem_dev_r) + s5p_mfc_free_memdev(dev->mem_dev_r); s5p_mfc_final_pm(dev); return 0; @@ -1436,6 +1477,7 @@ static struct platform_driver s5p_mfc_driver = { .owner = THIS_MODULE, .pm = &s5p_mfc_pm_ops, .of_match_table = exynos_mfc_match, + .flags = DRIVER_HAS_OWN_IOMMU_MANAGER, }, }; -- 1.9.2
next prev parent reply other threads:[~2014-08-05 10:49 UTC|newest] Thread overview: 130+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-08-05 10:47 [PATCH 00/29] Exynos SYSMMU (IOMMU) integration with DT and DMA-mapping subsystem Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-05 10:47 ` [PATCH 01/29] pm: Add PM domain notifications Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-05 10:47 ` [PATCH 02/29] ARM: Exynos: bind power domains earlier, on device creation Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-05 10:47 ` [PATCH 03/29] clk: exynos: add missing smmu_g2d clock and update comments Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-18 11:26 ` Tomasz Figa 2014-08-18 11:26 ` Tomasz Figa 2014-08-05 10:47 ` [PATCH 04/29] drivers: base: add notifier for failed driver bind Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-21 19:46 ` Laurent Pinchart 2014-08-21 19:46 ` Laurent Pinchart 2014-08-25 20:05 ` Greg Kroah-Hartman 2014-08-25 20:05 ` Greg Kroah-Hartman 2014-08-25 20:05 ` Greg Kroah-Hartman 2014-08-26 6:23 ` Marek Szyprowski 2014-08-26 6:23 ` Marek Szyprowski 2014-08-26 6:23 ` Marek Szyprowski 2014-08-25 21:18 ` Joerg Roedel 2014-08-25 21:18 ` Joerg Roedel 2014-08-25 21:18 ` Joerg Roedel 2014-08-26 6:30 ` Marek Szyprowski 2014-08-26 6:30 ` Marek Szyprowski 2014-08-26 6:30 ` Marek Szyprowski 2014-08-05 10:47 ` [PATCH 05/29] drivers: convert suppress_bind_attrs parameter into flags Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-05 10:47 ` [PATCH 06/29] drivers: iommu: add notify about failed bind Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-05 10:47 ` [PATCH 07/29] ARM: dma-mapping: arm_iommu_attach_device: automatically set max_seg_size Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-05 10:47 ` [PATCH 08/29] ARM: dma-mapping: add helpers for managing default per-device dma mappings Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-05 10:47 ` [PATCH 09/29] ARM: dma-mapping: provide stubs if no ARM_DMA_USE_IOMMU has been selected Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-05 10:47 ` [PATCH 10/29] drivers: add DRIVER_HAS_OWN_IOMMU_MANAGER flag Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-09-01 5:22 ` Marek Szyprowski 2014-09-01 5:22 ` Marek Szyprowski 2014-09-01 5:22 ` Marek Szyprowski 2014-09-01 7:07 ` Thierry Reding 2014-09-01 7:07 ` Thierry Reding 2014-09-01 7:07 ` Thierry Reding 2014-09-01 7:53 ` Marek Szyprowski 2014-09-01 7:53 ` Marek Szyprowski 2014-09-01 7:53 ` Marek Szyprowski 2014-09-01 9:38 ` Arnd Bergmann 2014-09-01 9:38 ` Arnd Bergmann 2014-09-01 9:38 ` Arnd Bergmann 2014-09-01 10:47 ` Marek Szyprowski 2014-09-01 10:47 ` Marek Szyprowski 2014-09-01 10:47 ` Marek Szyprowski 2014-09-01 11:56 ` Arnd Bergmann 2014-09-01 11:56 ` Arnd Bergmann 2014-09-01 11:56 ` Arnd Bergmann 2014-09-01 12:07 ` Marek Szyprowski 2014-09-01 12:07 ` Marek Szyprowski 2014-09-01 12:07 ` Marek Szyprowski 2014-09-01 13:14 ` [Linaro-mm-sig] " Arnd Bergmann 2014-09-01 13:14 ` Arnd Bergmann 2014-09-01 13:14 ` Arnd Bergmann 2014-08-05 10:47 ` [PATCH 11/29] DRM: exynos: add DRIVER_HAS_OWN_IOMMU_MANAGER flag to all sub-drivers Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-05 10:47 ` [PATCH 12/29] DRM: Exynos: fix window clear code Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-09-01 13:37 ` Inki Dae 2014-09-01 13:37 ` Inki Dae 2014-08-05 10:47 ` [PATCH 13/29] temporary: media: s5p-mfc: remove DT hacks & initialization custom memory init code Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-05 10:47 ` [PATCH 14/29] devicetree: Update Exynos SYSMMU device tree bindings Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-05 10:47 ` [PATCH 15/29] ARM: DTS: Exynos4: add System MMU nodes Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-05 10:47 ` [PATCH 16/29] iommu: exynos: make driver multiarch friendly Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-05 10:47 ` [PATCH 17/29] iommu: exynos: don't read version register on every tlb operation Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-05 10:47 ` [PATCH 18/29] iommu: exynos: remove unused functions Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-05 10:47 ` [PATCH 19/29] iommu: exynos: remove useless spinlock Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-05 10:47 ` [PATCH 20/29] iommu: exynos: refactor function parameters to simplify code Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-05 10:47 ` [PATCH 21/29] iommu: exynos: remove unused functions, part 2 Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-05 10:47 ` [PATCH 22/29] iommu: exynos: add support for binding more than one sysmmu to master device Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-05 10:47 ` [PATCH 23/29] iommu: exynos: init iommu controllers from device tree Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-05 10:47 ` [PATCH 24/29] iommu: exynos: create default iommu-based dma-mapping for master devices Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-05 10:47 ` [PATCH 25/29] iommu: exynos: add support for runtime_pm Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-05 10:47 ` [PATCH 26/29] iommu: exynos: rename variables to reflect their purpose Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-05 10:47 ` [PATCH 27/29] iommu: exynos: document internal structures Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-05 10:47 ` [PATCH 28/29] iommu: exynos: remove excessive includes and sort others alphabetically Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski 2014-08-05 10:47 ` Marek Szyprowski [this message] 2014-08-05 10:47 ` [PATCH 29/29] temporary: media: s5p-mfc: add support for IOMMU Marek Szyprowski 2014-08-18 23:32 ` [PATCH 00/29] Exynos SYSMMU (IOMMU) integration with DT and DMA-mapping subsystem Joerg Roedel 2014-08-18 23:32 ` Joerg Roedel 2014-08-18 23:32 ` Joerg Roedel 2014-08-19 6:07 ` Marek Szyprowski 2014-08-19 6:07 ` Marek Szyprowski 2014-08-19 6:07 ` Marek Szyprowski 2014-08-19 11:39 ` Andreas Färber 2014-08-19 11:39 ` Andreas Färber 2014-08-19 12:01 ` Marek Szyprowski 2014-08-19 12:01 ` Marek Szyprowski 2014-08-19 12:01 ` Marek Szyprowski 2014-08-19 12:30 ` Andreas Färber 2014-08-19 12:30 ` Andreas Färber
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=1407235677-26324-30-git-send-email-m.szyprowski@samsung.com \ --to=m.szyprowski@samsung.com \ --cc=arnd@arndb.de \ --cc=gregkh@linuxfoundation.org \ --cc=inki.dae@samsung.com \ --cc=iommu@lists.linux-foundation.org \ --cc=joro@8bytes.org \ --cc=kgene.kim@samsung.com \ --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-kernel@vger.kernel.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=olof@lixom.net \ --cc=pullip.cho@samsung.com \ --cc=rjw@rjwysocki.net \ --cc=robh@kernel.org \ --cc=s.nawrocki@samsung.com \ --cc=shaik.ameer@samsung.com \ --cc=tomasz.figa@gmail.com \ --cc=treding@nvidia.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.