Commit 06c77b3c authored by Amit Daniel Kachhap's avatar Amit Daniel Kachhap Committed by Kukjin Kim
Browse files

ARM: EXYNOS: Adapt to cpuidle core time keeping and irq enable 



This patch enables core cpuidle timekeeping and irq enabling and
remove those redundant parts from the exynos cpuidle drivers

Signed-off-by: default avatarAmit Daniel <amit.kachhap@linaro.org>
Acked-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: default avatarRobert Lee <rob.lee@linaro.org>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 81d41355

arch/arm/mach-exynos/cpuidle.c

+6 −47
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <asm/smp_scu.h>

#include <asm/suspend.h>

#include <asm/unified.h>

#include <asm/cpuidle.h>

#include <mach/regs-pmu.h>

#include <mach/pmu.h>
@@ -34,22 +35,12 @@ 


#define S5P_CHECK_AFTR		0xFCBA0D10



static int exynos4_enter_idle(struct cpuidle_device *dev,

			struct cpuidle_driver *drv,

			      int index);

static int exynos4_enter_lowpower(struct cpuidle_device *dev,

				struct cpuidle_driver *drv,

				int index);



static struct cpuidle_state exynos4_cpuidle_set[] __initdata = {

	[0] = {

		.enter			= exynos4_enter_idle,

		.exit_latency		= 1,

		.target_residency	= 100000,

		.flags			= CPUIDLE_FLAG_TIME_VALID,

		.name			= "C0",

		.desc			= "ARM clock gating(WFI)",

	},

	[0] = ARM_CPUIDLE_WFI_STATE,

	[1] = {

		.enter			= exynos4_enter_lowpower,

		.exit_latency		= 300,
@@ -65,6 +56,7 @@ static DEFINE_PER_CPU(struct cpuidle_device, exynos4_cpuidle_device); 
static struct cpuidle_driver exynos4_idle_driver = {

	.name			= "exynos4_idle",

	.owner			= THIS_MODULE,

	.en_core_tk_irqen	= 1,

};



/* Ext-GIC nIRQ/nFIQ is the only wakeup source in AFTR */
@@ -103,13 +95,8 @@ static int exynos4_enter_core0_aftr(struct cpuidle_device *dev, 
				struct cpuidle_driver *drv,

				int index)

{

	struct timeval before, after;

	int idle_time;

	unsigned long tmp;



	local_irq_disable();

	do_gettimeofday(&before);



	exynos4_set_wakeupmask();



	/* Set value of power down register for aftr mode */
@@ -150,34 +137,6 @@ static int exynos4_enter_core0_aftr(struct cpuidle_device *dev, 
	/* Clear wakeup state register */

	__raw_writel(0x0, S5P_WAKEUP_STAT);



	do_gettimeofday(&after);



	local_irq_enable();

	idle_time = (after.tv_sec - before.tv_sec) * USEC_PER_SEC +

		    (after.tv_usec - before.tv_usec);



	dev->last_residency = idle_time;

	return index;

}



static int exynos4_enter_idle(struct cpuidle_device *dev,

				struct cpuidle_driver *drv,

				int index)

{

	struct timeval before, after;

	int idle_time;



	local_irq_disable();

	do_gettimeofday(&before);



	cpu_do_idle();



	do_gettimeofday(&after);

	local_irq_enable();

	idle_time = (after.tv_sec - before.tv_sec) * USEC_PER_SEC +

		    (after.tv_usec - before.tv_usec);



	dev->last_residency = idle_time;

	return index;

}
@@ -192,7 +151,7 @@ static int exynos4_enter_lowpower(struct cpuidle_device *dev, 
		new_index = drv->safe_state_index;



	if (new_index == 0)

		return exynos4_enter_idle(dev, drv, new_index);

		return arm_cpuidle_simple_enter(dev, drv, new_index);

	else

		return exynos4_enter_core0_aftr(dev, drv, new_index);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE