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

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

ARM: EXYNOS: Encapsulate register access inside a function for pm 



That makes the code cleaner and encapsulted. The function will be
reused in the next patch.

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 7880e45e

arch/arm/mach-exynos/pm.c

+41 −24
Original line number Diff line number Diff line
@@ -169,6 +169,42 @@ int exynos_cluster_power_state(int cluster) 
/* For Cortex-A9 Diagnostic and Power control register */

static unsigned int save_arm_register[2];



static void exynos_cpu_save_register(void)

{

	unsigned long tmp;



	/* Save Power control register */

	asm ("mrc p15, 0, %0, c15, c0, 0"

	     : "=r" (tmp) : : "cc");



	save_arm_register[0] = tmp;



	/* Save Diagnostic register */

	asm ("mrc p15, 0, %0, c15, c0, 1"

	     : "=r" (tmp) : : "cc");



	save_arm_register[1] = tmp;

}



static void exynos_cpu_restore_register(void)

{

	unsigned long tmp;



	/* Restore Power control register */

	tmp = save_arm_register[0];



	asm volatile ("mcr p15, 0, %0, c15, c0, 0"

		      : : "r" (tmp)

		      : "cc");



	/* Restore Diagnostic register */

	tmp = save_arm_register[1];



	asm volatile ("mcr p15, 0, %0, c15, c0, 1"

		      : : "r" (tmp)

		      : "cc");

}



static int exynos_cpu_suspend(unsigned long arg)

{

#ifdef CONFIG_CACHE_L2X0
@@ -228,17 +264,8 @@ static int exynos_pm_suspend(void) 
	tmp = (S5P_USE_STANDBY_WFI0 | S5P_USE_STANDBY_WFE0);

	__raw_writel(tmp, S5P_CENTRAL_SEQ_OPTION);



	if (!soc_is_exynos5250()) {

		/* Save Power control register */

		asm ("mrc p15, 0, %0, c15, c0, 0"

		     : "=r" (tmp) : : "cc");

		save_arm_register[0] = tmp;



		/* Save Diagnostic register */

		asm ("mrc p15, 0, %0, c15, c0, 1"

		     : "=r" (tmp) : : "cc");

		save_arm_register[1] = tmp;

	}

	if (!soc_is_exynos5250())

		exynos_cpu_save_register();



	return 0;

}
@@ -262,19 +289,9 @@ static void exynos_pm_resume(void) 
		/* No need to perform below restore code */

		goto early_wakeup;

	}

	if (!soc_is_exynos5250()) {

		/* Restore Power control register */

		tmp = save_arm_register[0];

		asm volatile ("mcr p15, 0, %0, c15, c0, 0"

			      : : "r" (tmp)

			      : "cc");



		/* Restore Diagnostic register */

		tmp = save_arm_register[1];

		asm volatile ("mcr p15, 0, %0, c15, c0, 1"

			      : : "r" (tmp)

			      : "cc");

	}

	if (!soc_is_exynos5250())

		exynos_cpu_restore_register();



	/* For release retention */