From: Robin Murphy <robin.murphy@arm.com>
To: hch@lst.de, joro@8bytes.org, linux@armlinux.org.uk
Cc: geert+renesas@glider.be, dri-devel@lists.freedesktop.org,
matthias.bgg@gmail.com, thierry.reding@gmail.com,
laurent.pinchart@ideasonboard.com, digetx@gmail.com,
will@kernel.org, linux-samsung-soc@vger.kernel.org,
magnus.damm@gmail.com, kyungmin.park@samsung.com,
jonathanh@nvidia.com, agross@kernel.org,
linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org,
inki.dae@samsung.com, linux-mediatek@lists.infradead.org,
linux-tegra@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, sw0312.kim@samsung.com,
linux-kernel@vger.kernel.org, t-kristo@ti.com,
iommu@lists.linux-foundation.org
Subject: [PATCH 17/18] media/omap3isp: Clean up IOMMU workaround
Date: Thu, 20 Aug 2020 16:08:36 +0100 [thread overview]
Message-ID: <11d8419744e4e744a9448180801b0c4683328afd.1597931876.git.robin.murphy@arm.com> (raw)
In-Reply-To: <cover.1597931875.git.robin.murphy@arm.com>
Now that arch/arm is wired up for default domains and iommu-dma, devices
behind IOMMUs will get mappings set up automatically as appropriate, so
there is no need for drivers to do so manually.
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
---
drivers/media/platform/omap3isp/isp.c | 68 ++-------------------------
drivers/media/platform/omap3isp/isp.h | 3 --
2 files changed, 3 insertions(+), 68 deletions(-)
diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
index b91e472ee764..196522883231 100644
--- a/drivers/media/platform/omap3isp/isp.c
+++ b/drivers/media/platform/omap3isp/isp.c
@@ -56,10 +56,6 @@
#include <linux/sched.h>
#include <linux/vmalloc.h>
-#ifdef CONFIG_ARM_DMA_USE_IOMMU
-#include <asm/dma-iommu.h>
-#endif
-
#include <media/v4l2-common.h>
#include <media/v4l2-fwnode.h>
#include <media/v4l2-device.h>
@@ -1942,51 +1938,6 @@ static int isp_initialize_modules(struct isp_device *isp)
return ret;
}
-static void isp_detach_iommu(struct isp_device *isp)
-{
-#ifdef CONFIG_ARM_DMA_USE_IOMMU
- arm_iommu_detach_device(isp->dev);
- arm_iommu_release_mapping(isp->mapping);
- isp->mapping = NULL;
-#endif
-}
-
-static int isp_attach_iommu(struct isp_device *isp)
-{
-#ifdef CONFIG_ARM_DMA_USE_IOMMU
- struct dma_iommu_mapping *mapping;
- int ret;
-
- /*
- * Create the ARM mapping, used by the ARM DMA mapping core to allocate
- * VAs. This will allocate a corresponding IOMMU domain.
- */
- mapping = arm_iommu_create_mapping(&platform_bus_type, SZ_1G, SZ_2G);
- if (IS_ERR(mapping)) {
- dev_err(isp->dev, "failed to create ARM IOMMU mapping\n");
- return PTR_ERR(mapping);
- }
-
- isp->mapping = mapping;
-
- /* Attach the ARM VA mapping to the device. */
- ret = arm_iommu_attach_device(isp->dev, mapping);
- if (ret < 0) {
- dev_err(isp->dev, "failed to attach device to VA mapping\n");
- goto error;
- }
-
- return 0;
-
-error:
- arm_iommu_release_mapping(isp->mapping);
- isp->mapping = NULL;
- return ret;
-#else
- return -ENODEV;
-#endif
-}
-
/*
* isp_remove - Remove ISP platform device
* @pdev: Pointer to ISP platform device
@@ -2002,10 +1953,6 @@ static int isp_remove(struct platform_device *pdev)
isp_cleanup_modules(isp);
isp_xclk_cleanup(isp);
- __omap3isp_get(isp, false);
- isp_detach_iommu(isp);
- __omap3isp_put(isp, false);
-
media_entity_enum_cleanup(&isp->crashed);
v4l2_async_notifier_cleanup(&isp->notifier);
@@ -2383,18 +2330,11 @@ static int isp_probe(struct platform_device *pdev)
isp->mmio_hist_base_phys =
mem->start + isp_res_maps[m].offset[OMAP3_ISP_IOMEM_HIST];
- /* IOMMU */
- ret = isp_attach_iommu(isp);
- if (ret < 0) {
- dev_err(&pdev->dev, "unable to attach to IOMMU\n");
- goto error_isp;
- }
-
/* Interrupt */
ret = platform_get_irq(pdev, 0);
if (ret <= 0) {
ret = -ENODEV;
- goto error_iommu;
+ goto error_isp;
}
isp->irq_num = ret;
@@ -2402,13 +2342,13 @@ static int isp_probe(struct platform_device *pdev)
"OMAP3 ISP", isp)) {
dev_err(isp->dev, "Unable to request IRQ\n");
ret = -EINVAL;
- goto error_iommu;
+ goto error_isp;
}
/* Entities */
ret = isp_initialize_modules(isp);
if (ret < 0)
- goto error_iommu;
+ goto error_isp;
ret = isp_register_entities(isp);
if (ret < 0)
@@ -2433,8 +2373,6 @@ static int isp_probe(struct platform_device *pdev)
isp_unregister_entities(isp);
error_modules:
isp_cleanup_modules(isp);
-error_iommu:
- isp_detach_iommu(isp);
error_isp:
isp_xclk_cleanup(isp);
__omap3isp_put(isp, false);
diff --git a/drivers/media/platform/omap3isp/isp.h b/drivers/media/platform/omap3isp/isp.h
index a9d760fbf349..b50459106d89 100644
--- a/drivers/media/platform/omap3isp/isp.h
+++ b/drivers/media/platform/omap3isp/isp.h
@@ -145,7 +145,6 @@ struct isp_xclk {
* @syscon: Regmap for the syscon register space
* @syscon_offset: Offset of the CSIPHY control register in syscon
* @phy_type: ISP_PHY_TYPE_{3430,3630}
- * @mapping: IOMMU mapping
* @stat_lock: Spinlock for handling statistics
* @isp_mutex: Mutex for serializing requests to ISP.
* @stop_failure: Indicates that an entity failed to stop.
@@ -185,8 +184,6 @@ struct isp_device {
u32 syscon_offset;
u32 phy_type;
- struct dma_iommu_mapping *mapping;
-
/* ISP Obj */
spinlock_t stat_lock; /* common lock for statistic drivers */
struct mutex isp_mutex; /* For handling ref_count field */
--
2.28.0.dirty
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2020-08-20 15:10 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20200820150857eucas1p18f5f2ad87703a68b6ed20a090f7c1c57@eucas1p1.samsung.com>
2020-08-20 15:08 ` [PATCH 00/18] Convert arch/arm to use iommu-dma Robin Murphy
2020-08-20 15:08 ` [PATCH 01/18] ARM/dma-mapping: Drop .dma_supported for IOMMU ops Robin Murphy
2020-08-20 15:08 ` [PATCH 02/18] ARM/dma-mapping: Consolidate IOMMU ops callbacks Robin Murphy
2020-08-20 15:08 ` [PATCH 03/18] ARM/dma-mapping: Merge IOMMU ops Robin Murphy
2020-08-20 15:08 ` [PATCH 04/18] iommu/dma: Add temporary hacks for arch/arm Robin Murphy
2020-08-20 15:08 ` [PATCH 05/18] ARM/dma-mapping: Switch to iommu_dma_ops Robin Murphy
2020-09-28 11:32 ` Marek Szyprowski
2020-08-20 15:08 ` [PATCH 06/18] ARM/dma-mapping: Support IOMMU default domains Robin Murphy
2020-08-20 15:08 ` [PATCH 07/18] iommu/arm-smmu: Remove arch/arm workaround Robin Murphy
2020-08-21 8:07 ` Will Deacon
2020-08-20 15:08 ` [PATCH 08/18] iommu/renesas: " Robin Murphy
2020-08-20 15:08 ` [PATCH 09/18] iommu/mediatek-v1: Add IOMMU_DOMAIN_DMA support Robin Murphy
2020-08-29 9:54 ` Yong Wu
2020-08-20 15:08 ` [PATCH 10/18] iommu/msm: " Robin Murphy
2020-08-20 15:55 ` Rob Clark
2020-08-20 16:58 ` Robin Murphy
2020-08-20 17:05 ` Rob Clark
2020-08-20 15:08 ` [PATCH 11/18] iommu/omap: " Robin Murphy
2020-08-24 21:39 ` Suman Anna via iommu
2020-08-20 15:08 ` [PATCH 12/18] iommu/tegra-gart: " Robin Murphy
2020-08-20 20:16 ` Dmitry Osipenko
2020-08-21 0:28 ` Robin Murphy
2020-08-23 21:42 ` Dmitry Osipenko
2020-08-20 15:08 ` [PATCH 13/18] iommu/tegra: " Robin Murphy
2020-08-27 15:45 ` Thierry Reding
2020-08-27 18:18 ` Robin Murphy
2020-08-20 15:08 ` [PATCH 14/18] drm/exynos: Consolidate IOMMU mapping code Robin Murphy
2020-09-18 14:30 ` Marek Szyprowski
2020-09-21 2:09 ` Inki Dae
2020-08-20 15:08 ` [PATCH 15/18] drm/nouveau/tegra: Clean up IOMMU workaround Robin Murphy
2020-08-20 15:08 ` [PATCH 16/18] staging/media/tegra-vde: " Robin Murphy
2020-08-20 19:51 ` Dmitry Osipenko
2020-08-20 20:10 ` Dmitry Osipenko
2020-08-21 0:11 ` Robin Murphy
2020-08-23 21:34 ` Dmitry Osipenko
2020-08-24 14:01 ` Robin Murphy
2020-08-27 7:05 ` Dmitry Osipenko
2020-08-27 15:54 ` Thierry Reding
2020-08-30 19:44 ` Dmitry Osipenko
2020-08-20 15:08 ` Robin Murphy [this message]
2020-08-20 16:53 ` [PATCH 17/18] media/omap3isp: " Sakari Ailus
2020-08-20 17:25 ` Robin Murphy
2020-08-20 19:55 ` Sakari Ailus
2020-08-20 23:01 ` Robin Murphy
2020-08-24 21:55 ` Suman Anna via iommu
2020-08-20 15:08 ` [PATCH 18/18] ARM/dma-mapping: Remove legacy dma-iommu API Robin Murphy
2020-08-24 11:40 ` [PATCH 00/18] Convert arch/arm to use iommu-dma Marek Szyprowski
2020-09-18 15:13 ` Marek Szyprowski
2020-08-27 12:31 ` Aw: " Frank Wunderlich
2020-08-27 12:54 ` Matthias Brugger
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=11d8419744e4e744a9448180801b0c4683328afd.1597931876.git.robin.murphy@arm.com \
--to=robin.murphy@arm.com \
--cc=agross@kernel.org \
--cc=digetx@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=geert+renesas@glider.be \
--cc=hch@lst.de \
--cc=inki.dae@samsung.com \
--cc=iommu@lists.linux-foundation.org \
--cc=jonathanh@nvidia.com \
--cc=joro@8bytes.org \
--cc=kyungmin.park@samsung.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=magnus.damm@gmail.com \
--cc=matthias.bgg@gmail.com \
--cc=sw0312.kim@samsung.com \
--cc=t-kristo@ti.com \
--cc=thierry.reding@gmail.com \
--cc=will@kernel.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).