diff options
author | Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> | 2010-06-18 12:22:40 +0900 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2010-07-09 11:42:03 -0700 |
commit | ffa71f33a820d1ab3f2fc5723819ac60fb76080b (patch) | |
tree | fb7fb08c43a773f771a49ac765e9330e07d32eef /include | |
parent | d7a0380dc3e6607d30ccdfc3cfc2ccee0d966716 (diff) | |
download | linux-3.10-ffa71f33a820d1ab3f2fc5723819ac60fb76080b.tar.gz linux-3.10-ffa71f33a820d1ab3f2fc5723819ac60fb76080b.tar.bz2 linux-3.10-ffa71f33a820d1ab3f2fc5723819ac60fb76080b.zip |
x86, ioremap: Fix incorrect physical address handling in PAE mode
Current x86 ioremap() doesn't handle physical address higher than
32-bit properly in X86_32 PAE mode. When physical address higher than
32-bit is passed to ioremap(), higher 32-bits in physical address is
cleared wrongly. Due to this bug, ioremap() can map wrong address to
linear address space.
In my case, 64-bit MMIO region was assigned to a PCI device (ioat
device) on my system. Because of the ioremap()'s bug, wrong physical
address (instead of MMIO region) was mapped to linear address space.
Because of this, loading ioatdma driver caused unexpected behavior
(kernel panic, kernel hangup, ...).
Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
LKML-Reference: <4C1AE680.7090408@jp.fujitsu.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/io.h | 4 | ||||
-rw-r--r-- | include/linux/vmalloc.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/io.h b/include/linux/io.h index 6c7f0ba0d5f..7fd2d2138bf 100644 --- a/include/linux/io.h +++ b/include/linux/io.h @@ -29,10 +29,10 @@ void __iowrite64_copy(void __iomem *to, const void *from, size_t count); #ifdef CONFIG_MMU int ioremap_page_range(unsigned long addr, unsigned long end, - unsigned long phys_addr, pgprot_t prot); + phys_addr_t phys_addr, pgprot_t prot); #else static inline int ioremap_page_range(unsigned long addr, unsigned long end, - unsigned long phys_addr, pgprot_t prot) + phys_addr_t phys_addr, pgprot_t prot) { return 0; } diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h index 227c2a585e4..de05e96e0a7 100644 --- a/include/linux/vmalloc.h +++ b/include/linux/vmalloc.h @@ -30,7 +30,7 @@ struct vm_struct { unsigned long flags; struct page **pages; unsigned int nr_pages; - unsigned long phys_addr; + phys_addr_t phys_addr; void *caller; }; |