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

Commit 7ed76e08 authored by Yadwinder Singh Brar's avatar Yadwinder Singh Brar Committed by Kukjin Kim
Browse files

ARM: EXYNOS: Fix low level debug support 



Presently, using exynos_defconfig with CONFIG_DEBUG_LL and CONFIG_EARLY_PRIN
on, kernel is not booting, we are getting following:

[    0.000000] ------------[ cut here ]------------
[    0.000000] kernel BUG at mm/vmalloc.c:1134!
[    0.000000] Internal error: Oops - BUG: 0 [#1] PREEMPT SMP ARM
[    0.000000] Modules linked in:
[    0.000000] CPU: 0 PID: 0 Comm: swapper Not tainted 3.11.0-rc1 #633
[    0.000000] task: c052ec48 ti: c0524000 task.ti: c0524000
[    0.000000] PC is at vm_area_add_early+0x54/0x94
[    0.000000] LR is at add_static_vm_early+0xc/0x60

Its because exynos[4/5]_map_io() function ioremaps a single 512KB memory
size for all the four uart ports which envelopes the mapping created by
debug_ll_io_init(), called earlier in exynos_init_io().

This patch removes iodesc entries for UART controller for all Samsung SoC's,
since now the Samsung uart driver does a ioremap during probe and any needed
iomapping for earlyprintk will be handled by debug_ll_io_init().

Tested on smdk4412 and smdk5250.

Signed-off-by: default avatarYadwinder Singh Brar <yadi.brar@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 7bdc84fb

arch/arm/mach-exynos/common.c

+0 −26
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ static const char name_exynos5440[] = "EXYNOS5440"; 


static void exynos4_map_io(void);

static void exynos5_map_io(void);

static void exynos5440_map_io(void);

static int exynos_init(void);



static struct cpu_table cpu_ids[] __initdata = {
@@ -95,7 +94,6 @@ static struct cpu_table cpu_ids[] __initdata = { 
	}, {

		.idcode		= EXYNOS5440_SOC_ID,

		.idmask		= EXYNOS5_SOC_MASK,

		.map_io		= exynos5440_map_io,

		.init		= exynos_init,

		.name		= name_exynos5440,

	},
@@ -149,11 +147,6 @@ static struct map_desc exynos4_iodesc[] __initdata = { 
		.pfn		= __phys_to_pfn(EXYNOS4_PA_GIC_DIST),

		.length		= SZ_64K,

		.type		= MT_DEVICE,

	}, {

		.virtual	= (unsigned long)S3C_VA_UART,

		.pfn		= __phys_to_pfn(EXYNOS4_PA_UART),

		.length		= SZ_512K,

		.type		= MT_DEVICE,

	}, {

		.virtual	= (unsigned long)S5P_VA_CMU,

		.pfn		= __phys_to_pfn(EXYNOS4_PA_CMU),
@@ -268,20 +261,6 @@ static struct map_desc exynos5_iodesc[] __initdata = { 
		.pfn		= __phys_to_pfn(EXYNOS5_PA_PMU),

		.length		= SZ_64K,

		.type		= MT_DEVICE,

	}, {

		.virtual	= (unsigned long)S3C_VA_UART,

		.pfn		= __phys_to_pfn(EXYNOS5_PA_UART),

		.length		= SZ_512K,

		.type		= MT_DEVICE,

	},

};



static struct map_desc exynos5440_iodesc0[] __initdata = {

	{

		.virtual	= (unsigned long)S3C_VA_UART,

		.pfn		= __phys_to_pfn(EXYNOS5440_PA_UART0),

		.length		= SZ_512K,

		.type		= MT_DEVICE,

	},

};
@@ -388,11 +367,6 @@ static void __init exynos5_map_io(void) 
		iotable_init(exynos5250_iodesc, ARRAY_SIZE(exynos5250_iodesc));

}



static void __init exynos5440_map_io(void)

{

	iotable_init(exynos5440_iodesc0, ARRAY_SIZE(exynos5440_iodesc0));

}



void __init exynos_init_time(void)

{

	of_clk_init(NULL);