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

Commit 497ab3b3 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Kukjin Kim
Browse files

ARM: EXYNOS: fix CPU1 hotplug on Exynos3250 



CPU1 hotplug may hang when AFTR is used.  Fix it by:
- setting AUTOWAKEUP_EN bit in ARM_COREx_CONFIGURATION register in
  exynos_cpu_power_up()
- not clearing reserved bits of ARM_COREx_CONFIGURATION register in
  exynos_cpu_power_down()
- waiting while an undocumented register 0x0908 becomes non-zero in
  exynos_core_restart()
- using dsb_sev() instead of IPI in exynos_boot_secondary() on
  Exynos3250

This patch also fixes hotplug issues during resume from S2R:
$ echo mem > /sys/power/state
[  156.517266] Disabling non-boot CPUs ...
[  156.517781] IRQ18 no longer affine to CPU1
[  156.518043] CPU1: shutdown
[  156.544718] Enabling non-boot CPUs ...
[  156.554925] CPU1: Software reset
[  158.552631] CPU1: failed to come online
[  158.552753] Error taking CPU1 up: -5

Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Reviewed-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Tested-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Acked-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Tested-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene@kernel.org>
parent 4e330ae4

arch/arm/mach-exynos/platsmp.c

+20 −3
Original line number Diff line number Diff line
@@ -126,6 +126,8 @@ static inline void platform_do_lowpower(unsigned int cpu, int *spurious) 
 */

void exynos_cpu_power_down(int cpu)

{

	u32 core_conf;



	if (cpu == 0 && (of_machine_is_compatible("samsung,exynos5420") ||

		of_machine_is_compatible("samsung,exynos5800"))) {

		/*
@@ -138,7 +140,10 @@ void exynos_cpu_power_down(int cpu) 
		if (!(val & S5P_CORE_LOCAL_PWR_EN))

			return;

	}

	pmu_raw_writel(0, EXYNOS_ARM_CORE_CONFIGURATION(cpu));



	core_conf = pmu_raw_readl(EXYNOS_ARM_CORE_CONFIGURATION(cpu));

	core_conf &= ~S5P_CORE_LOCAL_PWR_EN;

	pmu_raw_writel(core_conf, EXYNOS_ARM_CORE_CONFIGURATION(cpu));

}



/**
@@ -149,7 +154,12 @@ void exynos_cpu_power_down(int cpu) 
 */

void exynos_cpu_power_up(int cpu)

{

	pmu_raw_writel(S5P_CORE_LOCAL_PWR_EN,

	u32 core_conf = S5P_CORE_LOCAL_PWR_EN;



	if (soc_is_exynos3250())

		core_conf |= S5P_CORE_AUTOWAKEUP_EN;



	pmu_raw_writel(core_conf,

			EXYNOS_ARM_CORE_CONFIGURATION(cpu));

}
@@ -227,6 +237,10 @@ static void exynos_core_restart(u32 core_id) 
	if (!of_machine_is_compatible("samsung,exynos3250"))

		return;



	while (!pmu_raw_readl(S5P_PMU_SPARE2))

		udelay(10);

	udelay(10);



	val = pmu_raw_readl(EXYNOS_ARM_CORE_STATUS(core_id));

	val |= S5P_CORE_WAKEUP_FROM_LOCAL_CFG;

	pmu_raw_writel(val, EXYNOS_ARM_CORE_STATUS(core_id));
@@ -347,6 +361,9 @@ static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle) 


		call_firmware_op(cpu_boot, core_id);



		if (soc_is_exynos3250())

			dsb_sev();

		else

			arch_send_wakeup_ipi_mask(cpumask_of(cpu));



		if (pen_release == -1)

arch/arm/mach-exynos/regs-pmu.h

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
#define S5P_INFORM5				0x0814

#define S5P_INFORM6				0x0818

#define S5P_INFORM7				0x081C

#define S5P_PMU_SPARE2				0x0908

#define S5P_PMU_SPARE3				0x090C



#define EXYNOS_IROM_DATA2			0x0988
@@ -182,6 +183,7 @@ 


#define S5P_CORE_LOCAL_PWR_EN			0x3

#define S5P_CORE_WAKEUP_FROM_LOCAL_CFG		(0x3 << 8)

#define S5P_CORE_AUTOWAKEUP_EN			(1 << 31)



/* Only for EXYNOS4210 */

#define S5P_CMU_CLKSTOP_LCD1_LOWPWR	0x1154