Em Sat, 07 Apr 2018 14:56:59 +0300
Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> escreveu:
> Hi Mauro,
>
> On Thursday, 5 April 2018 22:44:44 EEST Mauro Carvalho Chehab wrote:
> > Em Thu, 05 Apr 2018 21:30:27 +0300 Laurent Pinchart escreveu:
> > > On Thursday, 5 April 2018 20:54:02 EEST Mauro Carvalho Chehab wrote:
> > > > There aren't much things required for it to build with COMPILE_TEST.
> > > > It just needs to provide stub for an arm-dependent include.
> > > >
> > > > Let's replicate the same solution used by ipmmu-vmsa, in order
> > > > to allow building omap3 with COMPILE_TEST.
> > > >
> > > > The actual logic here came from this driver:
> > > > drivers/iommu/ipmmu-vmsa.c
> > > >
> > > > Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxxx>
> > > > ---
> > > >
> > > > drivers/media/platform/Kconfig | 8 ++++----
> > > > drivers/media/platform/omap3isp/isp.c | 7 +++++++
> > > > 2 files changed, 11 insertions(+), 4 deletions(-)
> > > >
> > > > diff --git a/drivers/media/platform/Kconfig
> > > > b/drivers/media/platform/Kconfig index c7a1cf8a1b01..03c9dfeb7781
> > > > 100644
> > > > --- a/drivers/media/platform/Kconfig
> > > > +++ b/drivers/media/platform/Kconfig
> > > > @@ -62,12 +62,12 @@ config VIDEO_MUX
> > > >
> > > > config VIDEO_OMAP3
> > > > tristate "OMAP 3 Camera support"
> > > > - depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API && ARCH_OMAP3
> > > > + depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API
> > > > depends on HAS_DMA && OF
> > > > - depends on OMAP_IOMMU
> > > > - select ARM_DMA_USE_IOMMU
> > > > + depends on ((ARCH_OMAP3 && OMAP_IOMMU) || COMPILE_TEST)
> > > > + select ARM_DMA_USE_IOMMU if OMAP_IOMMU
> > > > select VIDEOBUF2_DMA_CONTIG
> > > > - select MFD_SYSCON
> > > > + select MFD_SYSCON if ARCH_OMAP3
> > > > select V4L2_FWNODE
> > > > ---help---
> > > > Driver for an OMAP 3 camera controller.
> > > > diff --git a/drivers/media/platform/omap3isp/isp.c
> > > > b/drivers/media/platform/omap3isp/isp.c index 8eb000e3d8fd..2a11a709aa4f
> > > > 100644
> > > > --- a/drivers/media/platform/omap3isp/isp.c
> > > > +++ b/drivers/media/platform/omap3isp/isp.c
> > > > @@ -61,7 +61,14 @@
> > > > #include <linux/sched.h>
> > > > #include <linux/vmalloc.h>
> > > >
> > > > +#if defined(CONFIG_ARM) && !defined(CONFIG_IOMMU_DMA)
> > > > #include <asm/dma-iommu.h>
> > > > +#else
> > > > +#define arm_iommu_create_mapping(...) NULL
> > > > +#define arm_iommu_attach_device(...) -ENODEV
> > > > +#define arm_iommu_release_mapping(...) do {} while (0)
> > > > +#define arm_iommu_detach_device(...) do {} while (0)
> > > > +#endif
> > >
> > > I don't think it's the job of a driver to define those stubs, sorry.
> > > Otherwise where do you stop ? If you have half of the code that is
> > > architecture- dependent, would you stub it ? And what if the stubs you
> > > define here generate warnings in static analyzers ?
> >
> > I agree that we should avoid doing that as a general case, but see
> > below.
> >
> > > If you want to make drivers compile for all architectures, the APIs they
> > > use must be defined in linux/, not in asm/. They can be stubbed there
> > > when not implemented in a particular architecture, but not in the driver.
> >
> > In this specific case, the same approach taken here is already needed
> > by the Renesas VMSA-compatible IPMMU driver, with, btw, is inside
> > drivers/iommu:
> >
> > drivers/iommu/ipmmu-vmsa.c
>
> The reason there is different, the driver is shared by ARM32 and ARM64
> platforms. Furthermore, there's an effort (or at least there was) to move away
> from those APIs in the driver, but I think it has stalled.
Anyway, the approach sticks at the driver. As this was accepted even
inside drivers/iommu, I fail to see why not doing the same on media,
specially since it really helps us to find bugs at omap3isp driver.
Even without pushing upstream (where Coverity would analyze it),
we got lots of problems by simply letting omap3isp to use the
usual tools we use for all other drivers.
> > Also, this API is used only by 3 drivers [1]:
> >
> > drivers/iommu/ipmmu-vmsa.c
> > drivers/iommu/mtk_iommu_v1.c
> > drivers/media/platform/omap3isp/isp.c
> >
> > [1] as blamed by
> > git grep -l arm_iommu_create_mapping
>
> The exynos driver also uses it.
>
> > That hardly seems to be an arch-specific iommu solution, but, instead, some
> > hack used by only three drivers or some legacy iommu binding.
>
> It's more complex than that. There are multiple IOMMU-related APIs on ARM, so
> more recent than others, with different feature sets. While I agree that
> drivers should move away from arm_iommu_create_mapping(), doing so requires
> coordination between the IOMMU driver and the bus master driver (for instance
> the omap3isp driver). It's not a trivial matter, but I'd love if someone
> submitted patches :-)
If someone steps up to do that, it would be really helpful, but we
should not trust that this will happen. OMAP3 is an old hardware,
and not many developers are working on improving its support.
> > The omap3isp is, btw, the only driver outside drivers/iommu that needs it.
> >
> > So, it sounds that other driver uses some other approach, but hardly
> > it would be worth to change this driver to use something else.
> >
> > So, better to stick with the same solution the Renesas driver used.
>
> I'm not responsible for that solution and I didn't think it was a good one at
> the time it was introduced, but in any case it is not meant at all to support
> COMPILE_TEST. I still don't think the omap3isp driver should declare stubs for
> these functions for the purpose of supporting compile-testing on x86.
Well, there is another alternative. We could do add this to its Makefile:
ifndef CONFIG_ARCH_ARM
ccflags-y += -I./arch/arm/include/
endif
And add those stubs to arch/arm/include/asm/dma-iommu.h,
in order to be used when CONFIG_IOMMU_DMA isn't defined:
#define arm_iommu_create_mapping(...) NULL
#define arm_iommu_attach_device(...) -ENODEV
#define arm_iommu_release_mapping(...) do {} while (0)
#define arm_iommu_detach_device(...) do {} while (0)
If done right, such solution could also be used to remove
the #ifdef inside drivers/iommu/ipmmu-vmsa.c.
Yet, I think that the approach I proposed before is better,
but maybe arm maintainers may have a different opinion.
Arnd,
What do you think?
Thanks,
Mauro
omap3isp: another approach to enable COMPILE_TEST
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxxx>
diff --git a/arch/arm/include/asm/dma-iommu.h b/arch/arm/include/asm/dma-iommu.h
index 6821f1249300..68dadbee0016 100644
--- a/arch/arm/include/asm/dma-iommu.h
+++ b/arch/arm/include/asm/dma-iommu.h
@@ -26,6 +26,7 @@ struct dma_iommu_mapping {
struct kref kref;
};
+#ifdef CONFIG_IOMMU_DMA
struct dma_iommu_mapping *
arm_iommu_create_mapping(struct bus_type *bus, dma_addr_t base, u64 size);
@@ -35,6 +36,13 @@ int arm_iommu_attach_device(struct device *dev,
struct dma_iommu_mapping *mapping);
void arm_iommu_detach_device(struct device *dev);
+#else
+#define arm_iommu_create_mapping(...) NULL
+#define arm_iommu_attach_device(...) -ENODEV
+#define arm_iommu_release_mapping(...) do {} while (0)
+#define arm_iommu_detach_device(...) do {} while (0)
+#endif
+
int arm_dma_supported(struct device *dev, u64 mask);
#endif /* __KERNEL__ */
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 91b0c7324afb..e8d8bbc976af 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -62,12 +62,12 @@ config VIDEO_MUX
config VIDEO_OMAP3
tristate "OMAP 3 Camera support"
- depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API && ARCH_OMAP3
+ depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API
depends on HAS_DMA && OF
- depends on OMAP_IOMMU
- select ARM_DMA_USE_IOMMU
+ depends on ((ARCH_OMAP3 && OMAP_IOMMU) || COMPILE_TEST)
+ select ARM_DMA_USE_IOMMU if OMAP_IOMMU
select VIDEOBUF2_DMA_CONTIG
- select MFD_SYSCON
+ select MFD_SYSCON if ARCH_OMAP3
select V4L2_FWNODE
---help---
Driver for an OMAP 3 camera controller.
diff --git a/drivers/media/platform/omap3isp/Makefile b/drivers/media/platform/omap3isp/Makefile
index 56e99b4f7d23..6874c4f53838 100644
--- a/drivers/media/platform/omap3isp/Makefile
+++ b/drivers/media/platform/omap3isp/Makefile
@@ -10,3 +10,7 @@ omap3-isp-objs += \
ispstat.o isph3a_aewb.o isph3a_af.o isphist.o
obj-$(CONFIG_VIDEO_OMAP3) += omap3-isp.o
+
+ifndef CONFIG_ARCH_ARM
+ccflags-y += -I./arch/arm/include/
+endif
