Commit 93028494 authored Mar 27, 2018 by Arnd Bergmann

Merge tag 'samsung-soc-4.17-2' of...

Merge tag 'samsung-soc-4.17-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/soc

Pull "Samsung mach/soc changes for v4.17, part two" from Krzysztof Kozłowski:

1. Fix coupled CPU idle freeze on Exynos4210.
2. Simplify hot-path in coupled CPU idle.

* tag 'samsung-soc-4.17-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: EXYNOS: Simplify code in coupled CPU idle hot path
  ARM: EXYNOS: Fix coupled CPU idle freeze on Exynos4210

parents 59162c93 ae35c483

arch/arm/mach-exynos/pm.c

+2 −6

Original line number	Diff line number	Diff line
		@@ -163,7 +163,7 @@ void exynos_enter_aftr(void)

		exynos_pm_central_suspend();

		if (of_machine_is_compatible("samsung,exynos4412")) {
		if (soc_is_exynos4412()) {
		/* Setting SEQ_OPTION register */
		pmu_raw_writel(S5P_USE_STANDBY_WFI0 \| S5P_USE_STANDBY_WFE0,
		S5P_CENTRAL_SEQ_OPTION);
		@@ -271,11 +271,7 @@ static int exynos_cpu0_enter_aftr(void)
		goto fail;

		call_firmware_op(cpu_boot, 1);

		if (soc_is_exynos3250())
		dsb_sev();
		else
		arch_send_wakeup_ipi_mask(cpumask_of(1));
		}
		}
		fail: