From: Arnd Bergmann <arnd@arndb.de> To: Santosh Shilimkar <santosh.shilimkar@ti.com> Cc: devicetree@vger.kernel.org, Grygorii Strashko <grygorii.strashko@ti.com>, Russell King <linux@arm.linux.org.uk>, linus.walleij@linaro.org, magnus.damm@gmail.com, Olof Johansson <olof@lixom.net>, robh+dt@kernel.org, grant.likely@linaro.org, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v2 5/7] ARM: of: introduce common routine for DMA configuration Date: Fri, 28 Feb 2014 11:00:46 +0100 [thread overview] Message-ID: <9618080.kpE3Kl6X8p@wuerfel> (raw) In-Reply-To: <1393535872-20915-6-git-send-email-santosh.shilimkar@ti.com> On Thursday 27 February 2014 16:17:50 Santosh Shilimkar wrote: > diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c > index f751714..926b5dd 100644 > --- a/arch/arm/kernel/devtree.c > +++ b/arch/arm/kernel/devtree.c > @@ -235,3 +238,61 @@ const struct machine_desc * __init setup_machine_fdt(unsigned int dt_phys) > > return mdesc; > } > + > +void arm_dt_dma_configure(struct device *dev) > +{ > + dma_addr_t dma_addr; > + phys_addr_t paddr, size; > + dma_addr_t dma_mask; > + int ret; > + > + /* > + * if dma-ranges property doesn't exist - use 32 bits DMA mask > + * by default and don't set skip archdata.dma_pfn_offset > + */ > + ret = of_dma_get_range(dev->of_node, &dma_addr, &paddr, &size); > + if (ret == -ENODEV) { > + dev->coherent_dma_mask = DMA_BIT_MASK(32); > + if (!dev->dma_mask) > + dev->dma_mask = &dev->coherent_dma_mask; > + return; > + } I think this is a reasonable default, but I also want Russell's opinion on this, since I suspect he will argue that we shouldn't default to setting a DMA mask for devices that are not DMA capable. Maybe someone has an idea how we can detect all three important cases: a) A device is marked as DMA capable using a dma-ranges property b) A device is known not to be DMA capable c) we don't have any dma-ranges properties in an old dtb file but still want 32 bit masks by default. > + /* if failed - disable DMA for device */ > + if (ret < 0) { > + dev_err(dev, "failed to configure DMA\n"); > + return; > + } I guess this is also where other platforms (shmobile, highbank, ...) will want the IOMMU detection to happen. > + /* DMA ranges found. Calculate and set dma_pfn_offset */ > + dev->archdata.dma_pfn_offset = PFN_DOWN(paddr - dma_addr); > + > + /* Configure DMA mask */ > + dev->dma_mask = kmalloc(sizeof(*dev->dma_mask), GFP_KERNEL); > + if (!dev->dma_mask) > + return; Do we have to worry about freeing this? We could in theory put the mask into pdev_archdata (as on microblaze), or point to coherent_dma_mask (as of_platform_device_create_pdata does). I can't think of a case where the latter won't actually work, since coherent_dma_mask!=*dma_mask doesn't happen on any platform device I have ever seen. coherent_dma_mask was introduced to handle some special requirements of PCI devices on ia64 or parisc. > + dma_mask = dma_addr + size - 1; I can never remember if this is actually correct, or if it would have to be dma_mask = size - 1; instead. Russell knows. > + ret = arm_dma_set_mask(dev, dma_mask); > + if (ret < 0) { > + dev_err(dev, "failed to set DMA mask %#08x\n", dma_mask); > + kfree(dev->dma_mask); > + dev->dma_mask = NULL; > + return; > + } Again I'm hoping for Russell to provide the correct answer: Should we set the correct mask initially for the device here, or should we rely on dma_set_mask() to refuse a mask that is larger than we can handle? For PCI devices, we normally assume that we can always set a 32-bit DMA mask, but drivers can set a smaller mask if the device can support a smaller space than the bus can. In this case, the mask is already the intersection of what the device and all the parent buses support, and I'm not sure how the API describe in Documentation/DMA-API-HOWTO.txt would deal with this. > diff --git a/drivers/of/platform.c b/drivers/of/platform.c > index 404d1da..97d5533 100644 > --- a/drivers/of/platform.c > +++ b/drivers/of/platform.c > @@ -213,10 +213,13 @@ static struct platform_device *of_platform_device_create_pdata( > > #if defined(CONFIG_MICROBLAZE) > dev->archdata.dma_mask = 0xffffffffUL; > -#endif > +#elif defined(CONFIG_ARM_LPAE) > + arm_dt_dma_configure(&dev->dev); > +#else > dev->dev.coherent_dma_mask = DMA_BIT_MASK(32); > if (!dev->dev.dma_mask) > dev->dev.dma_mask = &dev->dev.coherent_dma_mask; > +#endif The dependency on CONFIG_ARM_LPAE is not correct the general case, that would be a special case on keystone. I'd suggest using CONFIG_ARM here, and finding a different way to return false for dma_is_coherent() on keystone with LPAE disabled. Arnd
WARNING: multiple messages have this Message-ID (diff)
From: arnd@arndb.de (Arnd Bergmann) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 5/7] ARM: of: introduce common routine for DMA configuration Date: Fri, 28 Feb 2014 11:00:46 +0100 [thread overview] Message-ID: <9618080.kpE3Kl6X8p@wuerfel> (raw) In-Reply-To: <1393535872-20915-6-git-send-email-santosh.shilimkar@ti.com> On Thursday 27 February 2014 16:17:50 Santosh Shilimkar wrote: > diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c > index f751714..926b5dd 100644 > --- a/arch/arm/kernel/devtree.c > +++ b/arch/arm/kernel/devtree.c > @@ -235,3 +238,61 @@ const struct machine_desc * __init setup_machine_fdt(unsigned int dt_phys) > > return mdesc; > } > + > +void arm_dt_dma_configure(struct device *dev) > +{ > + dma_addr_t dma_addr; > + phys_addr_t paddr, size; > + dma_addr_t dma_mask; > + int ret; > + > + /* > + * if dma-ranges property doesn't exist - use 32 bits DMA mask > + * by default and don't set skip archdata.dma_pfn_offset > + */ > + ret = of_dma_get_range(dev->of_node, &dma_addr, &paddr, &size); > + if (ret == -ENODEV) { > + dev->coherent_dma_mask = DMA_BIT_MASK(32); > + if (!dev->dma_mask) > + dev->dma_mask = &dev->coherent_dma_mask; > + return; > + } I think this is a reasonable default, but I also want Russell's opinion on this, since I suspect he will argue that we shouldn't default to setting a DMA mask for devices that are not DMA capable. Maybe someone has an idea how we can detect all three important cases: a) A device is marked as DMA capable using a dma-ranges property b) A device is known not to be DMA capable c) we don't have any dma-ranges properties in an old dtb file but still want 32 bit masks by default. > + /* if failed - disable DMA for device */ > + if (ret < 0) { > + dev_err(dev, "failed to configure DMA\n"); > + return; > + } I guess this is also where other platforms (shmobile, highbank, ...) will want the IOMMU detection to happen. > + /* DMA ranges found. Calculate and set dma_pfn_offset */ > + dev->archdata.dma_pfn_offset = PFN_DOWN(paddr - dma_addr); > + > + /* Configure DMA mask */ > + dev->dma_mask = kmalloc(sizeof(*dev->dma_mask), GFP_KERNEL); > + if (!dev->dma_mask) > + return; Do we have to worry about freeing this? We could in theory put the mask into pdev_archdata (as on microblaze), or point to coherent_dma_mask (as of_platform_device_create_pdata does). I can't think of a case where the latter won't actually work, since coherent_dma_mask!=*dma_mask doesn't happen on any platform device I have ever seen. coherent_dma_mask was introduced to handle some special requirements of PCI devices on ia64 or parisc. > + dma_mask = dma_addr + size - 1; I can never remember if this is actually correct, or if it would have to be dma_mask = size - 1; instead. Russell knows. > + ret = arm_dma_set_mask(dev, dma_mask); > + if (ret < 0) { > + dev_err(dev, "failed to set DMA mask %#08x\n", dma_mask); > + kfree(dev->dma_mask); > + dev->dma_mask = NULL; > + return; > + } Again I'm hoping for Russell to provide the correct answer: Should we set the correct mask initially for the device here, or should we rely on dma_set_mask() to refuse a mask that is larger than we can handle? For PCI devices, we normally assume that we can always set a 32-bit DMA mask, but drivers can set a smaller mask if the device can support a smaller space than the bus can. In this case, the mask is already the intersection of what the device and all the parent buses support, and I'm not sure how the API describe in Documentation/DMA-API-HOWTO.txt would deal with this. > diff --git a/drivers/of/platform.c b/drivers/of/platform.c > index 404d1da..97d5533 100644 > --- a/drivers/of/platform.c > +++ b/drivers/of/platform.c > @@ -213,10 +213,13 @@ static struct platform_device *of_platform_device_create_pdata( > > #if defined(CONFIG_MICROBLAZE) > dev->archdata.dma_mask = 0xffffffffUL; > -#endif > +#elif defined(CONFIG_ARM_LPAE) > + arm_dt_dma_configure(&dev->dev); > +#else > dev->dev.coherent_dma_mask = DMA_BIT_MASK(32); > if (!dev->dev.dma_mask) > dev->dev.dma_mask = &dev->dev.coherent_dma_mask; > +#endif The dependency on CONFIG_ARM_LPAE is not correct the general case, that would be a special case on keystone. I'd suggest using CONFIG_ARM here, and finding a different way to return false for dma_is_coherent() on keystone with LPAE disabled. Arnd
next prev parent reply other threads:[~2014-02-28 10:00 UTC|newest] Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-02-27 21:17 [PATCH v2 0/7] ARM: dma: Support dma-ranges and dma-coherent Santosh Shilimkar 2014-02-27 21:17 ` Santosh Shilimkar 2014-02-27 21:17 ` [PATCH v2 1/7] ARM: mm: Introduce archdata.dma_pfn_offset Santosh Shilimkar 2014-02-27 21:17 ` Santosh Shilimkar [not found] ` <1393535872-20915-2-git-send-email-santosh.shilimkar-l0cyMroinI0@public.gmane.org> 2014-02-28 9:30 ` Arnd Bergmann 2014-02-28 9:30 ` Arnd Bergmann 2014-03-05 4:45 ` Linus Walleij 2014-03-05 4:45 ` Linus Walleij [not found] ` <CACRpkdaRgf2yn51HYnJHBVKdrGdYhwSr0yf2GLmT3DwzmPbMDA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2014-03-05 6:37 ` Santosh Shilimkar 2014-03-05 6:37 ` Santosh Shilimkar [not found] ` <1393535872-20915-1-git-send-email-santosh.shilimkar-l0cyMroinI0@public.gmane.org> 2014-02-27 21:17 ` [PATCH v2 2/7] ARM: mm: Remove unsed dma_to_virt() Santosh Shilimkar 2014-02-27 21:17 ` Santosh Shilimkar [not found] ` <1393535872-20915-3-git-send-email-santosh.shilimkar-l0cyMroinI0@public.gmane.org> 2014-02-28 9:31 ` Arnd Bergmann 2014-02-28 9:31 ` Arnd Bergmann 2014-03-07 5:59 ` Greg Ungerer 2014-03-07 5:59 ` Greg Ungerer 2014-02-27 21:17 ` [PATCH v2 3/7] dma: of: introduce of_dma_get_range() helper Santosh Shilimkar 2014-02-27 21:17 ` Santosh Shilimkar 2014-02-27 21:17 ` [PATCH v2 4/7] dma: of: introduce of_dma_is_coherent() helper Santosh Shilimkar 2014-02-27 21:17 ` Santosh Shilimkar 2014-02-28 9:39 ` Arnd Bergmann 2014-02-28 9:39 ` Arnd Bergmann 2014-02-28 14:17 ` Santosh Shilimkar 2014-02-28 14:17 ` Santosh Shilimkar [not found] ` <53109A64.9030701-l0cyMroinI0@public.gmane.org> 2014-03-03 1:49 ` Catalin Marinas 2014-03-03 1:49 ` Catalin Marinas 2014-02-28 15:14 ` Rob Herring 2014-02-28 15:14 ` Rob Herring [not found] ` <CAL_JsqL6-hoD4F7+adPhsOJXeM5f+wpEuBWg_6AWqj3k2v0NEw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2014-02-28 15:17 ` Santosh Shilimkar 2014-02-28 15:17 ` Santosh Shilimkar 2014-02-28 15:24 ` Arnd Bergmann 2014-02-28 15:24 ` Arnd Bergmann 2014-03-03 14:04 ` Rob Herring 2014-03-03 14:04 ` Rob Herring 2014-03-04 15:21 ` Will Deacon 2014-03-04 15:21 ` Will Deacon 2014-02-27 21:17 ` [PATCH v2 5/7] ARM: of: introduce common routine for DMA configuration Santosh Shilimkar 2014-02-27 21:17 ` Santosh Shilimkar 2014-02-28 10:00 ` Arnd Bergmann [this message] 2014-02-28 10:00 ` Arnd Bergmann 2014-02-28 11:49 ` Grygorii Strashko 2014-02-28 11:49 ` Grygorii Strashko 2014-02-28 11:14 ` Arnd Bergmann 2014-02-28 11:14 ` Arnd Bergmann 2014-02-28 15:06 ` Santosh Shilimkar 2014-02-28 15:06 ` Santosh Shilimkar [not found] ` <5310A5F1.9070901-l0cyMroinI0@public.gmane.org> 2014-02-28 15:31 ` Arnd Bergmann 2014-02-28 15:31 ` Arnd Bergmann 2014-02-28 15:35 ` Santosh Shilimkar 2014-02-28 15:35 ` Santosh Shilimkar 2014-03-07 3:15 ` Linus Walleij 2014-03-07 3:15 ` Linus Walleij [not found] ` <1393535872-20915-6-git-send-email-santosh.shilimkar-l0cyMroinI0@public.gmane.org> 2014-02-28 14:56 ` Rob Herring 2014-02-28 14:56 ` Rob Herring 2014-02-27 21:17 ` [PATCH v2 6/7] ARM: dts: keystone: Use dma-ranges property Santosh Shilimkar 2014-02-27 21:17 ` Santosh Shilimkar 2014-02-27 21:17 ` [PATCH v2 7/7] ARM: dts: keystone: Udate USB node for dma properties Santosh Shilimkar 2014-02-27 21:17 ` Santosh Shilimkar
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=9618080.kpE3Kl6X8p@wuerfel \ --to=arnd@arndb.de \ --cc=devicetree@vger.kernel.org \ --cc=grant.likely@linaro.org \ --cc=grygorii.strashko@ti.com \ --cc=linus.walleij@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux@arm.linux.org.uk \ --cc=magnus.damm@gmail.com \ --cc=olof@lixom.net \ --cc=robh+dt@kernel.org \ --cc=santosh.shilimkar@ti.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.