[v2] ARM: davinci: cpuidle - remove ops

Message ID 1337551640-5973-1-git-send-email-daniel.lezcano@linaro.org
State New
Headers show

Commit Message

Daniel Lezcano May 20, 2012, 10:07 p.m.
This patch removes the ops usage because we have the index
passed as parameter to the idle function and we can determine
if we do WFI or memory retention.

The benefit of this cleanup is the removal of:
 * the ops
 * the statedata usage because we want to get rid of it in all the drivers
 * extra structure definition
 * extra functions definition
 * remove macro definition using BIT(0)

It also benefits the readability.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
 arch/arm/mach-davinci/cpuidle.c |   81 +++++++++++++--------------------------
 1 files changed, 27 insertions(+), 54 deletions(-)

Comments

Sekhar Nori May 22, 2012, 5:58 p.m. | #1
Hi Daniel,

On 5/21/2012 3:37 AM, Daniel Lezcano wrote:
> This patch removes the ops usage because we have the index
> passed as parameter to the idle function and we can determine
> if we do WFI or memory retention.
> 
> The benefit of this cleanup is the removal of:
>  * the ops
>  * the statedata usage because we want to get rid of it in all the drivers
>  * extra structure definition
>  * extra functions definition
>  * remove macro definition using BIT(0)
> 
> It also benefits the readability.
> 
> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>

Looks good to me. If there is no other plan, I will queue these two
cpuidle patches for v3.6 through DaVinci tree.

Thanks,
Sekhar
Daniel Lezcano May 22, 2012, 6:40 p.m. | #2
On 05/22/2012 07:58 PM, Sekhar Nori wrote:
> Hi Daniel,
>
> On 5/21/2012 3:37 AM, Daniel Lezcano wrote:
>> This patch removes the ops usage because we have the index
>> passed as parameter to the idle function and we can determine
>> if we do WFI or memory retention.
>>
>> The benefit of this cleanup is the removal of:
>>   * the ops
>>   * the statedata usage because we want to get rid of it in all the drivers
>>   * extra structure definition
>>   * extra functions definition
>>   * remove macro definition using BIT(0)
>>
>> It also benefits the readability.
>>
>> Signed-off-by: Daniel Lezcano<daniel.lezcano@linaro.org>
>
> Looks good to me. If there is no other plan, I will queue these two
> cpuidle patches for v3.6 through DaVinci tree.

Cool !

Just a reminder, I don't have this board, so I was not able to test it.

Thanks.
   -- Daniel
Sekhar Nori May 23, 2012, 5:54 p.m. | #3
On 5/23/2012 12:10 AM, Daniel Lezcano wrote:
> On 05/22/2012 07:58 PM, Sekhar Nori wrote:
>> Hi Daniel,
>>
>> On 5/21/2012 3:37 AM, Daniel Lezcano wrote:
>>> This patch removes the ops usage because we have the index
>>> passed as parameter to the idle function and we can determine
>>> if we do WFI or memory retention.
>>>
>>> The benefit of this cleanup is the removal of:
>>>   * the ops
>>>   * the statedata usage because we want to get rid of it in all the
>>> drivers
>>>   * extra structure definition
>>>   * extra functions definition
>>>   * remove macro definition using BIT(0)
>>>
>>> It also benefits the readability.
>>>
>>> Signed-off-by: Daniel Lezcano<daniel.lezcano@linaro.org>
>>
>> Looks good to me. If there is no other plan, I will queue these two
>> cpuidle patches for v3.6 through DaVinci tree.
> 
> Cool !
> 
> Just a reminder, I don't have this board, so I was not able to test it.

No problem. I tested that cpuidle enters state0 and state1 correctly
after this change. I did not make any power measurements though.

Thanks,
Sekhar

Patch

diff --git a/arch/arm/mach-davinci/cpuidle.c b/arch/arm/mach-davinci/cpuidle.c
index f0f179c..1b0782a 100644
--- a/arch/arm/mach-davinci/cpuidle.c
+++ b/arch/arm/mach-davinci/cpuidle.c
@@ -25,35 +25,46 @@ 
 
 #define DAVINCI_CPUIDLE_MAX_STATES	2
 
-struct davinci_ops {
-	void (*enter) (u32 flags);
-	void (*exit) (u32 flags);
-	u32 flags;
-};
+static bool ddr2_pwdn;
+
+static void __iomem *ddr2_reg_base;
+
+static void davinci_save_ddr_power(int enter, bool pdown)
+{
+	u32 val;
+
+	val = readl(ddr2_reg_base + DDR2_SDRCR_OFFSET);
+
+	if (enter) {
+		if (pdown)
+			val |= DDR2_SRPD_BIT;
+		else
+			val &= ~DDR2_SRPD_BIT;
+		val |= DDR2_LPMODEN_BIT;
+	} else {
+		val &= ~(DDR2_SRPD_BIT | DDR2_LPMODEN_BIT);
+	}
+
+	writel(val, ddr2_reg_base + DDR2_SDRCR_OFFSET);
+}
 
 /* Actual code that puts the SoC in different idle states */
 static int davinci_enter_idle(struct cpuidle_device *dev,
 				struct cpuidle_driver *drv,
 						int index)
 {
-	struct cpuidle_state_usage *state_usage = &dev->states_usage[index];
-	struct davinci_ops *ops = cpuidle_get_statedata(state_usage);
-
-	if (ops && ops->enter)
-		ops->enter(ops->flags);
+	if (index)
+		davinci_save_ddr_power(1, ddr2_pwdn);
 
 	index = cpuidle_wrap_enter(dev,	drv, index,
 				arm_cpuidle_simple_enter);
 
-	if (ops && ops->exit)
-		ops->exit(ops->flags);
+	if (index)
+		davinci_save_ddr_power(0, ddr2_pwdn);
 
 	return index;
 }
 
-/* fields in davinci_ops.flags */
-#define DAVINCI_CPUIDLE_FLAGS_DDR2_PWDN	BIT(0)
-
 static struct cpuidle_driver davinci_idle_driver = {
 	.name			= "cpuidle-davinci",
 	.owner			= THIS_MODULE,
@@ -71,43 +82,6 @@  static struct cpuidle_driver davinci_idle_driver = {
 };
 
 static DEFINE_PER_CPU(struct cpuidle_device, davinci_cpuidle_device);
-static void __iomem *ddr2_reg_base;
-
-static void davinci_save_ddr_power(int enter, bool pdown)
-{
-	u32 val;
-
-	val = __raw_readl(ddr2_reg_base + DDR2_SDRCR_OFFSET);
-
-	if (enter) {
-		if (pdown)
-			val |= DDR2_SRPD_BIT;
-		else
-			val &= ~DDR2_SRPD_BIT;
-		val |= DDR2_LPMODEN_BIT;
-	} else {
-		val &= ~(DDR2_SRPD_BIT | DDR2_LPMODEN_BIT);
-	}
-
-	__raw_writel(val, ddr2_reg_base + DDR2_SDRCR_OFFSET);
-}
-
-static void davinci_c2state_enter(u32 flags)
-{
-	davinci_save_ddr_power(1, !!(flags & DAVINCI_CPUIDLE_FLAGS_DDR2_PWDN));
-}
-
-static void davinci_c2state_exit(u32 flags)
-{
-	davinci_save_ddr_power(0, !!(flags & DAVINCI_CPUIDLE_FLAGS_DDR2_PWDN));
-}
-
-static struct davinci_ops davinci_states[DAVINCI_CPUIDLE_MAX_STATES] = {
-	[1] = {
-		.enter	= davinci_c2state_enter,
-		.exit	= davinci_c2state_exit,
-	},
-};
 
 static int __init davinci_cpuidle_probe(struct platform_device *pdev)
 {
@@ -125,8 +99,7 @@  static int __init davinci_cpuidle_probe(struct platform_device *pdev)
 	ddr2_reg_base = pdata->ddr2_ctlr_base;
 
 	if (pdata->ddr2_pdown)
-		davinci_states[1].flags |= DAVINCI_CPUIDLE_FLAGS_DDR2_PWDN;
-	cpuidle_set_statedata(&device->states_usage[1], &davinci_states[1]);
+		ddr2_pwdn = true;
 
 	ret = cpuidle_register_driver(&davinci_idle_driver);
 	if (ret) {