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

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

ARM: EXYNOS: Use the cpu_pm notifier for pm 



Use the cpu_pm_enter/exit notifier to group some pm code inside the
pm file.

The save and restore code is duplicated across pm.c and cpuidle.c. By
using the cpu_pm notifier, we can factor out the routine.

Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Reviewed-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Reviewed-by: default avatarTomasz Figa <t.figa@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 9bd5544a

arch/arm/mach-exynos/cpuidle.c

+0 −24
Original line number Diff line number Diff line
@@ -47,26 +47,6 @@ static void exynos_set_wakeupmask(void) 
	__raw_writel(0x0000ff3e, S5P_WAKEUP_MASK);

}



static unsigned int g_pwr_ctrl, g_diag_reg;



static void save_cpu_arch_register(void)

{

	/*read power control register*/

	asm("mrc p15, 0, %0, c15, c0, 0" : "=r"(g_pwr_ctrl) : : "cc");

	/*read diagnostic register*/

	asm("mrc p15, 0, %0, c15, c0, 1" : "=r"(g_diag_reg) : : "cc");

	return;

}



static void restore_cpu_arch_register(void)

{

	/*write power control register*/

	asm("mcr p15, 0, %0, c15, c0, 0" : : "r"(g_pwr_ctrl) : "cc");

	/*write diagnostic register*/

	asm("mcr p15, 0, %0, c15, c0, 1" : : "r"(g_diag_reg) : "cc");

	return;

}



static int idle_finisher(unsigned long flags)

{

	exynos_set_wakeupmask();
@@ -88,8 +68,6 @@ static int exynos_enter_core0_aftr(struct cpuidle_device *dev, 
{

	unsigned long tmp;



	save_cpu_arch_register();



	/* Setting Central Sequence Register for power down mode */

	tmp = __raw_readl(S5P_CENTRAL_SEQ_CONFIGURATION);

	tmp &= ~S5P_CENTRAL_LOWPWR_CFG;
@@ -104,8 +82,6 @@ static int exynos_enter_core0_aftr(struct cpuidle_device *dev, 
#endif

	cpu_pm_exit();



	restore_cpu_arch_register();



	/*

	 * If PMU failed while entering sleep mode, WFI will be

	 * ignored by PMU and then exiting cpu_do_idle().

arch/arm/mach-exynos/pm.c

+27 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/init.h>

#include <linux/suspend.h>

#include <linux/syscore_ops.h>

#include <linux/cpu_pm.h>

#include <linux/io.h>

#include <linux/irqchip/arm-gic.h>

#include <linux/err.h>
@@ -387,10 +388,36 @@ static const struct platform_suspend_ops exynos_suspend_ops = { 
	.valid		= suspend_valid_only_mem,

};



static int exynos_cpu_pm_notifier(struct notifier_block *self,

				  unsigned long cmd, void *v)

{

	int cpu = smp_processor_id();



	switch (cmd) {

	case CPU_PM_ENTER:

		if (cpu == 0)

			exynos_cpu_save_register();

		break;



	case CPU_PM_EXIT:

		if (cpu == 0)

			exynos_cpu_restore_register();

		break;

	}



	return NOTIFY_OK;

}



static struct notifier_block exynos_cpu_pm_notifier_block = {

	.notifier_call = exynos_cpu_pm_notifier,

};



void __init exynos_pm_init(void)

{

	u32 tmp;



	cpu_pm_register_notifier(&exynos_cpu_pm_notifier_block);



	/* Platform-specific GIC callback */

	gic_arch_extn.irq_set_wake = exynos_irq_set_wake;