From: Vladimir Murzin <vladimir.murzin@arm.com> To: linux-arm-kernel@lists.infradead.org Cc: sza@esh.hu, robin.murphy@arm.com, alexandre.torgue@st.com, akpm@linux-foundation.org, kbuild-all@01.org, linux-kernel@vger.kernel.org, linux@armlinux.org.uk, gregkh@linuxfoundation.org, arnd@arndb.de, Joerg Roedel <jroedel@suse.de>, Christian Borntraeger <borntraeger@de.ibm.com> Subject: [PATCH v4 2/7] dma: Add simple dma_noop_mmap Date: Mon, 24 Apr 2017 11:16:52 +0100 [thread overview] Message-ID: <1493029017-31382-3-git-send-email-vladimir.murzin@arm.com> (raw) In-Reply-To: <1493029017-31382-1-git-send-email-vladimir.murzin@arm.com> This patch adds a simple implementation of mmap to dma_noop_ops. 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 | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/lib/dma-noop.c b/lib/dma-noop.c index ff4ef5e..0acc3f6 100644 --- a/lib/dma-noop.c +++ b/lib/dma-noop.c @@ -66,6 +66,26 @@ static int dma_noop_supported(struct device *dev, u64 mask) return 1; } +static int dma_noop_mmap(struct device *dev, struct vm_area_struct *vma, + void *cpu_addr, dma_addr_t dma_addr, size_t size, + unsigned long attrs) +{ + unsigned long user_count = vma_pages(vma); + unsigned long count = PAGE_ALIGN(size) >> PAGE_SHIFT; + unsigned long pfn = page_to_pfn(virt_to_page(cpu_addr)); + unsigned long off = vma->vm_pgoff; + int ret = -ENXIO; + + if (off < count && user_count <= (count - off)) { + ret = remap_pfn_range(vma, vma->vm_start, + pfn + off, + user_count << PAGE_SHIFT, + vma->vm_page_prot); + } + + return ret; +} + const struct dma_map_ops dma_noop_ops = { .alloc = dma_noop_alloc, .free = dma_noop_free, @@ -73,6 +93,7 @@ const struct dma_map_ops dma_noop_ops = { .map_sg = dma_noop_map_sg, .mapping_error = dma_noop_mapping_error, .dma_supported = dma_noop_supported, + .mmap = dma_noop_mmap, }; EXPORT_SYMBOL(dma_noop_ops); -- 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 v4 2/7] dma: Add simple dma_noop_mmap Date: Mon, 24 Apr 2017 11:16:52 +0100 [thread overview] Message-ID: <1493029017-31382-3-git-send-email-vladimir.murzin@arm.com> (raw) In-Reply-To: <1493029017-31382-1-git-send-email-vladimir.murzin@arm.com> This patch adds a simple implementation of mmap to dma_noop_ops. 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 | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/lib/dma-noop.c b/lib/dma-noop.c index ff4ef5e..0acc3f6 100644 --- a/lib/dma-noop.c +++ b/lib/dma-noop.c @@ -66,6 +66,26 @@ static int dma_noop_supported(struct device *dev, u64 mask) return 1; } +static int dma_noop_mmap(struct device *dev, struct vm_area_struct *vma, + void *cpu_addr, dma_addr_t dma_addr, size_t size, + unsigned long attrs) +{ + unsigned long user_count = vma_pages(vma); + unsigned long count = PAGE_ALIGN(size) >> PAGE_SHIFT; + unsigned long pfn = page_to_pfn(virt_to_page(cpu_addr)); + unsigned long off = vma->vm_pgoff; + int ret = -ENXIO; + + if (off < count && user_count <= (count - off)) { + ret = remap_pfn_range(vma, vma->vm_start, + pfn + off, + user_count << PAGE_SHIFT, + vma->vm_page_prot); + } + + return ret; +} + const struct dma_map_ops dma_noop_ops = { .alloc = dma_noop_alloc, .free = dma_noop_free, @@ -73,6 +93,7 @@ const struct dma_map_ops dma_noop_ops = { .map_sg = dma_noop_map_sg, .mapping_error = dma_noop_mapping_error, .dma_supported = dma_noop_supported, + .mmap = dma_noop_mmap, }; EXPORT_SYMBOL(dma_noop_ops); -- 2.0.0
next prev parent reply other threads:[~2017-04-24 10:17 UTC|newest] Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-04-24 10:16 [PATCH v4 0/7] ARM: Fix dma_alloc_coherent() and friends for NOMMU Vladimir Murzin 2017-04-24 10:16 ` Vladimir Murzin 2017-04-24 10:16 ` [PATCH v4 1/7] dma: Take into account dma_pfn_offset Vladimir Murzin 2017-04-24 10:16 ` Vladimir Murzin 2017-04-24 10:16 ` Vladimir Murzin [this message] 2017-04-24 10:16 ` [PATCH v4 2/7] dma: Add simple dma_noop_mmap Vladimir Murzin 2017-04-24 10:16 ` [PATCH v4 3/7] drivers: dma-coherent: Account dma_pfn_offset when used with device tree Vladimir Murzin 2017-04-24 10:16 ` Vladimir Murzin 2017-04-24 10:16 ` [PATCH v4 4/7] drivers: dma-coherent: Introduce default DMA pool Vladimir Murzin 2017-04-24 10:16 ` Vladimir Murzin 2017-04-24 10:16 ` [PATCH v4 5/7] ARM: NOMMU: Introduce dma operations for noMMU Vladimir Murzin 2017-04-24 10:16 ` Vladimir Murzin 2017-04-24 10:16 ` [PATCH v4 6/7] ARM: NOMMU: Set ARM_DMA_MEM_BUFFERABLE for M-class cpus Vladimir Murzin 2017-04-24 10:16 ` Vladimir Murzin 2017-05-23 20:01 ` Russell King - ARM Linux 2017-05-23 20:01 ` Russell King - ARM Linux 2017-05-23 20:33 ` Arnd Bergmann 2017-05-23 20:33 ` Arnd Bergmann 2017-05-24 8:31 ` Vladimir Murzin 2017-05-24 8:31 ` Vladimir Murzin 2017-05-24 8:36 ` Arnd Bergmann 2017-05-24 8:36 ` Arnd Bergmann 2017-05-24 9:08 ` Vladimir Murzin 2017-05-24 9:08 ` Vladimir Murzin 2017-05-24 9:20 ` Arnd Bergmann 2017-05-24 9:20 ` Arnd Bergmann 2017-04-24 10:16 ` [PATCH v4 7/7] ARM: dma-mapping: Remove traces of NOMMU code Vladimir Murzin 2017-04-24 10:16 ` Vladimir Murzin 2017-05-02 8:32 ` [PATCH v4 0/7] ARM: Fix dma_alloc_coherent() and friends for NOMMU Vladimir Murzin 2017-05-02 8:32 ` Vladimir Murzin 2017-05-15 8:52 ` Vladimir Murzin 2017-05-15 8:52 ` Vladimir Murzin 2017-05-23 20:04 ` Russell King - ARM Linux 2017-05-23 20:04 ` Russell King - ARM Linux 2017-05-24 8:49 ` Vladimir Murzin 2017-05-24 8:49 ` 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=1493029017-31382-3-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=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: 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.