From: Vladimir Murzin <vladimir.murzin@arm.com>
To: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org, linux@armlinux.org.uk, sza@esh.hu,
arnd@arndb.de, gregkh@linuxfoundation.org,
akpm@linux-foundation.org, alexandre.torgue@st.com,
robin.murphy@arm.com, benjamin.gaignard@linaro.org,
kbuild-all@01.org, Joerg Roedel <jroedel@suse.de>,
Christian Borntraeger <borntraeger@de.ibm.com>
Subject: [PATCH v5 1/7] dma: Take into account dma_pfn_offset
Date: Wed, 24 May 2017 11:24:26 +0100 [thread overview]
Message-ID: <1495621472-9323-2-git-send-email-vladimir.murzin@arm.com> (raw)
In-Reply-To: <1495621472-9323-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>
Reviewed-by: Robin Murphy <robin.murphy@arm.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 de26c8b..ff4ef5e 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-05-24 11:07 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-24 10:24 [PATCH v5 0/7] ARM: Fix dma_alloc_coherent() and friends for NOMMU Vladimir Murzin
2017-05-24 10:24 ` Vladimir Murzin [this message]
2017-06-20 13:24 ` [PATCH v5 1/7] dma: Take into account dma_pfn_offset Christoph Hellwig
2017-06-22 12:47 ` Vladimir Murzin
2017-05-24 10:24 ` [PATCH v5 2/7] dma: Add simple dma_noop_mmap Vladimir Murzin
2017-06-20 13:23 ` Christoph Hellwig
2017-06-22 12:46 ` Vladimir Murzin
2017-06-26 9:45 ` Christoph Hellwig
2017-05-24 10:24 ` [PATCH v5 3/7] drivers: dma-coherent: Account dma_pfn_offset when used with device tree Vladimir Murzin
2017-06-20 13:42 ` Christoph Hellwig
2017-06-20 13:50 ` Robin Murphy
2017-06-26 9:37 ` Christoph Hellwig
2017-06-22 12:59 ` Vladimir Murzin
2017-05-24 10:24 ` [PATCH v5 4/7] drivers: dma-coherent: Introduce default DMA pool Vladimir Murzin
2017-06-20 13:49 ` Christoph Hellwig
2017-06-20 14:24 ` Robin Murphy
2017-06-26 9:42 ` Christoph Hellwig
2017-06-26 14:08 ` Vladimir Murzin
2017-06-27 14:36 ` Robin Murphy
2017-06-27 15:22 ` Christoph Hellwig
2017-06-22 13:18 ` Vladimir Murzin
2017-06-26 9:44 ` Christoph Hellwig
2017-05-24 10:24 ` [PATCH v5 5/7] ARM: NOMMU: Introduce dma operations for noMMU Vladimir Murzin
2017-05-24 10:24 ` [PATCH v5 6/7] ARM: NOMMU: Set ARM_DMA_MEM_BUFFERABLE for M-class cpus Vladimir Murzin
2017-05-24 10:24 ` [PATCH v5 7/7] ARM: dma-mapping: Remove traces of NOMMU code Vladimir Murzin
2017-06-08 8:28 ` [PATCH v5 0/7] ARM: Fix dma_alloc_coherent() and friends for NOMMU Vladimir Murzin
2017-06-08 16:25 ` Russell King - ARM Linux
2017-06-15 7:25 ` Vladimir Murzin
2017-06-20 12:59 ` Vladimir Murzin
2017-06-20 13:00 ` 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=1495621472-9323-2-git-send-email-vladimir.murzin@arm.com \
--to=vladimir.murzin@arm.com \
--cc=akpm@linux-foundation.org \
--cc=alexandre.torgue@st.com \
--cc=arnd@arndb.de \
--cc=benjamin.gaignard@linaro.org \
--cc=borntraeger@de.ibm.com \
--cc=gregkh@linuxfoundation.org \
--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 \
--cc=sza@esh.hu \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).