From: Zong Li <zongbox@gmail.com>
To: palmer@sifive.com, aou@eecs.berkeley.edu
Cc: vincentc@andestech.com, linux-riscv@lists.infradead.org,
linux-kernel@vger.kernel.org, zong@andestech.com
Subject: [PATCH 5/5] RISC-V: Avoid corrupting the upper 32-bit of phys_addr_t in ioremap
Date: Tue, 18 Sep 2018 17:19:17 +0800 [thread overview]
Message-ID: <9fc325660fb1e0ef9133705f7c05784dcc12c0c2.1537260207.git.zongbox@gmail.com> (raw)
In-Reply-To: <cover.1537260207.git.zongbox@gmail.com>
From: Vincent Chen <vincentc@andestech.com>
For 32bit, the upper 32-bit of phys_addr_t will be flushed to zero
after AND with PAGE_MASK because the data type of PAGE_MASK is
unsigned long. To fix this problem, the page alignment is done by
subtracting the page offset instead of AND with PAGE_MASK.
Signed-off-by: Vincent Chen <vincentc@andestech.com>
---
arch/riscv/mm/ioremap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/riscv/mm/ioremap.c b/arch/riscv/mm/ioremap.c
index 70ef272..bd2f2db 100644
--- a/arch/riscv/mm/ioremap.c
+++ b/arch/riscv/mm/ioremap.c
@@ -42,7 +42,7 @@ static void __iomem *__ioremap_caller(phys_addr_t addr, size_t size,
/* Page-align mappings */
offset = addr & (~PAGE_MASK);
- addr &= PAGE_MASK;
+ addr -= offset;
size = PAGE_ALIGN(size + offset);
area = get_vm_area_caller(size, VM_IOREMAP, caller);
--
2.7.4
next prev parent reply other threads:[~2018-09-18 9:21 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-18 9:19 [PATCH 0/5] Fix some bugs on RV32 build fail and issue Zong Li
2018-09-18 9:19 ` [PATCH 1/5] RISC-V: Build tishift only on 64-bit Zong Li
2018-09-21 6:58 ` Christoph Hellwig
2018-09-25 2:33 ` Zong Li
2018-09-18 9:19 ` [PATCH 2/5] RISC-V: Use swiotlb on RV64 only Zong Li
2018-09-21 6:59 ` Christoph Hellwig
2018-09-18 9:19 ` [PATCH 3/5] lib: Add umoddi3 and udivmoddi4 of GCC library routines Zong Li
2018-09-21 7:00 ` Christoph Hellwig
2018-09-25 2:19 ` Zong Li
2018-09-25 7:20 ` Andreas Schwab
2018-09-26 7:12 ` Zong Li
2018-09-25 15:25 ` Christoph Hellwig
2018-09-26 2:40 ` Zong Li
2018-09-18 9:19 ` [PATCH 4/5] RISC-V: Select GENERIC_LIB_UMODDI3 on RV32 Zong Li
2018-09-18 9:19 ` Zong Li [this message]
2018-09-21 7:00 ` [PATCH 5/5] RISC-V: Avoid corrupting the upper 32-bit of phys_addr_t in ioremap 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=9fc325660fb1e0ef9133705f7c05784dcc12c0c2.1537260207.git.zongbox@gmail.com \
--to=zongbox@gmail.com \
--cc=aou@eecs.berkeley.edu \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=palmer@sifive.com \
--cc=vincentc@andestech.com \
--cc=zong@andestech.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).