From: Santosh Shilimkar <santosh.shilimkar@ti.com>
To: linux-kernel@vger.kernel.org
Cc: Nicolas Pitre <nicolas.pitre@linaro.org>,
devicetree@vger.kernel.org,
Russell King - ARM Linux <linux@arm.linux.org.uk>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will.deacon@arm.com>,
Santosh Shilimkar <santosh.shilimkar@ti.com>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 7/7] ARM: dma: use phys_addr_t in __dma_page_[cpu_to_dev/dev_to_cpu]
Date: Thu, 24 Apr 2014 11:30:07 -0400 [thread overview]
Message-ID: <1398353407-2345-8-git-send-email-santosh.shilimkar@ti.com> (raw)
In-Reply-To: <1398353407-2345-1-git-send-email-santosh.shilimkar@ti.com>
On a 32 bit ARM architecture with LPAE extension physical addresses
cannot fit into unsigned long variable.
So fix it by using phys_addr_t instead of unsigned long.
Cc: Nicolas Pitre <nicolas.pitre@linaro.org>
Cc: Russell King - ARM Linux <linux@arm.linux.org.uk>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
---
arch/arm/mm/dma-mapping.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index f62aa06..5260f43 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -885,7 +885,7 @@ static void dma_cache_maint_page(struct page *page, unsigned long offset,
static void __dma_page_cpu_to_dev(struct page *page, unsigned long off,
size_t size, enum dma_data_direction dir)
{
- unsigned long paddr;
+ phys_addr_t paddr;
dma_cache_maint_page(page, off, size, dir, dmac_map_area);
@@ -901,7 +901,7 @@ static void __dma_page_cpu_to_dev(struct page *page, unsigned long off,
static void __dma_page_dev_to_cpu(struct page *page, unsigned long off,
size_t size, enum dma_data_direction dir)
{
- unsigned long paddr = page_to_phys(page) + off;
+ phys_addr_t paddr = page_to_phys(page) + off;
/* FIXME: non-speculating: not required */
/* don't bother invalidating if DMA to device */
--
1.7.9.5
next prev parent reply other threads:[~2014-04-24 15:30 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-24 15:30 [PATCH v3 0/7] of: setup dma parameters using dma-ranges and dma-coherent Santosh Shilimkar
2014-04-24 15:30 ` [PATCH v3 1/7] device: introduce per device dma_pfn_offset Santosh Shilimkar
2014-05-02 1:01 ` Rob Herring
2014-04-24 15:30 ` [PATCH v3 2/7] of: introduce of_dma_get_range() helper Santosh Shilimkar
[not found] ` <1398353407-2345-3-git-send-email-santosh.shilimkar-l0cyMroinI0@public.gmane.org>
2014-05-02 1:06 ` Rob Herring
2014-04-24 15:30 ` [PATCH v3 4/7] of: configure the platform device dma parameters Santosh Shilimkar
2014-04-29 14:41 ` Grant Likely
[not found] ` <20140429144147.004EEC40992-WNowdnHR2B42iJbIjFUEsiwD8/FfD2ys@public.gmane.org>
2014-04-30 14:19 ` Santosh Shilimkar
[not found] ` <53610663.7070305-l0cyMroinI0@public.gmane.org>
2014-05-01 13:12 ` Grant Likely
[not found] ` <20140501131210.CCC13C409DA-WNowdnHR2B42iJbIjFUEsiwD8/FfD2ys@public.gmane.org>
2014-05-01 13:16 ` Santosh Shilimkar
2014-05-02 9:58 ` Arnd Bergmann
2014-05-02 13:13 ` Santosh Shilimkar
[not found] ` <53639A0C.8070306-l0cyMroinI0@public.gmane.org>
2014-05-02 15:13 ` Arnd Bergmann
2014-05-27 12:56 ` Grant Likely
2014-05-27 13:30 ` Arnd Bergmann
2014-05-28 8:23 ` Linus Walleij
[not found] ` <CACRpkdZjEVYgq7tKEfmZC0Fu4n=JuUues=pAAtquLahkex=pkA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-05-28 13:29 ` Arnd Bergmann
2014-05-28 13:32 ` Linus Walleij
[not found] ` <CACRpkda5x-fJWTN40ze17woMWuWoVbuhbNu5nkm1sFcdJchRfA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-05-28 14:04 ` Santosh Shilimkar
2014-05-29 14:01 ` Linus Walleij
2014-05-29 14:08 ` Santosh Shilimkar
[not found] ` <53873F4A.9030303-l0cyMroinI0@public.gmane.org>
2014-05-29 19:24 ` Arnd Bergmann
2014-05-29 20:04 ` Santosh Shilimkar
[not found] ` <1398353407-2345-5-git-send-email-santosh.shilimkar-l0cyMroinI0@public.gmane.org>
2014-05-02 0:49 ` Rob Herring
[not found] ` <CAL_Jsq+nh26NZXx-9Y5FTxWZdVrG7aLTOBhC4j9P8mPPvUu2ag-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-05-05 21:47 ` Santosh Shilimkar
2014-05-05 22:08 ` Rob Herring
2014-05-06 9:40 ` Arnd Bergmann
2014-05-06 20:44 ` Santosh Shilimkar
2014-05-07 13:24 ` Santosh Shilimkar
2014-05-02 16:54 ` Bjorn Helgaas
2014-05-02 18:59 ` Arnd Bergmann
2014-05-05 20:45 ` Bjorn Helgaas
[not found] ` <CAErSpo5-FXmVs8BWRYKz9Ln1g1Ls7_uo3oiPd32fUegf3d8hXQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-05-05 20:55 ` Arnd Bergmann
2014-05-05 22:28 ` Bjorn Helgaas
2014-05-06 3:44 ` Benjamin Herrenschmidt
2014-05-06 9:54 ` Arnd Bergmann
2014-05-06 13:32 ` Santosh Shilimkar
2014-04-24 15:30 ` [PATCH v3 5/7] ARM: dma: Use dma_pfn_offset for dma address translation Santosh Shilimkar
[not found] ` <1398353407-2345-6-git-send-email-santosh.shilimkar-l0cyMroinI0@public.gmane.org>
2014-05-02 14:32 ` Rob Herring
2014-05-02 14:58 ` Russell King - ARM Linux
2014-05-02 15:05 ` Santosh Shilimkar
2014-05-05 19:50 ` Russell King - ARM Linux
[not found] ` <20140505195040.GE3693-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org>
2014-05-05 21:43 ` Santosh Shilimkar
2014-04-24 15:30 ` Santosh Shilimkar [this message]
2014-04-24 15:45 ` [PATCH v3 7/7] ARM: dma: use phys_addr_t in __dma_page_[cpu_to_dev/dev_to_cpu] Will Deacon
[not found] ` <1398353407-2345-1-git-send-email-santosh.shilimkar-l0cyMroinI0@public.gmane.org>
2014-04-24 15:30 ` [PATCH v3 3/7] of: introduce of_dma_is_coherent() helper Santosh Shilimkar
[not found] ` <1398353407-2345-4-git-send-email-santosh.shilimkar-l0cyMroinI0@public.gmane.org>
2014-05-02 0:56 ` Rob Herring
2014-05-05 21:45 ` Santosh Shilimkar
[not found] ` <5368068C.3090403-l0cyMroinI0@public.gmane.org>
2014-05-05 22:06 ` Rob Herring
2014-04-24 15:30 ` [PATCH v3 6/7] ARM: dma: implement set_arch_dma_coherent_ops() Santosh Shilimkar
[not found] ` <1398353407-2345-7-git-send-email-santosh.shilimkar-l0cyMroinI0@public.gmane.org>
2014-05-02 0:58 ` Rob Herring
2014-05-01 13:19 ` [PATCH v3 0/7] of: setup dma parameters using dma-ranges and dma-coherent Santosh Shilimkar
2014-05-01 13:25 ` Russell King - ARM Linux
[not found] ` <20140501132516.GG26756-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org>
2014-05-01 14:06 ` Santosh Shilimkar
2014-05-02 14:41 ` Rob Herring
2014-05-02 16:41 ` Santosh Shilimkar
2014-05-14 10:12 ` Grant Likely
2014-06-02 6:37 ` Shawn Guo
2014-06-02 13:24 ` Santosh Shilimkar
[not found] ` <538C7B22.2020107-l0cyMroinI0@public.gmane.org>
2014-06-02 15:06 ` Arnd Bergmann
2014-06-02 15:54 ` Santosh Shilimkar
2014-06-02 19:00 ` Arnd Bergmann
2014-06-02 19:08 ` 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=1398353407-2345-8-git-send-email-santosh.shilimkar@ti.com \
--to=santosh.shilimkar@ti.com \
--cc=catalin.marinas@arm.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=nicolas.pitre@linaro.org \
--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: 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).