Skip to contentSkip to conversation

ARM: OMAP4: cpuidle: Fix the C-state reporting to cpuidle governor.

PATCH New Santosh Shilimkar 2 participants 4 messages Feb 6, 2012 – Feb 14, 2012

Subsystems (3)
Arm (32-bit) Arm sub-architectures OMAP2+ support
lore
Share & tools
lore

Santosh Shilimkar

author
#0 lore raw

PATCH 1/1 ARM: OMAP4: cpuidle: Fix the C-state reporting to cpuidle governor.

OMAP4 cpuidle driver is reporting the state requested by governor rather than the actually attempted one.

This is obviously misleading sysfs and powertop cpuidle statistics. Fix it so that stats are reported correctly.

Reported-by Kevin Hilman <[email protected]>
Signed-off-by Santosh Shilimkar <[email protected]>
---
 arch/arm/mach-omap2/cpuidle44xx.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/cpuidle44xx.c +1 -0
index cfdbb86..f128489 100644
@@ -85,6 +85,7 @@ static int omap4_enter_idle(struct cpuidle_device *dev,
 	cpu1_state = pwrdm_read_pwrst(cpu1_pd);
 	if (cpu1_state != PWRDM_POWER_OFF) {
 		new_state_idx = drv->safe_state_index;
+		index = drv->safe_state_index;
 		cx = cpuidle_get_statedata(&dev->states_usage[new_state_idx]);
 	}
Signature · 1 line
1.7.4.1
#1 lore raw

PATCH 1/1 ARM: OMAP4: cpuidle: Fix the C-state reporting to cpuidle governor.

Quoted 17 lines · Santosh Shilimkar

OMAP4 cpuidle driver is reporting the state requested by governor rather than the actually attempted one.

This is obviously misleading sysfs and powertop cpuidle statistics. Fix it so that stats are reported correctly.

Reported-by Kevin Hilman <[email protected]>
Signed-off-by Santosh Shilimkar <[email protected]>
---
 arch/arm/mach-omap2/cpuidle44xx.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/cpuidle44xx.c +0 -0
index cfdbb86..f128489 100644

arch/arm/mach-omap2/cpuidle44xx.c static int omap4_enter_idle(struct cpuidle_device *dev, · line 88

Quoted 4 lines
arch/arm/mach-omap2/cpuidle44xx.c +1 -0
@@ -85,6 +85,7 @@ static int omap4_enter_idle(struct cpuidle_device *dev,
 	cpu1_state = pwrdm_read_pwrst(cpu1_pd);
 	if (cpu1_state != PWRDM_POWER_OFF) {
 		new_state_idx = drv->safe_state_index;
+		index = drv->safe_state_index;

How about just get rid of new_state_idx all together and just update index and use it to index in to the states.

Kevin

Quoted 2 lines
arch/arm/mach-omap2/cpuidle44xx.c +0 -0
 		cx = cpuidle_get_statedata(&dev->states_usage[new_state_idx]);
 	}
author
#2 lore raw

PATCH 1/1 ARM: OMAP4: cpuidle: Fix the C-state reporting to cpuidle governor.

Quoted 14 lines · Kevin Hilman
Quoted 12 lines · Santosh Shilimkar

OMAP4 cpuidle driver is reporting the state requested by governor rather than the actually attempted one.

This is obviously misleading sysfs and powertop cpuidle statistics. Fix it so that stats are reported correctly.

Reported-by Kevin Hilman <[email protected]>
Signed-off-by Santosh Shilimkar <[email protected]>
---
 arch/arm/mach-omap2/cpuidle44xx.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
Quoted 13 lines

arch/arm/mach-omap2/cpuidle44xx.c static int omap4_enter_idle(struct cpuidle_device *dev, · line 88

Quoted 9 lines
arch/arm/mach-omap2/cpuidle44xx.c +1 -0
index cfdbb86..f128489 100644
@@ -85,6 +85,7 @@ static int omap4_enter_idle(struct cpuidle_device *dev,
 	cpu1_state = pwrdm_read_pwrst(cpu1_pd);
 	if (cpu1_state != PWRDM_POWER_OFF) {
 		new_state_idx = drv->safe_state_index;
+		index = drv->safe_state_index;

How about just get rid of new_state_idx all together and just update index and use it to index in to the states.

Make sense. Updated patch below.

Regards,
Santosh

Quoted 1 line

From 939dc3eda7895043c03526110e2a6b41e9861146 Mon Sep 17 00:00:00 2001

From: Santosh Shilimkar <[email protected]>
Date: Sun, 5 Feb 2012 13:18:44 +0530
Subject: [PATCH 2/2] ARM: OMAP4: cpuidle: Fix the C-state reporting to cpuidle governor.

OMAP4 cpuidle driver is reporting the state requested by governor rather than
the actually attempted one.

This is obviously misleading sysfs and powertop cpuidle statistics. Fix it so that stats are reported correctly.

While at this, get rid of new_state_idx, update and use index in to the states.

Reported-by Kevin Hilman <[email protected]>
Signed-off-by Santosh Shilimkar <[email protected]>
---
 arch/arm/mach-omap2/cpuidle44xx.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
(quoted diff) +0 -0

b/arch/arm/mach-omap2/cpuidle44xx.c
index cfdbb86..72e018b 100644

arch/arm/mach-omap2/cpuidle44xx.c +2 -3
@@ -65,7 +65,6 @@ static int omap4_enter_idle(struct cpuidle_device *dev,
 	struct timespec ts_preidle, ts_postidle, ts_idle;
 	u32 cpu1_state;
 	int idle_time;
-	int new_state_idx;
 	int cpu_id = smp_processor_id();
 
 	/* Used to keep track of the total time in idle */

@@ -84,8 +83,8 @@ static int omap4_enter_idle(struct cpuidle_device *dev,
 	 */
 	cpu1_state = pwrdm_read_pwrst(cpu1_pd);
 	if (cpu1_state != PWRDM_POWER_OFF) {
-		new_state_idx = drv->safe_state_index;
-		cx = cpuidle_get_statedata(&dev->states_usage[new_state_idx]);
+		index = drv->safe_state_index;
+		cx = cpuidle_get_statedata(&dev->states_usage[index]);
 	}
 
 	if (index > 0)
Signature · 12 lines
1.7.4.1




-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-ARM-OMAP4-cpuidle-Fix-the-C-state-reporting-to-cpuid.patch
Type: text/x-patch
Size: 1620 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120214/ba57035c/attachment.bin>
#3 lore raw

PATCH 1/1 ARM: OMAP4: cpuidle: Fix the C-state reporting to cpuidle governor.

Quoted 43 lines · Santosh Shilimkar
Quoted 14 lines · Kevin Hilman
Quoted 12 lines · Santosh Shilimkar

OMAP4 cpuidle driver is reporting the state requested by governor rather than the actually attempted one.

This is obviously misleading sysfs and powertop cpuidle statistics. Fix it so that stats are reported correctly.

Reported-by Kevin Hilman <[email protected]>
Signed-off-by Santosh Shilimkar <[email protected]>
---
 arch/arm/mach-omap2/cpuidle44xx.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
Quoted 13 lines

arch/arm/mach-omap2/cpuidle44xx.c static int omap4_enter_idle(struct cpuidle_device *dev, · line 88

Quoted 9 lines
arch/arm/mach-omap2/cpuidle44xx.c +1 -0
index cfdbb86..f128489 100644
@@ -85,6 +85,7 @@ static int omap4_enter_idle(struct cpuidle_device *dev,
 	cpu1_state = pwrdm_read_pwrst(cpu1_pd);
 	if (cpu1_state != PWRDM_POWER_OFF) {
 		new_state_idx = drv->safe_state_index;
+		index = drv->safe_state_index;

How about just get rid of new_state_idx all together and just update index and use it to index in to the states.

Make sense. Updated patch below.

Regards,
Santosh

From 939dc3eda7895043c03526110e2a6b41e9861146 Mon Sep 17 00:00:00 2001
From: Santosh Shilimkar <[email protected]>
Date: Sun, 5 Feb 2012 13:18:44 +0530
Subject: [PATCH 2/2] ARM: OMAP4: cpuidle: Fix the C-state reporting to cpuidle governor.

OMAP4 cpuidle driver is reporting the state requested by governor rather than
the actually attempted one.

Quoted 8 lines

This is obviously misleading sysfs and powertop cpuidle statistics. Fix it so that stats are reported correctly.

While at this, get rid of new_state_idx, update and use index in to the states.

Reported-by Kevin Hilman <[email protected]>
Signed-off-by Santosh Shilimkar <[email protected]>

Perfect. Thanks.

Queuing as a fix for v3.3.

Kevin