diff options
| author | Vincent Chen <vincentc@andestech.com> | 2018-10-02 16:52:31 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-01 09:16:53 +0100 |
| commit | bb925b9bece25e3c53fb06dc0cbcc4f3e40b196e (patch) | |
| tree | 8c56a613b62be11d43795a522b4e616c2865d660 /arch/riscv | |
| parent | 829aa617bf6e061964a724d48a2cb892752fa5ef (diff) | |
| download | linux-stable-bb925b9bece25e3c53fb06dc0cbcc4f3e40b196e.tar.gz linux-stable-bb925b9bece25e3c53fb06dc0cbcc4f3e40b196e.tar.bz2 linux-stable-bb925b9bece25e3c53fb06dc0cbcc4f3e40b196e.zip | |
RISC-V: Avoid corrupting the upper 32-bit of phys_addr_t in ioremap
[ Upstream commit 827a438156e4c423b6875a092e272933952a2910 ]
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>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Palmer Dabbelt <palmer@sifive.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'arch/riscv')
| -rw-r--r-- | arch/riscv/mm/ioremap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/riscv/mm/ioremap.c b/arch/riscv/mm/ioremap.c index 70ef2724cdf6..bd2f2db557cc 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); |