From: Vladimir Murzin <vladimir.murzin@arm.com> To: linux-arm-kernel@lists.infradead.org Cc: kbuild-all@01.org, linux@armlinux.org.uk, robin.murphy@arm.com, akpm@linux-foundation.org, linux-kernel@vger.kernel.org, Joerg Roedel <jroedel@suse.de>, Christian Borntraeger <borntraeger@de.ibm.com> Subject: [PATCH 1/7] dma: Take into account dma_pfn_offset Date: Wed, 15 Feb 2017 09:59:46 +0000 [thread overview] Message-ID: <1487152792-34214-2-git-send-email-vladimir.murzin@arm.com> (raw) In-Reply-To: <1487152792-34214-1-git-send-email-vladimir.murzin@arm.com> Even though dma-noop-ops assumes 1:1 memory mapping DMA memory range can be different to RAM. For example, ARM STM32F4 MCU offers the possibility to remap SDRAM from 0xc000_0000 to 0x0 to get CPU performance boost, but DMA continue to see SDRAM at 0xc000_0000. This difference in mapping is handled via device-tree "dma-range" property which leads to dev->dma_pfn_offset is set nonzero. To handle such cases take dma_pfn_offset into account. Cc: Joerg Roedel <jroedel@suse.de> Cc: Christian Borntraeger <borntraeger@de.ibm.com> Reported-by: Benjamin Gaignard <benjamin.gaignard@linaro.org> Tested-by: Benjamin Gaignard <benjamin.gaignard@linaro.org> Tested-by: Andras Szemzo <sza@esh.hu> Tested-by: Alexandre TORGUE <alexandre.torgue@st.com> Signed-off-by: Vladimir Murzin <vladimir.murzin@arm.com> --- lib/dma-noop.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/dma-noop.c b/lib/dma-noop.c index 3d766e7..a14eee5 100644 --- a/lib/dma-noop.c +++ b/lib/dma-noop.c @@ -7,6 +7,7 @@ #include <linux/mm.h> #include <linux/dma-mapping.h> #include <linux/scatterlist.h> +#include <linux/pfn.h> static void *dma_noop_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t gfp, @@ -16,7 +17,8 @@ static void *dma_noop_alloc(struct device *dev, size_t size, ret = (void *)__get_free_pages(gfp, get_order(size)); if (ret) - *dma_handle = virt_to_phys(ret); + *dma_handle = virt_to_phys(ret) - PFN_PHYS(dev->dma_pfn_offset); + return ret; } @@ -32,7 +34,7 @@ static dma_addr_t dma_noop_map_page(struct device *dev, struct page *page, enum dma_data_direction dir, unsigned long attrs) { - return page_to_phys(page) + offset; + return page_to_phys(page) + offset - PFN_PHYS(dev->dma_pfn_offset); } static int dma_noop_map_sg(struct device *dev, struct scatterlist *sgl, int nents, @@ -47,7 +49,7 @@ static int dma_noop_map_sg(struct device *dev, struct scatterlist *sgl, int nent BUG_ON(!sg_page(sg)); va = sg_virt(sg); - sg_dma_address(sg) = (dma_addr_t)virt_to_phys(va); + sg_dma_address(sg) = (dma_addr_t)(virt_to_phys(va) - PFN_PHYS(dev->dma_pfn_offset)); sg_dma_len(sg) = sg->length; } -- 2.0.0
WARNING: multiple messages have this Message-ID (diff)
From: vladimir.murzin@arm.com (Vladimir Murzin) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/7] dma: Take into account dma_pfn_offset Date: Wed, 15 Feb 2017 09:59:46 +0000 [thread overview] Message-ID: <1487152792-34214-2-git-send-email-vladimir.murzin@arm.com> (raw) In-Reply-To: <1487152792-34214-1-git-send-email-vladimir.murzin@arm.com> Even though dma-noop-ops assumes 1:1 memory mapping DMA memory range can be different to RAM. For example, ARM STM32F4 MCU offers the possibility to remap SDRAM from 0xc000_0000 to 0x0 to get CPU performance boost, but DMA continue to see SDRAM at 0xc000_0000. This difference in mapping is handled via device-tree "dma-range" property which leads to dev->dma_pfn_offset is set nonzero. To handle such cases take dma_pfn_offset into account. Cc: Joerg Roedel <jroedel@suse.de> Cc: Christian Borntraeger <borntraeger@de.ibm.com> Reported-by: Benjamin Gaignard <benjamin.gaignard@linaro.org> Tested-by: Benjamin Gaignard <benjamin.gaignard@linaro.org> Tested-by: Andras Szemzo <sza@esh.hu> Tested-by: Alexandre TORGUE <alexandre.torgue@st.com> Signed-off-by: Vladimir Murzin <vladimir.murzin@arm.com> --- lib/dma-noop.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/dma-noop.c b/lib/dma-noop.c index 3d766e7..a14eee5 100644 --- a/lib/dma-noop.c +++ b/lib/dma-noop.c @@ -7,6 +7,7 @@ #include <linux/mm.h> #include <linux/dma-mapping.h> #include <linux/scatterlist.h> +#include <linux/pfn.h> static void *dma_noop_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t gfp, @@ -16,7 +17,8 @@ static void *dma_noop_alloc(struct device *dev, size_t size, ret = (void *)__get_free_pages(gfp, get_order(size)); if (ret) - *dma_handle = virt_to_phys(ret); + *dma_handle = virt_to_phys(ret) - PFN_PHYS(dev->dma_pfn_offset); + return ret; } @@ -32,7 +34,7 @@ static dma_addr_t dma_noop_map_page(struct device *dev, struct page *page, enum dma_data_direction dir, unsigned long attrs) { - return page_to_phys(page) + offset; + return page_to_phys(page) + offset - PFN_PHYS(dev->dma_pfn_offset); } static int dma_noop_map_sg(struct device *dev, struct scatterlist *sgl, int nents, @@ -47,7 +49,7 @@ static int dma_noop_map_sg(struct device *dev, struct scatterlist *sgl, int nent BUG_ON(!sg_page(sg)); va = sg_virt(sg); - sg_dma_address(sg) = (dma_addr_t)virt_to_phys(va); + sg_dma_address(sg) = (dma_addr_t)(virt_to_phys(va) - PFN_PHYS(dev->dma_pfn_offset)); sg_dma_len(sg) = sg->length; } -- 2.0.0
next prev parent reply other threads:[~2017-02-15 10:01 UTC|newest] Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-02-15 9:59 [PATCH 0/7] ARM: Fix dma_alloc_coherent() and friends for NOMMU Vladimir Murzin 2017-02-15 9:59 ` Vladimir Murzin 2017-02-15 9:59 ` Vladimir Murzin [this message] 2017-02-15 9:59 ` [PATCH 1/7] dma: Take into account dma_pfn_offset Vladimir Murzin 2017-02-21 13:07 ` Robin Murphy 2017-02-21 13:07 ` Robin Murphy 2017-02-21 13:20 ` Vladimir Murzin 2017-02-21 13:20 ` Vladimir Murzin 2017-02-15 9:59 ` [PATCH 2/7] dma: Add simple dma_noop_mmap Vladimir Murzin 2017-02-15 9:59 ` Vladimir Murzin 2017-02-15 9:59 ` [PATCH 3/7] drivers: dma-coherent: Account dma_pfn_offset when used with device tree Vladimir Murzin 2017-02-15 9:59 ` Vladimir Murzin 2017-02-21 12:37 ` Robin Murphy 2017-02-21 12:37 ` Robin Murphy 2017-02-21 13:02 ` Vladimir Murzin 2017-02-21 13:02 ` Vladimir Murzin 2017-02-21 13:05 ` Vladimir Murzin 2017-02-21 13:05 ` Vladimir Murzin 2017-02-21 17:11 ` Robin Murphy 2017-02-21 17:11 ` Robin Murphy 2017-02-15 9:59 ` [PATCH 4/7] drivers: dma-coherent: Introduce default DMA pool Vladimir Murzin 2017-02-15 9:59 ` Vladimir Murzin 2017-02-15 9:59 ` [PATCH 5/7] ARM: NOMMU: Introduce dma operations for noMMU Vladimir Murzin 2017-02-15 9:59 ` Vladimir Murzin 2017-02-15 9:59 ` [PATCH 6/7] ARM: NOMMU: Set ARM_DMA_MEM_BUFFERABLE for M-class cpus Vladimir Murzin 2017-02-15 9:59 ` Vladimir Murzin 2017-02-21 12:57 ` Robin Murphy 2017-02-21 12:57 ` Robin Murphy 2017-02-21 13:03 ` Vladimir Murzin 2017-02-21 13:03 ` Vladimir Murzin 2017-02-15 9:59 ` [PATCH 7/7] ARM: dma-mapping: Remove traces of NOMMU code Vladimir Murzin 2017-02-15 9:59 ` Vladimir Murzin 2017-02-21 10:41 ` [PATCH 0/7] ARM: Fix dma_alloc_coherent() and friends for NOMMU Vladimir Murzin 2017-02-21 10:41 ` Vladimir Murzin 2017-02-21 12:16 ` Robin Murphy 2017-02-21 12:16 ` Robin Murphy 2017-02-21 12:27 ` Vladimir Murzin 2017-02-21 12:27 ` Vladimir Murzin
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=1487152792-34214-2-git-send-email-vladimir.murzin@arm.com \ --to=vladimir.murzin@arm.com \ --cc=akpm@linux-foundation.org \ --cc=borntraeger@de.ibm.com \ --cc=jroedel@suse.de \ --cc=kbuild-all@01.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@armlinux.org.uk \ --cc=robin.murphy@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.