From: Nikita Yushchenko <nikita.yoush@cogentembedded.com> To: Robin Murphy <robin.murphy@arm.com>, Will Deacon <will.deacon@arm.com>, Arnd Bergmann <arnd@arndb.de> Cc: linux-arm-kernel@lists.infradead.org, linux-renesas-soc@vger.kernel.org, Simon Horman <horms@verge.net.au>, Bjorn Helgaas <bhelgaas@google.com>, fkan@apm.com, Nikita Yushchenko <nikita.yoush@cogentembedded.com> Subject: [PATCH] arm64: avoid increasing DMA masks above what hardware supports Date: Tue, 10 Jan 2017 17:00:44 +0300 [thread overview] Message-ID: <1484056844-9567-1-git-send-email-nikita.yoush@cogentembedded.com> (raw) In-Reply-To: <11daacde-5399-039f-80a3-01d7bd13e9e8@arm.com> There are cases when device supports wide DMA addresses wider than device's connection supports. In this case driver sets DMA mask based on knowledge of device capabilities. That must succeed to allow drivers to initialize. However, swiotlb or iommu still need knowledge about actual device capabilities. To avoid breakage, actual mask must not be set wider than device connection allows. Signed-off-by: Nikita Yushchenko <nikita.yoush@cogentembedded.com> CC: Arnd Bergmann <arnd@arndb.de> CC: Robin Murphy <robin.murphy@arm.com> CC: Will Deacon <will.deacon@arm.com> --- arch/arm64/Kconfig | 3 +++ arch/arm64/include/asm/device.h | 1 + arch/arm64/include/asm/dma-mapping.h | 3 +++ arch/arm64/mm/dma-mapping.c | 43 ++++++++++++++++++++++++++++++++++++ 4 files changed, 50 insertions(+) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 1117421..afb2c08 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -216,6 +216,9 @@ config NEED_DMA_MAP_STATE config NEED_SG_DMA_LENGTH def_bool y +config ARCH_HAS_DMA_SET_COHERENT_MASK + def_bool y + config SMP def_bool y diff --git a/arch/arm64/include/asm/device.h b/arch/arm64/include/asm/device.h index 243ef25..a57e7bb 100644 --- a/arch/arm64/include/asm/device.h +++ b/arch/arm64/include/asm/device.h @@ -22,6 +22,7 @@ struct dev_archdata { void *iommu; /* private IOMMU data */ #endif bool dma_coherent; + u64 parent_dma_mask; }; struct pdev_archdata { diff --git a/arch/arm64/include/asm/dma-mapping.h b/arch/arm64/include/asm/dma-mapping.h index ccea82c..eab36d2 100644 --- a/arch/arm64/include/asm/dma-mapping.h +++ b/arch/arm64/include/asm/dma-mapping.h @@ -51,6 +51,9 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, const struct iommu_ops *iommu, bool coherent); #define arch_setup_dma_ops arch_setup_dma_ops +#define HAVE_ARCH_DMA_SET_MASK 1 +extern int dma_set_mask(struct device *dev, u64 dma_mask); + #ifdef CONFIG_IOMMU_DMA void arch_teardown_dma_ops(struct device *dev); #define arch_teardown_dma_ops arch_teardown_dma_ops diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index e040827..7b1bb87 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c @@ -203,6 +203,37 @@ static void __dma_free(struct device *dev, size_t size, __dma_free_coherent(dev, size, swiotlb_addr, dma_handle, attrs); } +int dma_set_mask(struct device *dev, u64 dma_mask) +{ + const struct dma_map_ops *ops = get_dma_ops(dev); + + if (mask > dev->archdata.parent_dma_mask) + mask = dev->archdata.parent_dma_mask; + + if (ops->set_dma_mask) + return ops->set_dma_mask(dev, mask); + + if (!dev->dma_mask || !dma_supported(dev, mask)) + return -EIO; + + *dev->dma_mask = mask; + return 0; +} +EXPORT_SYMBOL(dma_set_mask); + +int dma_set_coherent_mask(struct device *dev, u64 mask) +{ + if (mask > dev->archdata.parent_dma_mask) + mask = dev->archdata.parent_dma_mask; + + if (!dma_supported(dev, mask)) + return -EIO; + + dev->coherent_dma_mask = mask; + return 0; +} +EXPORT_SYMBOL(dma_set_coherent_mask); + static dma_addr_t __swiotlb_map_page(struct device *dev, struct page *page, unsigned long offset, size_t size, enum dma_data_direction dir, @@ -958,6 +989,18 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, if (!dev->archdata.dma_ops) dev->archdata.dma_ops = &swiotlb_dma_ops; + /* + * we don't yet support buses that have a non-zero mapping. + * Let's hope we won't need it + */ + WARN_ON(dma_base != 0); + + /* + * Whatever the parent bus can set. A device must not set + * a DMA mask larger than this. + */ + dev->archdata.parent_dma_mask = size - 1; + dev->archdata.dma_coherent = coherent; __iommu_setup_dma_ops(dev, dma_base, size, iommu); } -- 2.1.4
WARNING: multiple messages have this Message-ID (diff)
From: nikita.yoush@cogentembedded.com (Nikita Yushchenko) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] arm64: avoid increasing DMA masks above what hardware supports Date: Tue, 10 Jan 2017 17:00:44 +0300 [thread overview] Message-ID: <1484056844-9567-1-git-send-email-nikita.yoush@cogentembedded.com> (raw) In-Reply-To: <11daacde-5399-039f-80a3-01d7bd13e9e8@arm.com> There are cases when device supports wide DMA addresses wider than device's connection supports. In this case driver sets DMA mask based on knowledge of device capabilities. That must succeed to allow drivers to initialize. However, swiotlb or iommu still need knowledge about actual device capabilities. To avoid breakage, actual mask must not be set wider than device connection allows. Signed-off-by: Nikita Yushchenko <nikita.yoush@cogentembedded.com> CC: Arnd Bergmann <arnd@arndb.de> CC: Robin Murphy <robin.murphy@arm.com> CC: Will Deacon <will.deacon@arm.com> --- arch/arm64/Kconfig | 3 +++ arch/arm64/include/asm/device.h | 1 + arch/arm64/include/asm/dma-mapping.h | 3 +++ arch/arm64/mm/dma-mapping.c | 43 ++++++++++++++++++++++++++++++++++++ 4 files changed, 50 insertions(+) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 1117421..afb2c08 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -216,6 +216,9 @@ config NEED_DMA_MAP_STATE config NEED_SG_DMA_LENGTH def_bool y +config ARCH_HAS_DMA_SET_COHERENT_MASK + def_bool y + config SMP def_bool y diff --git a/arch/arm64/include/asm/device.h b/arch/arm64/include/asm/device.h index 243ef25..a57e7bb 100644 --- a/arch/arm64/include/asm/device.h +++ b/arch/arm64/include/asm/device.h @@ -22,6 +22,7 @@ struct dev_archdata { void *iommu; /* private IOMMU data */ #endif bool dma_coherent; + u64 parent_dma_mask; }; struct pdev_archdata { diff --git a/arch/arm64/include/asm/dma-mapping.h b/arch/arm64/include/asm/dma-mapping.h index ccea82c..eab36d2 100644 --- a/arch/arm64/include/asm/dma-mapping.h +++ b/arch/arm64/include/asm/dma-mapping.h @@ -51,6 +51,9 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, const struct iommu_ops *iommu, bool coherent); #define arch_setup_dma_ops arch_setup_dma_ops +#define HAVE_ARCH_DMA_SET_MASK 1 +extern int dma_set_mask(struct device *dev, u64 dma_mask); + #ifdef CONFIG_IOMMU_DMA void arch_teardown_dma_ops(struct device *dev); #define arch_teardown_dma_ops arch_teardown_dma_ops diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index e040827..7b1bb87 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c @@ -203,6 +203,37 @@ static void __dma_free(struct device *dev, size_t size, __dma_free_coherent(dev, size, swiotlb_addr, dma_handle, attrs); } +int dma_set_mask(struct device *dev, u64 dma_mask) +{ + const struct dma_map_ops *ops = get_dma_ops(dev); + + if (mask > dev->archdata.parent_dma_mask) + mask = dev->archdata.parent_dma_mask; + + if (ops->set_dma_mask) + return ops->set_dma_mask(dev, mask); + + if (!dev->dma_mask || !dma_supported(dev, mask)) + return -EIO; + + *dev->dma_mask = mask; + return 0; +} +EXPORT_SYMBOL(dma_set_mask); + +int dma_set_coherent_mask(struct device *dev, u64 mask) +{ + if (mask > dev->archdata.parent_dma_mask) + mask = dev->archdata.parent_dma_mask; + + if (!dma_supported(dev, mask)) + return -EIO; + + dev->coherent_dma_mask = mask; + return 0; +} +EXPORT_SYMBOL(dma_set_coherent_mask); + static dma_addr_t __swiotlb_map_page(struct device *dev, struct page *page, unsigned long offset, size_t size, enum dma_data_direction dir, @@ -958,6 +989,18 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, if (!dev->archdata.dma_ops) dev->archdata.dma_ops = &swiotlb_dma_ops; + /* + * we don't yet support buses that have a non-zero mapping. + * Let's hope we won't need it + */ + WARN_ON(dma_base != 0); + + /* + * Whatever the parent bus can set. A device must not set + * a DMA mask larger than this. + */ + dev->archdata.parent_dma_mask = size - 1; + dev->archdata.dma_coherent = coherent; __iommu_setup_dma_ops(dev, dma_base, size, iommu); } -- 2.1.4
next prev parent reply other threads:[~2017-01-10 14:00 UTC|newest] Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-01-09 7:30 [PATCH v2] arm64: do not set dma masks that device connection can't handle Nikita Yushchenko 2017-01-09 7:30 ` Nikita Yushchenko 2017-01-10 11:51 ` Will Deacon 2017-01-10 11:51 ` Will Deacon 2017-01-10 12:47 ` Nikita Yushchenko 2017-01-10 12:47 ` Nikita Yushchenko 2017-01-10 13:12 ` Arnd Bergmann 2017-01-10 13:12 ` Arnd Bergmann 2017-01-10 13:25 ` Robin Murphy 2017-01-10 13:25 ` Robin Murphy 2017-01-10 13:42 ` Arnd Bergmann 2017-01-10 13:42 ` Arnd Bergmann 2017-01-10 14:16 ` Robin Murphy 2017-01-10 14:16 ` Robin Murphy 2017-01-10 15:06 ` Arnd Bergmann 2017-01-10 15:06 ` Arnd Bergmann 2017-01-11 12:37 ` Nikita Yushchenko 2017-01-11 12:37 ` Nikita Yushchenko 2017-01-11 16:21 ` Arnd Bergmann 2017-01-11 16:21 ` Arnd Bergmann 2017-01-11 18:28 ` Robin Murphy 2017-01-11 18:28 ` Robin Murphy 2017-01-10 14:59 ` Christoph Hellwig 2017-01-10 14:59 ` Christoph Hellwig 2017-01-10 14:00 ` Nikita Yushchenko [this message] 2017-01-10 14:00 ` [PATCH] arm64: avoid increasing DMA masks above what hardware supports Nikita Yushchenko 2017-01-10 17:14 ` Robin Murphy 2017-01-10 17:14 ` Robin Murphy 2017-01-11 7:59 ` Nikita Yushchenko 2017-01-11 7:59 ` Nikita Yushchenko 2017-01-11 11:54 ` Robin Murphy 2017-01-11 11:54 ` Robin Murphy 2017-01-11 13:41 ` Nikita Yushchenko 2017-01-11 13:41 ` Nikita Yushchenko 2017-01-11 14:50 ` Robin Murphy 2017-01-11 14:50 ` Robin Murphy 2017-01-11 16:03 ` Nikita Yushchenko 2017-01-11 16:50 ` Robin Murphy 2017-01-11 16:50 ` Robin Murphy 2017-01-11 18:31 ` [PATCH 0/2] arm64: fix handling of DMA masks wider than bus supports Nikita Yushchenko 2017-01-11 18:31 ` Nikita Yushchenko 2017-01-11 18:31 ` [PATCH 1/2] dma-mapping: let arch know origin of dma range passed to arch_setup_dma_ops() Nikita Yushchenko 2017-01-11 18:31 ` Nikita Yushchenko 2017-01-11 21:08 ` Arnd Bergmann 2017-01-11 21:08 ` Arnd Bergmann 2017-01-12 5:52 ` Nikita Yushchenko 2017-01-12 5:52 ` Nikita Yushchenko 2017-01-12 6:33 ` Nikita Yushchenko 2017-01-12 6:33 ` Nikita Yushchenko 2017-01-12 13:28 ` Arnd Bergmann 2017-01-12 13:28 ` Arnd Bergmann 2017-01-12 13:39 ` Nikita Yushchenko 2017-01-12 13:39 ` Nikita Yushchenko 2017-01-12 12:16 ` Will Deacon 2017-01-12 12:16 ` Will Deacon 2017-01-12 13:25 ` Arnd Bergmann 2017-01-12 13:25 ` Arnd Bergmann 2017-01-12 13:43 ` Robin Murphy 2017-01-12 13:43 ` Robin Murphy 2017-01-13 10:40 ` kbuild test robot 2017-01-13 10:40 ` kbuild test robot 2017-01-11 18:31 ` [PATCH 2/2] arm64: avoid increasing DMA masks above what hardware supports Nikita Yushchenko 2017-01-11 18:31 ` Nikita Yushchenko 2017-01-11 21:11 ` Arnd Bergmann 2017-01-11 21:11 ` Arnd Bergmann 2017-01-12 5:53 ` Nikita Yushchenko 2017-01-12 5:53 ` Nikita Yushchenko 2017-01-13 10:16 ` kbuild test robot 2017-01-13 10:16 ` kbuild test robot 2017-01-10 14:01 ` [PATCH v2] arm64: do not set dma masks that device connection can't handle Nikita Yushchenko 2017-01-10 14:01 ` Nikita Yushchenko 2017-01-10 14:57 ` Christoph Hellwig 2017-01-10 14:57 ` Christoph Hellwig 2017-01-10 14:51 ` Christoph Hellwig 2017-01-10 14:51 ` Christoph Hellwig
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=1484056844-9567-1-git-send-email-nikita.yoush@cogentembedded.com \ --to=nikita.yoush@cogentembedded.com \ --cc=arnd@arndb.de \ --cc=bhelgaas@google.com \ --cc=fkan@apm.com \ --cc=horms@verge.net.au \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-renesas-soc@vger.kernel.org \ --cc=robin.murphy@arm.com \ --cc=will.deacon@arm.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.