All of lore.kernel.org
 help / color / mirror / Atom feed
From: Zong Li <zongbox@gmail.com>
To: palmer@sifive.com, aou@eecs.berkeley.edu
Cc: hch@infradead.org, zong@andestech.com,
	linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org,
	Vincent Chen <vincentc@andestech.com>
Subject: [PATCH v4 5/5] RISC-V: Avoid corrupting the upper 32-bit of phys_addr_t in ioremap
Date: Wed,  3 Oct 2018 11:10:02 +0800	[thread overview]
Message-ID: <d851bbf26416d6fe5e55a2bec3121890cc95babd.1538535528.git.zongbox@gmail.com> (raw)
In-Reply-To: <cover.1538535527.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


WARNING: multiple messages have this Message-ID (diff)
From: zongbox@gmail.com (Zong Li)
To: linux-riscv@lists.infradead.org
Subject: [PATCH v4 5/5] RISC-V: Avoid corrupting the upper 32-bit of phys_addr_t in ioremap
Date: Wed,  3 Oct 2018 11:10:02 +0800	[thread overview]
Message-ID: <d851bbf26416d6fe5e55a2bec3121890cc95babd.1538535528.git.zongbox@gmail.com> (raw)
In-Reply-To: <cover.1538535527.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

WARNING: multiple messages have this Message-ID (diff)
From: Zong Li <zongbox@gmail.com>
To: palmer@sifive.com, aou@eecs.berkeley.edu
Cc: hch@infradead.org, zong@andestech.com,
	linux-riscv@lists.infradead.org,
	Vincent Chen <vincentc@andestech.com>,
	linux-kernel@vger.kernel.org
Subject: [PATCH v4 5/5] RISC-V: Avoid corrupting the upper 32-bit of phys_addr_t in ioremap
Date: Wed,  3 Oct 2018 11:10:02 +0800	[thread overview]
Message-ID: <d851bbf26416d6fe5e55a2bec3121890cc95babd.1538535528.git.zongbox@gmail.com> (raw)
Message-ID: <20181003031002.zs8zsfjIjc6F7oMGVah8jYbosjZO9nMhWqso2-Gn538@z> (raw)
In-Reply-To: <cover.1538535527.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


_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv

  parent reply	other threads:[~2018-10-03  3:12 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-03  3:09 [PATCH v4 0/5] Fix some bugs on RV32 build fail and issue Zong Li
2018-10-03  3:09 ` Zong Li
2018-10-03  3:09 ` Zong Li
2018-10-03  3:09 ` [PATCH v4 1/5] RISC-V: Build tishift only on 64-bit Zong Li
2018-10-03  3:09   ` Zong Li
2018-10-03  3:09   ` Zong Li
2018-10-03  3:09 ` [PATCH v4 2/5] RISC-V: Add preprocessor directive for swiotlb Zong Li
2018-10-03  3:09   ` Zong Li
2018-10-03  3:09   ` Zong Li
2018-10-03  3:10 ` [PATCH v4 3/5] lib: Add umoddi3 and udivmoddi4 of GCC library routines Zong Li
2018-10-03  3:10   ` Zong Li
2018-10-03  3:10   ` Zong Li
2018-10-03  3:10 ` [PATCH v4 4/5] RISC-V: Select GENERIC_LIB_UMODDI3 on RV32 Zong Li
2018-10-03  3:10   ` Zong Li
2018-10-03  3:10   ` Zong Li
2018-10-03  3:10 ` Zong Li [this message]
2018-10-03  3:10   ` [PATCH v4 5/5] RISC-V: Avoid corrupting the upper 32-bit of phys_addr_t in ioremap Zong Li
2018-10-03  3:10   ` Zong Li
2018-10-15 12:33 ` [PATCH v4 0/5] Fix some bugs on RV32 build fail and issue Zong Li
2018-10-15 12:33   ` Zong Li
2018-10-15 12:33   ` Zong Li
2018-10-15 23:16   ` Palmer Dabbelt
2018-10-15 23:16     ` Palmer Dabbelt
2018-10-15 23:16     ` Palmer Dabbelt

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=d851bbf26416d6fe5e55a2bec3121890cc95babd.1538535528.git.zongbox@gmail.com \
    --to=zongbox@gmail.com \
    --cc=aou@eecs.berkeley.edu \
    --cc=hch@infradead.org \
    --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 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.