Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51e888d7 authored by Paul Walmsley's avatar Paul Walmsley
Browse files

OMAP2420 IO mapping: move IVA mapping virtual address out of vmalloc space 



Commit 10db25fe 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: default avatarPaul Walmsley <paul@pwsan.com>
Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
parent 7adb9987

arch/arm/plat-omap/include/plat/io.h

+9 −6
Original line number Diff line number Diff line
@@ -123,14 +123,17 @@ 
#define OMAP243X_SMS_SIZE	SZ_1M



/* 2420 IVA */

#define DSP_MEM_2420_PHYS	OMAP2420_DSP_MEM_BASE	/* 0x58000000 */

#define DSP_MEM_2420_VIRT	0xe0000000

#define DSP_MEM_2420_PHYS	OMAP2420_DSP_MEM_BASE

						/* 0x58000000 --> 0xfc100000 */

#define DSP_MEM_2420_VIRT	0xfc100000

#define DSP_MEM_2420_SIZE	0x28000

#define DSP_IPI_2420_PHYS	OMAP2420_DSP_IPI_BASE	/* 0x59000000 */

#define DSP_IPI_2420_VIRT	0xe1000000

#define DSP_IPI_2420_PHYS	OMAP2420_DSP_IPI_BASE

						/* 0x59000000 --> 0xfc128000 */

#define DSP_IPI_2420_VIRT	0xfc128000

#define DSP_IPI_2420_SIZE	SZ_4K

#define DSP_MMU_2420_PHYS	OMAP2420_DSP_MMU_BASE	/* 0x5a000000 */

#define DSP_MMU_2420_VIRT	0xe2000000

#define DSP_MMU_2420_PHYS	OMAP2420_DSP_MMU_BASE

						/* 0x5a000000 --> 0xfc129000 */

#define DSP_MMU_2420_VIRT	0xfc129000

#define DSP_MMU_2420_SIZE	SZ_4K



/* 2430 IVA2.1 - currently unmapped */