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

Commit cd245f59 authored by Daniel Lezcano's avatar Daniel Lezcano Committed by Kukjin Kim
Browse files

ARM: EXYNOS: Fix kernel panic when unplugging CPU1 on exynos 



A look at the code reveals use of S5P_VA_SYSRAM macro, in case of certain SoC
revisions, which is not valid any longer, after SYSRAM started to be mapped
dynamically. The new dynamic mapping is stored in sysram_base_addr variable,
which is declared static in platsmp.c

This fix makes sysram_base_addr non-static, declared it in common.h and used
in pm.c instead of S5P_VA_SYSRAM.

Suggested-by: default avatarTomasz Figa <t.figa@samsung.com>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Reviewed-by: default avatarTomasz Figa <t.figa@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent ff6a9c03

arch/arm/mach-exynos/common.h

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ void mct_init(void __iomem *base, int irq_g0, int irq_l0, int irq_l1); 


struct map_desc;

extern void __iomem *sysram_ns_base_addr;

extern void __iomem *sysram_base_addr;

void exynos_init_io(void);

void exynos_restart(enum reboot_mode mode, const char *cmd);

void exynos_cpuidle_init(void);

arch/arm/mach-exynos/platsmp.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 


extern void exynos4_secondary_startup(void);



static void __iomem *sysram_base_addr;

void __iomem *sysram_base_addr;

void __iomem *sysram_ns_base_addr;



static void __init exynos_smp_prepare_sysram(void)

arch/arm/mach-exynos/pm.c

+2 −2
Original line number Diff line number Diff line
@@ -169,10 +169,10 @@ int exynos_cluster_power_state(int cluster) 


#define EXYNOS_BOOT_VECTOR_ADDR	(samsung_rev() == EXYNOS4210_REV_1_1 ? \

			S5P_INFORM7 : (samsung_rev() == EXYNOS4210_REV_1_0 ? \

			(S5P_VA_SYSRAM + 0x24) : S5P_INFORM0))

			(sysram_base_addr + 0x24) : S5P_INFORM0))

#define EXYNOS_BOOT_VECTOR_FLAG	(samsung_rev() == EXYNOS4210_REV_1_1 ? \

			S5P_INFORM6 : (samsung_rev() == EXYNOS4210_REV_1_0 ? \

			(S5P_VA_SYSRAM + 0x20) : S5P_INFORM1))

			(sysram_base_addr + 0x20) : S5P_INFORM1))



#define S5P_CHECK_AFTR  0xFCBA0D10

#define S5P_CHECK_SLEEP 0x00000BAD