From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rob Herring Subject: Re: [PATCH v6 6/8] dma-mapping: detect and configure IOMMU in of_dma_configure Date: Mon, 1 Dec 2014 17:06:18 -0600 Message-ID: References: <1417453034-21379-1-git-send-email-will.deacon@arm.com> <1417453034-21379-7-git-send-email-will.deacon@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1417453034-21379-7-git-send-email-will.deacon-5wv7dgnIgG8@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: Will Deacon Cc: jroedel-l3A5Bk7waGM@public.gmane.org, Arnd Bergmann , Linux IOMMU , Thierry Reding , Laurent Pinchart , Varun Sethi , David Woodhouse , "linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org" List-Id: iommu@lists.linux-foundation.org On Mon, Dec 1, 2014 at 10:57 AM, Will Deacon wrote: > This patch extends of_dma_configure so that it sets up the IOMMU for a > device, as well as the coherent/non-coherent DMA mapping ops. > > Acked-by: Arnd Bergmann > Acked-by: Marek Szyprowski > Tested-by: Robin Murphy > Signed-off-by: Will Deacon Acked-by: Rob Herring > --- > arch/arm/include/asm/dma-mapping.h | 4 +++- > drivers/of/platform.c | 21 ++++++++++++++------- > include/linux/dma-mapping.h | 8 +++++++- > 3 files changed, 24 insertions(+), 9 deletions(-) > > diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h > index dc3420e77758..f3c0d953f6a2 100644 > --- a/arch/arm/include/asm/dma-mapping.h > +++ b/arch/arm/include/asm/dma-mapping.h > @@ -121,7 +121,9 @@ static inline unsigned long dma_max_pfn(struct device *dev) > } > #define dma_max_pfn(dev) dma_max_pfn(dev) > > -static inline void arch_setup_dma_ops(struct device *dev, bool coherent) > +static inline void arch_setup_dma_ops(struct device *dev, u64 dma_base, > + u64 size, struct iommu_ops *iommu, > + bool coherent) > { > if (coherent) > set_dma_ops(dev, &arm_coherent_dma_ops); > diff --git a/drivers/of/platform.c b/drivers/of/platform.c > index ff1f4e9afccb..b89caf8c7586 100644 > --- a/drivers/of/platform.c > +++ b/drivers/of/platform.c > @@ -19,6 +19,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -166,6 +167,7 @@ static void of_dma_configure(struct device *dev) > int ret; > bool coherent; > unsigned long offset; > + struct iommu_ops *iommu; > > /* > * Set default dma-mask to 32 bit. Drivers are expected to setup > @@ -194,7 +196,16 @@ static void of_dma_configure(struct device *dev) > dev_dbg(dev, "device is%sdma coherent\n", > coherent ? " " : " not "); > > - arch_setup_dma_ops(dev, coherent); > + iommu = of_iommu_configure(dev); > + dev_dbg(dev, "device is%sbehind an iommu\n", > + iommu ? " " : " not "); > + > + arch_setup_dma_ops(dev, dma_addr, size, iommu, coherent); > +} > + > +static void of_dma_deconfigure(struct device *dev) > +{ > + arch_teardown_dma_ops(dev); > } > > /** > @@ -223,16 +234,12 @@ static struct platform_device *of_platform_device_create_pdata( > if (!dev) > goto err_clear_flag; > > - of_dma_configure(&dev->dev); > dev->dev.bus = &platform_bus_type; > dev->dev.platform_data = platform_data; > - > - /* We do not fill the DMA ops for platform devices by default. > - * This is currently the responsibility of the platform code > - * to do such, possibly using a device notifier > - */ > + of_dma_configure(&dev->dev); > > if (of_device_add(dev) != 0) { > + of_dma_deconfigure(&dev->dev); > platform_device_put(dev); > goto err_clear_flag; > } > diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h > index 8a1560f95d4a..c3007cb4bfa6 100644 > --- a/include/linux/dma-mapping.h > +++ b/include/linux/dma-mapping.h > @@ -130,7 +130,13 @@ static inline int dma_coerce_mask_and_coherent(struct device *dev, u64 mask) > extern u64 dma_get_required_mask(struct device *dev); > > #ifndef arch_setup_dma_ops > -static inline void arch_setup_dma_ops(struct device *dev, bool coherent) { } > +static inline void arch_setup_dma_ops(struct device *dev, u64 dma_base, > + u64 size, struct iommu_ops *iommu, > + bool coherent) { } > +#endif > + > +#ifndef arch_teardown_dma_ops > +static inline void arch_teardown_dma_ops(struct device *dev) { } > #endif > > static inline unsigned int dma_get_max_seg_size(struct device *dev) > -- > 2.1.1 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel From mboxrd@z Thu Jan 1 00:00:00 1970 From: robherring2@gmail.com (Rob Herring) Date: Mon, 1 Dec 2014 17:06:18 -0600 Subject: [PATCH v6 6/8] dma-mapping: detect and configure IOMMU in of_dma_configure In-Reply-To: <1417453034-21379-7-git-send-email-will.deacon@arm.com> References: <1417453034-21379-1-git-send-email-will.deacon@arm.com> <1417453034-21379-7-git-send-email-will.deacon@arm.com> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Mon, Dec 1, 2014 at 10:57 AM, Will Deacon wrote: > This patch extends of_dma_configure so that it sets up the IOMMU for a > device, as well as the coherent/non-coherent DMA mapping ops. > > Acked-by: Arnd Bergmann > Acked-by: Marek Szyprowski > Tested-by: Robin Murphy > Signed-off-by: Will Deacon Acked-by: Rob Herring > --- > arch/arm/include/asm/dma-mapping.h | 4 +++- > drivers/of/platform.c | 21 ++++++++++++++------- > include/linux/dma-mapping.h | 8 +++++++- > 3 files changed, 24 insertions(+), 9 deletions(-) > > diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h > index dc3420e77758..f3c0d953f6a2 100644 > --- a/arch/arm/include/asm/dma-mapping.h > +++ b/arch/arm/include/asm/dma-mapping.h > @@ -121,7 +121,9 @@ static inline unsigned long dma_max_pfn(struct device *dev) > } > #define dma_max_pfn(dev) dma_max_pfn(dev) > > -static inline void arch_setup_dma_ops(struct device *dev, bool coherent) > +static inline void arch_setup_dma_ops(struct device *dev, u64 dma_base, > + u64 size, struct iommu_ops *iommu, > + bool coherent) > { > if (coherent) > set_dma_ops(dev, &arm_coherent_dma_ops); > diff --git a/drivers/of/platform.c b/drivers/of/platform.c > index ff1f4e9afccb..b89caf8c7586 100644 > --- a/drivers/of/platform.c > +++ b/drivers/of/platform.c > @@ -19,6 +19,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -166,6 +167,7 @@ static void of_dma_configure(struct device *dev) > int ret; > bool coherent; > unsigned long offset; > + struct iommu_ops *iommu; > > /* > * Set default dma-mask to 32 bit. Drivers are expected to setup > @@ -194,7 +196,16 @@ static void of_dma_configure(struct device *dev) > dev_dbg(dev, "device is%sdma coherent\n", > coherent ? " " : " not "); > > - arch_setup_dma_ops(dev, coherent); > + iommu = of_iommu_configure(dev); > + dev_dbg(dev, "device is%sbehind an iommu\n", > + iommu ? " " : " not "); > + > + arch_setup_dma_ops(dev, dma_addr, size, iommu, coherent); > +} > + > +static void of_dma_deconfigure(struct device *dev) > +{ > + arch_teardown_dma_ops(dev); > } > > /** > @@ -223,16 +234,12 @@ static struct platform_device *of_platform_device_create_pdata( > if (!dev) > goto err_clear_flag; > > - of_dma_configure(&dev->dev); > dev->dev.bus = &platform_bus_type; > dev->dev.platform_data = platform_data; > - > - /* We do not fill the DMA ops for platform devices by default. > - * This is currently the responsibility of the platform code > - * to do such, possibly using a device notifier > - */ > + of_dma_configure(&dev->dev); > > if (of_device_add(dev) != 0) { > + of_dma_deconfigure(&dev->dev); > platform_device_put(dev); > goto err_clear_flag; > } > diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h > index 8a1560f95d4a..c3007cb4bfa6 100644 > --- a/include/linux/dma-mapping.h > +++ b/include/linux/dma-mapping.h > @@ -130,7 +130,13 @@ static inline int dma_coerce_mask_and_coherent(struct device *dev, u64 mask) > extern u64 dma_get_required_mask(struct device *dev); > > #ifndef arch_setup_dma_ops > -static inline void arch_setup_dma_ops(struct device *dev, bool coherent) { } > +static inline void arch_setup_dma_ops(struct device *dev, u64 dma_base, > + u64 size, struct iommu_ops *iommu, > + bool coherent) { } > +#endif > + > +#ifndef arch_teardown_dma_ops > +static inline void arch_teardown_dma_ops(struct device *dev) { } > #endif > > static inline unsigned int dma_get_max_seg_size(struct device *dev) > -- > 2.1.1 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel at lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel