diff options
| author | Paul Walmsley <paul@pwsan.com> | 2010-01-08 17:23:06 -0500 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2010-01-08 17:23:06 -0500 |
| commit | 51e888d705d29824aebb22ddf8a1f478083386e7 (patch) | |
| tree | 45f4f24230feb2c55ed714076a37b1354697427e /arch/arm | |
| parent | 7adb9987177f7aa269505ef65f4b4ed84bbc17b5 (diff) | |
OMAP2420 IO mapping: move IVA mapping virtual address out of vmalloc space
Commit 10db25fea4c11661070b97832b8cc3d2af495092 causes the following
kernel messages during N800 boot (and presumably all other 2420
boards):
[ 0.000000] BUG: mapping for 0x58000000 at 0xe0000000 overlaps vmalloc space
[ 0.000000] BUG: mapping for 0x59000000 at 0xe1000000 overlaps vmalloc space
[ 0.000000] BUG: mapping for 0x5a000000 at 0xe2000000 overlaps vmalloc space
Fix by remapping the IVA memory areas somewhere outside vmalloc space.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/io.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/arch/arm/plat-omap/include/plat/io.h b/arch/arm/plat-omap/include/plat/io.h index 7d6f45f3e9a3..a3e7b471bcba 100644 --- a/arch/arm/plat-omap/include/plat/io.h +++ b/arch/arm/plat-omap/include/plat/io.h | |||
| @@ -123,14 +123,17 @@ | |||
| 123 | #define OMAP243X_SMS_SIZE SZ_1M | 123 | #define OMAP243X_SMS_SIZE SZ_1M |
| 124 | 124 | ||
| 125 | /* 2420 IVA */ | 125 | /* 2420 IVA */ |
| 126 | #define DSP_MEM_2420_PHYS OMAP2420_DSP_MEM_BASE /* 0x58000000 */ | 126 | #define DSP_MEM_2420_PHYS OMAP2420_DSP_MEM_BASE |
| 127 | #define DSP_MEM_2420_VIRT 0xe0000000 | 127 | /* 0x58000000 --> 0xfc100000 */ |
| 128 | #define DSP_MEM_2420_VIRT 0xfc100000 | ||
| 128 | #define DSP_MEM_2420_SIZE 0x28000 | 129 | #define DSP_MEM_2420_SIZE 0x28000 |
| 129 | #define DSP_IPI_2420_PHYS OMAP2420_DSP_IPI_BASE /* 0x59000000 */ | 130 | #define DSP_IPI_2420_PHYS OMAP2420_DSP_IPI_BASE |
| 130 | #define DSP_IPI_2420_VIRT 0xe1000000 | 131 | /* 0x59000000 --> 0xfc128000 */ |
| 132 | #define DSP_IPI_2420_VIRT 0xfc128000 | ||
| 131 | #define DSP_IPI_2420_SIZE SZ_4K | 133 | #define DSP_IPI_2420_SIZE SZ_4K |
| 132 | #define DSP_MMU_2420_PHYS OMAP2420_DSP_MMU_BASE /* 0x5a000000 */ | 134 | #define DSP_MMU_2420_PHYS OMAP2420_DSP_MMU_BASE |
| 133 | #define DSP_MMU_2420_VIRT 0xe2000000 | 135 | /* 0x5a000000 --> 0xfc129000 */ |
| 136 | #define DSP_MMU_2420_VIRT 0xfc129000 | ||
| 134 | #define DSP_MMU_2420_SIZE SZ_4K | 137 | #define DSP_MMU_2420_SIZE SZ_4K |
| 135 | 138 | ||
| 136 | /* 2430 IVA2.1 - currently unmapped */ | 139 | /* 2430 IVA2.1 - currently unmapped */ |