* [PATCH 15/16] OMAP3: Dynamic enable/disable of OFF support
@ 2008-09-26 12:20 Rajendra Nayak
2008-09-29 7:02 ` Rajendra Nayak
0 siblings, 1 reply; 6+ messages in thread
From: Rajendra Nayak @ 2008-09-26 12:20 UTC (permalink / raw)
To: linux-omap; +Cc: 'Kevin Hilman'
This patch adds a runtime sysfs knob (/sys/power/enable_off_mode)
to enable/disbale CORE OFF support for OMAP3.
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
---
arch/arm/mach-omap2/pm.c | 21 +++++++++++++++++----
arch/arm/mach-omap2/pm.h | 2 ++
arch/arm/mach-omap2/pm34xx.c | 26 ++++++++++++++++++++++++++
3 files changed, 45 insertions(+), 4 deletions(-)
Index: linux-omap-2.6/arch/arm/mach-omap2/pm34xx.c
===================================================================
--- linux-omap-2.6.orig/arch/arm/mach-omap2/pm34xx.c 2008-09-26 16:39:30.000000000 +0530
+++ linux-omap-2.6/arch/arm/mach-omap2/pm34xx.c 2008-09-26 16:39:34.000000000 +0530
@@ -395,6 +395,32 @@ static int omap3_can_sleep(void)
return 1;
}
+int set_next_pwrst(struct powerdomain *pwrdm)
+{
+ struct power_state *pwrst;
+ int ret = 0;
+ u32 state;
+
+ if (!pwrdm->pwrsts)
+ return 0;
+
+ if (enable_off_mode)
+ state = PWRDM_POWER_OFF;
+ else
+ state = PWRDM_POWER_RET;
+
+ ret = pwrdm_set_next_pwrst(pwrdm, state);
+ if (ret) {
+ printk(KERN_ERR "Unable to set state of powerdomain: %s\n",
+ pwrdm->name);
+ goto err;
+ }
+ list_for_each_entry(pwrst, &pwrst_list, node)
+ pwrst->next_state = state;
+err:
+ return ret;
+}
+
/* This sets pwrdm state (other than mpu & core. Currently only ON &
* RET are supported. Function is assuming that clkdm doesn't have
* hw_sup mode enabled. */
Index: linux-omap-2.6/arch/arm/mach-omap2/pm.c
===================================================================
--- linux-omap-2.6.orig/arch/arm/mach-omap2/pm.c 2008-09-26 16:39:30.000000000 +0530
+++ linux-omap-2.6/arch/arm/mach-omap2/pm.c 2008-09-26 16:39:34.000000000 +0530
@@ -35,6 +35,7 @@
unsigned short enable_dyn_sleep;
unsigned short clocks_off_while_idle;
+unsigned short enable_off_mode;
atomic_t sleep_block = ATOMIC_INIT(0);
static ssize_t idle_show(struct kobject *, struct kobj_attribute *, char *);
@@ -47,6 +48,9 @@ static struct kobj_attribute sleep_while
static struct kobj_attribute clocks_off_while_idle_attr =
__ATTR(clocks_off_while_idle, 0644, idle_show, idle_store);
+static struct kobj_attribute enable_off_mode_attr =
+ __ATTR(enable_off_mode, 0644, idle_show, idle_store);
+
static ssize_t idle_show(struct kobject *kobj, struct kobj_attribute *attr,
char *buf)
{
@@ -54,6 +58,8 @@ static ssize_t idle_show(struct kobject
return sprintf(buf, "%hu\n", enable_dyn_sleep);
else if (attr == &clocks_off_while_idle_attr)
return sprintf(buf, "%hu\n", clocks_off_while_idle);
+ else if (attr == &enable_off_mode_attr)
+ return sprintf(buf, "%hu\n", enable_off_mode);
else
return -EINVAL;
}
@@ -69,13 +75,16 @@ static ssize_t idle_store(struct kobject
return -EINVAL;
}
- if (attr == &sleep_while_idle_attr)
+ if (attr == &sleep_while_idle_attr) {
enable_dyn_sleep = value;
- else if (attr == &clocks_off_while_idle_attr)
+ } else if (attr == &clocks_off_while_idle_attr) {
clocks_off_while_idle = value;
- else
+ } else if (attr == &enable_off_mode_attr) {
+ enable_off_mode = value;
+ pwrdm_for_each(set_next_pwrst);
+ } else {
return -EINVAL;
-
+ }
return n;
}
@@ -114,6 +123,10 @@ static int __init omap_pm_init(void)
&clocks_off_while_idle_attr.attr);
if (error)
printk(KERN_ERR "sysfs_create_file failed: %d\n", error);
+ error = sysfs_create_file(power_kobj,
+ &enable_off_mode_attr.attr);
+ if (error)
+ printk(KERN_ERR "sysfs_create_file failed: %d\n", error);
return error;
}
Index: linux-omap-2.6/arch/arm/mach-omap2/pm.h
===================================================================
--- linux-omap-2.6.orig/arch/arm/mach-omap2/pm.h 2008-09-26 16:39:30.000000000 +0530
+++ linux-omap-2.6/arch/arm/mach-omap2/pm.h 2008-09-26 16:39:34.000000000 +0530
@@ -18,10 +18,12 @@ extern int omap3_pm_init(void);
extern unsigned short enable_dyn_sleep;
extern unsigned short clocks_off_while_idle;
+extern unsigned short enable_off_mode;
extern atomic_t sleep_block;
extern void omap2_block_sleep(void);
extern void omap2_allow_sleep(void);
+extern int set_next_pwrst(struct powerdomain *pwrdm);
#define OMAP343X_TABLE_ADDRESS_OFFSET 0x31
#define OMAP343X_TABLE_VALUE_OFFSET 0x30
^ permalink raw reply [flat|nested] 6+ messages in thread* RE: [PATCH 15/16] OMAP3: Dynamic enable/disable of OFF support
2008-09-26 12:20 [PATCH 15/16] OMAP3: Dynamic enable/disable of OFF support Rajendra Nayak
@ 2008-09-29 7:02 ` Rajendra Nayak
2008-09-30 9:33 ` Kevin Hilman
2008-10-01 11:25 ` Kevin Hilman
0 siblings, 2 replies; 6+ messages in thread
From: Rajendra Nayak @ 2008-09-29 7:02 UTC (permalink / raw)
To: linux-omap; +Cc: 'Kevin Hilman'
Sorry I replied on a wrong patch mail earlier.. I meant the below wrt this patch.
I just managed to see that this patch seems to break suspend functionality.
If after bootup I enable OFF mode the subsequent suspend tries to put a few
power domains to OFF which are currently in RET, and since there is no code
in place today to handle RET to OFF transitions, they don't transition to OFF and
remain in RET.
Supporting run time enable/disable of OFF functionality is kind of becoming complicated.
Do we really see a need to have a run-time option to enable/disable OFF mode or can
we have a compile time option for this?
> -----Original Message-----
> From: linux-omap-owner@vger.kernel.org
> [mailto:linux-omap-owner@vger.kernel.org] On Behalf Of Rajendra Nayak
> Sent: Friday, September 26, 2008 5:50 PM
> To: linux-omap@vger.kernel.org
> Cc: 'Kevin Hilman'
> Subject: [PATCH 15/16] OMAP3: Dynamic enable/disable of OFF support
>
> This patch adds a runtime sysfs knob (/sys/power/enable_off_mode)
> to enable/disbale CORE OFF support for OMAP3.
>
> Signed-off-by: Rajendra Nayak <rnayak@ti.com>
> ---
> arch/arm/mach-omap2/pm.c | 21 +++++++++++++++++----
> arch/arm/mach-omap2/pm.h | 2 ++
> arch/arm/mach-omap2/pm34xx.c | 26 ++++++++++++++++++++++++++
> 3 files changed, 45 insertions(+), 4 deletions(-)
>
> Index: linux-omap-2.6/arch/arm/mach-omap2/pm34xx.c
> ===================================================================
> --- linux-omap-2.6.orig/arch/arm/mach-omap2/pm34xx.c
> 2008-09-26 16:39:30.000000000 +0530
> +++ linux-omap-2.6/arch/arm/mach-omap2/pm34xx.c
> 2008-09-26 16:39:34.000000000 +0530
> @@ -395,6 +395,32 @@ static int omap3_can_sleep(void)
> return 1;
> }
>
> +int set_next_pwrst(struct powerdomain *pwrdm)
> +{
> + struct power_state *pwrst;
> + int ret = 0;
> + u32 state;
> +
> + if (!pwrdm->pwrsts)
> + return 0;
> +
> + if (enable_off_mode)
> + state = PWRDM_POWER_OFF;
> + else
> + state = PWRDM_POWER_RET;
> +
> + ret = pwrdm_set_next_pwrst(pwrdm, state);
> + if (ret) {
> + printk(KERN_ERR "Unable to set state of
> powerdomain: %s\n",
> + pwrdm->name);
> + goto err;
> + }
> + list_for_each_entry(pwrst, &pwrst_list, node)
> + pwrst->next_state = state;
> +err:
> + return ret;
> +}
> +
> /* This sets pwrdm state (other than mpu & core. Currently only ON &
> * RET are supported. Function is assuming that clkdm doesn't have
> * hw_sup mode enabled. */
> Index: linux-omap-2.6/arch/arm/mach-omap2/pm.c
> ===================================================================
> --- linux-omap-2.6.orig/arch/arm/mach-omap2/pm.c
> 2008-09-26 16:39:30.000000000 +0530
> +++ linux-omap-2.6/arch/arm/mach-omap2/pm.c 2008-09-26
> 16:39:34.000000000 +0530
> @@ -35,6 +35,7 @@
>
> unsigned short enable_dyn_sleep;
> unsigned short clocks_off_while_idle;
> +unsigned short enable_off_mode;
> atomic_t sleep_block = ATOMIC_INIT(0);
>
> static ssize_t idle_show(struct kobject *, struct
> kobj_attribute *, char *);
> @@ -47,6 +48,9 @@ static struct kobj_attribute sleep_while
> static struct kobj_attribute clocks_off_while_idle_attr =
> __ATTR(clocks_off_while_idle, 0644, idle_show, idle_store);
>
> +static struct kobj_attribute enable_off_mode_attr =
> + __ATTR(enable_off_mode, 0644, idle_show, idle_store);
> +
> static ssize_t idle_show(struct kobject *kobj, struct
> kobj_attribute *attr,
> char *buf)
> {
> @@ -54,6 +58,8 @@ static ssize_t idle_show(struct kobject
> return sprintf(buf, "%hu\n", enable_dyn_sleep);
> else if (attr == &clocks_off_while_idle_attr)
> return sprintf(buf, "%hu\n", clocks_off_while_idle);
> + else if (attr == &enable_off_mode_attr)
> + return sprintf(buf, "%hu\n", enable_off_mode);
> else
> return -EINVAL;
> }
> @@ -69,13 +75,16 @@ static ssize_t idle_store(struct kobject
> return -EINVAL;
> }
>
> - if (attr == &sleep_while_idle_attr)
> + if (attr == &sleep_while_idle_attr) {
> enable_dyn_sleep = value;
> - else if (attr == &clocks_off_while_idle_attr)
> + } else if (attr == &clocks_off_while_idle_attr) {
> clocks_off_while_idle = value;
> - else
> + } else if (attr == &enable_off_mode_attr) {
> + enable_off_mode = value;
> + pwrdm_for_each(set_next_pwrst);
> + } else {
> return -EINVAL;
> -
> + }
> return n;
> }
>
> @@ -114,6 +123,10 @@ static int __init omap_pm_init(void)
> &clocks_off_while_idle_attr.attr);
> if (error)
> printk(KERN_ERR "sysfs_create_file failed:
> %d\n", error);
> + error = sysfs_create_file(power_kobj,
> + &enable_off_mode_attr.attr);
> + if (error)
> + printk(KERN_ERR "sysfs_create_file failed:
> %d\n", error);
>
> return error;
> }
> Index: linux-omap-2.6/arch/arm/mach-omap2/pm.h
> ===================================================================
> --- linux-omap-2.6.orig/arch/arm/mach-omap2/pm.h
> 2008-09-26 16:39:30.000000000 +0530
> +++ linux-omap-2.6/arch/arm/mach-omap2/pm.h 2008-09-26
> 16:39:34.000000000 +0530
> @@ -18,10 +18,12 @@ extern int omap3_pm_init(void);
>
> extern unsigned short enable_dyn_sleep;
> extern unsigned short clocks_off_while_idle;
> +extern unsigned short enable_off_mode;
> extern atomic_t sleep_block;
>
> extern void omap2_block_sleep(void);
> extern void omap2_allow_sleep(void);
> +extern int set_next_pwrst(struct powerdomain *pwrdm);
>
> #define OMAP343X_TABLE_ADDRESS_OFFSET 0x31
> #define OMAP343X_TABLE_VALUE_OFFSET 0x30
>
> --
> To unsubscribe from this list: send the line "unsubscribe
> linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 15/16] OMAP3: Dynamic enable/disable of OFF support
2008-09-29 7:02 ` Rajendra Nayak
@ 2008-09-30 9:33 ` Kevin Hilman
2008-09-30 9:49 ` Högander Jouni
2008-10-01 11:25 ` Kevin Hilman
1 sibling, 1 reply; 6+ messages in thread
From: Kevin Hilman @ 2008-09-30 9:33 UTC (permalink / raw)
To: Rajendra Nayak; +Cc: linux-omap
"Rajendra Nayak" <rnayak@ti.com> writes:
> I just managed to see that this patch seems to break suspend
> functionality. If after bootup I enable OFF mode the subsequent
> suspend tries to put a few power domains to OFF which are currently
> in RET, and since there is no code in place today to handle RET to
> OFF transitions, they don't transition to OFF and remain in RET.
See commit a974addcfa23181667fe32e5032820917bf4a2b2 from Tero Kristo.
This patch was meant to address these kinds of transitions, but it
seems it's not working exactly right. I'm debugging now.
> Supporting run time enable/disable of OFF functionality is kind of
> becoming complicated. Do we really see a need to have a run-time
> option to enable/disable OFF mode or can we have a compile time
> option for this?
Run-time option is required.
Kevin
>> -----Original Message-----
>> From: linux-omap-owner@vger.kernel.org
>> [mailto:linux-omap-owner@vger.kernel.org] On Behalf Of Rajendra Nayak
>> Sent: Friday, September 26, 2008 5:50 PM
>> To: linux-omap@vger.kernel.org
>> Cc: 'Kevin Hilman'
>> Subject: [PATCH 15/16] OMAP3: Dynamic enable/disable of OFF support
>>
>> This patch adds a runtime sysfs knob (/sys/power/enable_off_mode)
>> to enable/disbale CORE OFF support for OMAP3.
>>
>> Signed-off-by: Rajendra Nayak <rnayak@ti.com>
>> ---
>> arch/arm/mach-omap2/pm.c | 21 +++++++++++++++++----
>> arch/arm/mach-omap2/pm.h | 2 ++
>> arch/arm/mach-omap2/pm34xx.c | 26 ++++++++++++++++++++++++++
>> 3 files changed, 45 insertions(+), 4 deletions(-)
>>
>> Index: linux-omap-2.6/arch/arm/mach-omap2/pm34xx.c
>> ===================================================================
>> --- linux-omap-2.6.orig/arch/arm/mach-omap2/pm34xx.c
>> 2008-09-26 16:39:30.000000000 +0530
>> +++ linux-omap-2.6/arch/arm/mach-omap2/pm34xx.c
>> 2008-09-26 16:39:34.000000000 +0530
>> @@ -395,6 +395,32 @@ static int omap3_can_sleep(void)
>> return 1;
>> }
>>
>> +int set_next_pwrst(struct powerdomain *pwrdm)
>> +{
>> + struct power_state *pwrst;
>> + int ret = 0;
>> + u32 state;
>> +
>> + if (!pwrdm->pwrsts)
>> + return 0;
>> +
>> + if (enable_off_mode)
>> + state = PWRDM_POWER_OFF;
>> + else
>> + state = PWRDM_POWER_RET;
>> +
>> + ret = pwrdm_set_next_pwrst(pwrdm, state);
>> + if (ret) {
>> + printk(KERN_ERR "Unable to set state of
>> powerdomain: %s\n",
>> + pwrdm->name);
>> + goto err;
>> + }
>> + list_for_each_entry(pwrst, &pwrst_list, node)
>> + pwrst->next_state = state;
>> +err:
>> + return ret;
>> +}
>> +
>> /* This sets pwrdm state (other than mpu & core. Currently only ON &
>> * RET are supported. Function is assuming that clkdm doesn't have
>> * hw_sup mode enabled. */
>> Index: linux-omap-2.6/arch/arm/mach-omap2/pm.c
>> ===================================================================
>> --- linux-omap-2.6.orig/arch/arm/mach-omap2/pm.c
>> 2008-09-26 16:39:30.000000000 +0530
>> +++ linux-omap-2.6/arch/arm/mach-omap2/pm.c 2008-09-26
>> 16:39:34.000000000 +0530
>> @@ -35,6 +35,7 @@
>>
>> unsigned short enable_dyn_sleep;
>> unsigned short clocks_off_while_idle;
>> +unsigned short enable_off_mode;
>> atomic_t sleep_block = ATOMIC_INIT(0);
>>
>> static ssize_t idle_show(struct kobject *, struct
>> kobj_attribute *, char *);
>> @@ -47,6 +48,9 @@ static struct kobj_attribute sleep_while
>> static struct kobj_attribute clocks_off_while_idle_attr =
>> __ATTR(clocks_off_while_idle, 0644, idle_show, idle_store);
>>
>> +static struct kobj_attribute enable_off_mode_attr =
>> + __ATTR(enable_off_mode, 0644, idle_show, idle_store);
>> +
>> static ssize_t idle_show(struct kobject *kobj, struct
>> kobj_attribute *attr,
>> char *buf)
>> {
>> @@ -54,6 +58,8 @@ static ssize_t idle_show(struct kobject
>> return sprintf(buf, "%hu\n", enable_dyn_sleep);
>> else if (attr == &clocks_off_while_idle_attr)
>> return sprintf(buf, "%hu\n", clocks_off_while_idle);
>> + else if (attr == &enable_off_mode_attr)
>> + return sprintf(buf, "%hu\n", enable_off_mode);
>> else
>> return -EINVAL;
>> }
>> @@ -69,13 +75,16 @@ static ssize_t idle_store(struct kobject
>> return -EINVAL;
>> }
>>
>> - if (attr == &sleep_while_idle_attr)
>> + if (attr == &sleep_while_idle_attr) {
>> enable_dyn_sleep = value;
>> - else if (attr == &clocks_off_while_idle_attr)
>> + } else if (attr == &clocks_off_while_idle_attr) {
>> clocks_off_while_idle = value;
>> - else
>> + } else if (attr == &enable_off_mode_attr) {
>> + enable_off_mode = value;
>> + pwrdm_for_each(set_next_pwrst);
>> + } else {
>> return -EINVAL;
>> -
>> + }
>> return n;
>> }
>>
>> @@ -114,6 +123,10 @@ static int __init omap_pm_init(void)
>> &clocks_off_while_idle_attr.attr);
>> if (error)
>> printk(KERN_ERR "sysfs_create_file failed:
>> %d\n", error);
>> + error = sysfs_create_file(power_kobj,
>> + &enable_off_mode_attr.attr);
>> + if (error)
>> + printk(KERN_ERR "sysfs_create_file failed:
>> %d\n", error);
>>
>> return error;
>> }
>> Index: linux-omap-2.6/arch/arm/mach-omap2/pm.h
>> ===================================================================
>> --- linux-omap-2.6.orig/arch/arm/mach-omap2/pm.h
>> 2008-09-26 16:39:30.000000000 +0530
>> +++ linux-omap-2.6/arch/arm/mach-omap2/pm.h 2008-09-26
>> 16:39:34.000000000 +0530
>> @@ -18,10 +18,12 @@ extern int omap3_pm_init(void);
>>
>> extern unsigned short enable_dyn_sleep;
>> extern unsigned short clocks_off_while_idle;
>> +extern unsigned short enable_off_mode;
>> extern atomic_t sleep_block;
>>
>> extern void omap2_block_sleep(void);
>> extern void omap2_allow_sleep(void);
>> +extern int set_next_pwrst(struct powerdomain *pwrdm);
>>
>> #define OMAP343X_TABLE_ADDRESS_OFFSET 0x31
>> #define OMAP343X_TABLE_VALUE_OFFSET 0x30
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe
>> linux-omap" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>>
>>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 15/16] OMAP3: Dynamic enable/disable of OFF support
2008-09-30 9:33 ` Kevin Hilman
@ 2008-09-30 9:49 ` Högander Jouni
2008-09-30 10:14 ` Rajendra Nayak
0 siblings, 1 reply; 6+ messages in thread
From: Högander Jouni @ 2008-09-30 9:49 UTC (permalink / raw)
To: ext Kevin Hilman; +Cc: Rajendra Nayak, linux-omap
"ext Kevin Hilman" <khilman@deeprootsystems.com> writes:
> "Rajendra Nayak" <rnayak@ti.com> writes:
>
>> I just managed to see that this patch seems to break suspend
>> functionality. If after bootup I enable OFF mode the subsequent
>> suspend tries to put a few power domains to OFF which are currently
>> in RET, and since there is no code in place today to handle RET to
>> OFF transitions, they don't transition to OFF and remain in RET.
>
> See commit a974addcfa23181667fe32e5032820917bf4a2b2 from Tero Kristo.
> This patch was meant to address these kinds of transitions, but it
> seems it's not working exactly right. I'm debugging now.
>
>> Supporting run time enable/disable of OFF functionality is kind of
>> becoming complicated. Do we really see a need to have a run-time
>> option to enable/disable OFF mode or can we have a compile time
>> option for this?
>
> Run-time option is required.
Whole cpuidle + srf concept is about changing between OFF/RET/ON
dynamically. So if implementing it through one sysfs entry is
discarded because it's complicated, how do you think you could
implement it in cpuidle and srf?
>
> Kevin
>
>>> -----Original Message-----
>>> From: linux-omap-owner@vger.kernel.org
>>> [mailto:linux-omap-owner@vger.kernel.org] On Behalf Of Rajendra Nayak
>>> Sent: Friday, September 26, 2008 5:50 PM
>>> To: linux-omap@vger.kernel.org
>>> Cc: 'Kevin Hilman'
>>> Subject: [PATCH 15/16] OMAP3: Dynamic enable/disable of OFF support
>>>
>>> This patch adds a runtime sysfs knob (/sys/power/enable_off_mode)
>>> to enable/disbale CORE OFF support for OMAP3.
>>>
>>> Signed-off-by: Rajendra Nayak <rnayak@ti.com>
>>> ---
>>> arch/arm/mach-omap2/pm.c | 21 +++++++++++++++++----
>>> arch/arm/mach-omap2/pm.h | 2 ++
>>> arch/arm/mach-omap2/pm34xx.c | 26 ++++++++++++++++++++++++++
>>> 3 files changed, 45 insertions(+), 4 deletions(-)
>>>
>>> Index: linux-omap-2.6/arch/arm/mach-omap2/pm34xx.c
>>> ===================================================================
>>> --- linux-omap-2.6.orig/arch/arm/mach-omap2/pm34xx.c
>>> 2008-09-26 16:39:30.000000000 +0530
>>> +++ linux-omap-2.6/arch/arm/mach-omap2/pm34xx.c
>>> 2008-09-26 16:39:34.000000000 +0530
>>> @@ -395,6 +395,32 @@ static int omap3_can_sleep(void)
>>> return 1;
>>> }
>>>
>>> +int set_next_pwrst(struct powerdomain *pwrdm)
>>> +{
>>> + struct power_state *pwrst;
>>> + int ret = 0;
>>> + u32 state;
>>> +
>>> + if (!pwrdm->pwrsts)
>>> + return 0;
>>> +
>>> + if (enable_off_mode)
>>> + state = PWRDM_POWER_OFF;
>>> + else
>>> + state = PWRDM_POWER_RET;
>>> +
>>> + ret = pwrdm_set_next_pwrst(pwrdm, state);
>>> + if (ret) {
>>> + printk(KERN_ERR "Unable to set state of
>>> powerdomain: %s\n",
>>> + pwrdm->name);
>>> + goto err;
>>> + }
>>> + list_for_each_entry(pwrst, &pwrst_list, node)
>>> + pwrst->next_state = state;
>>> +err:
>>> + return ret;
>>> +}
>>> +
>>> /* This sets pwrdm state (other than mpu & core. Currently only ON &
>>> * RET are supported. Function is assuming that clkdm doesn't have
>>> * hw_sup mode enabled. */
>>> Index: linux-omap-2.6/arch/arm/mach-omap2/pm.c
>>> ===================================================================
>>> --- linux-omap-2.6.orig/arch/arm/mach-omap2/pm.c
>>> 2008-09-26 16:39:30.000000000 +0530
>>> +++ linux-omap-2.6/arch/arm/mach-omap2/pm.c 2008-09-26
>>> 16:39:34.000000000 +0530
>>> @@ -35,6 +35,7 @@
>>>
>>> unsigned short enable_dyn_sleep;
>>> unsigned short clocks_off_while_idle;
>>> +unsigned short enable_off_mode;
>>> atomic_t sleep_block = ATOMIC_INIT(0);
>>>
>>> static ssize_t idle_show(struct kobject *, struct
>>> kobj_attribute *, char *);
>>> @@ -47,6 +48,9 @@ static struct kobj_attribute sleep_while
>>> static struct kobj_attribute clocks_off_while_idle_attr =
>>> __ATTR(clocks_off_while_idle, 0644, idle_show, idle_store);
>>>
>>> +static struct kobj_attribute enable_off_mode_attr =
>>> + __ATTR(enable_off_mode, 0644, idle_show, idle_store);
>>> +
>>> static ssize_t idle_show(struct kobject *kobj, struct
>>> kobj_attribute *attr,
>>> char *buf)
>>> {
>>> @@ -54,6 +58,8 @@ static ssize_t idle_show(struct kobject
>>> return sprintf(buf, "%hu\n", enable_dyn_sleep);
>>> else if (attr == &clocks_off_while_idle_attr)
>>> return sprintf(buf, "%hu\n", clocks_off_while_idle);
>>> + else if (attr == &enable_off_mode_attr)
>>> + return sprintf(buf, "%hu\n", enable_off_mode);
>>> else
>>> return -EINVAL;
>>> }
>>> @@ -69,13 +75,16 @@ static ssize_t idle_store(struct kobject
>>> return -EINVAL;
>>> }
>>>
>>> - if (attr == &sleep_while_idle_attr)
>>> + if (attr == &sleep_while_idle_attr) {
>>> enable_dyn_sleep = value;
>>> - else if (attr == &clocks_off_while_idle_attr)
>>> + } else if (attr == &clocks_off_while_idle_attr) {
>>> clocks_off_while_idle = value;
>>> - else
>>> + } else if (attr == &enable_off_mode_attr) {
>>> + enable_off_mode = value;
>>> + pwrdm_for_each(set_next_pwrst);
>>> + } else {
>>> return -EINVAL;
>>> -
>>> + }
>>> return n;
>>> }
>>>
>>> @@ -114,6 +123,10 @@ static int __init omap_pm_init(void)
>>> &clocks_off_while_idle_attr.attr);
>>> if (error)
>>> printk(KERN_ERR "sysfs_create_file failed:
>>> %d\n", error);
>>> + error = sysfs_create_file(power_kobj,
>>> + &enable_off_mode_attr.attr);
>>> + if (error)
>>> + printk(KERN_ERR "sysfs_create_file failed:
>>> %d\n", error);
>>>
>>> return error;
>>> }
>>> Index: linux-omap-2.6/arch/arm/mach-omap2/pm.h
>>> ===================================================================
>>> --- linux-omap-2.6.orig/arch/arm/mach-omap2/pm.h
>>> 2008-09-26 16:39:30.000000000 +0530
>>> +++ linux-omap-2.6/arch/arm/mach-omap2/pm.h 2008-09-26
>>> 16:39:34.000000000 +0530
>>> @@ -18,10 +18,12 @@ extern int omap3_pm_init(void);
>>>
>>> extern unsigned short enable_dyn_sleep;
>>> extern unsigned short clocks_off_while_idle;
>>> +extern unsigned short enable_off_mode;
>>> extern atomic_t sleep_block;
>>>
>>> extern void omap2_block_sleep(void);
>>> extern void omap2_allow_sleep(void);
>>> +extern int set_next_pwrst(struct powerdomain *pwrdm);
>>>
>>> #define OMAP343X_TABLE_ADDRESS_OFFSET 0x31
>>> #define OMAP343X_TABLE_VALUE_OFFSET 0x30
>>>
>>> --
>>> To unsubscribe from this list: send the line "unsubscribe
>>> linux-omap" in
>>> the body of a message to majordomo@vger.kernel.org
>>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>>>
>>>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
--
Jouni Högander
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread* RE: [PATCH 15/16] OMAP3: Dynamic enable/disable of OFF support
2008-09-30 9:49 ` Högander Jouni
@ 2008-09-30 10:14 ` Rajendra Nayak
0 siblings, 0 replies; 6+ messages in thread
From: Rajendra Nayak @ 2008-09-30 10:14 UTC (permalink / raw)
To: '"Högander" Jouni',
'ext Kevin Hilman'
Cc: linux-omap
> -----Original Message-----
> From: "Högander" Jouni [mailto:jouni.hogander@nokia.com]
> Sent: Tuesday, September 30, 2008 3:19 PM
> To: ext Kevin Hilman
> Cc: Rajendra Nayak; linux-omap@vger.kernel.org
> Subject: Re: [PATCH 15/16] OMAP3: Dynamic enable/disable of
> OFF support
>
> "ext Kevin Hilman" <khilman@deeprootsystems.com> writes:
>
> > "Rajendra Nayak" <rnayak@ti.com> writes:
> >
> >> I just managed to see that this patch seems to break suspend
> >> functionality. If after bootup I enable OFF mode the subsequent
> >> suspend tries to put a few power domains to OFF which are currently
> >> in RET, and since there is no code in place today to handle RET to
> >> OFF transitions, they don't transition to OFF and remain in RET.
> >
> > See commit a974addcfa23181667fe32e5032820917bf4a2b2 from
> Tero Kristo.
> > This patch was meant to address these kinds of transitions, but it
> > seems it's not working exactly right. I'm debugging now.
> >
> >> Supporting run time enable/disable of OFF functionality is kind of
> >> becoming complicated. Do we really see a need to have a run-time
> >> option to enable/disable OFF mode or can we have a compile time
> >> option for this?
> >
> > Run-time option is required.
>
> Whole cpuidle + srf concept is about changing between OFF/RET/ON
> dynamically. So if implementing it through one sysfs entry is
> discarded because it's complicated, how do you think you could
> implement it in cpuidle and srf?
What I meant was that hacking around the *existing* code (which neither
has cpuidle nor SRF) just to support runtime enable/disable of OFF mode
is getting complicated.
>
> >
> > Kevin
> >
> >>> -----Original Message-----
> >>> From: linux-omap-owner@vger.kernel.org
> >>> [mailto:linux-omap-owner@vger.kernel.org] On Behalf Of
> Rajendra Nayak
> >>> Sent: Friday, September 26, 2008 5:50 PM
> >>> To: linux-omap@vger.kernel.org
> >>> Cc: 'Kevin Hilman'
> >>> Subject: [PATCH 15/16] OMAP3: Dynamic enable/disable of
> OFF support
> >>>
> >>> This patch adds a runtime sysfs knob (/sys/power/enable_off_mode)
> >>> to enable/disbale CORE OFF support for OMAP3.
> >>>
> >>> Signed-off-by: Rajendra Nayak <rnayak@ti.com>
> >>> ---
> >>> arch/arm/mach-omap2/pm.c | 21 +++++++++++++++++----
> >>> arch/arm/mach-omap2/pm.h | 2 ++
> >>> arch/arm/mach-omap2/pm34xx.c | 26 ++++++++++++++++++++++++++
> >>> 3 files changed, 45 insertions(+), 4 deletions(-)
> >>>
> >>> Index: linux-omap-2.6/arch/arm/mach-omap2/pm34xx.c
> >>>
> ===================================================================
> >>> --- linux-omap-2.6.orig/arch/arm/mach-omap2/pm34xx.c
> >>> 2008-09-26 16:39:30.000000000 +0530
> >>> +++ linux-omap-2.6/arch/arm/mach-omap2/pm34xx.c
> >>> 2008-09-26 16:39:34.000000000 +0530
> >>> @@ -395,6 +395,32 @@ static int omap3_can_sleep(void)
> >>> return 1;
> >>> }
> >>>
> >>> +int set_next_pwrst(struct powerdomain *pwrdm)
> >>> +{
> >>> + struct power_state *pwrst;
> >>> + int ret = 0;
> >>> + u32 state;
> >>> +
> >>> + if (!pwrdm->pwrsts)
> >>> + return 0;
> >>> +
> >>> + if (enable_off_mode)
> >>> + state = PWRDM_POWER_OFF;
> >>> + else
> >>> + state = PWRDM_POWER_RET;
> >>> +
> >>> + ret = pwrdm_set_next_pwrst(pwrdm, state);
> >>> + if (ret) {
> >>> + printk(KERN_ERR "Unable to set state of
> >>> powerdomain: %s\n",
> >>> + pwrdm->name);
> >>> + goto err;
> >>> + }
> >>> + list_for_each_entry(pwrst, &pwrst_list, node)
> >>> + pwrst->next_state = state;
> >>> +err:
> >>> + return ret;
> >>> +}
> >>> +
> >>> /* This sets pwrdm state (other than mpu & core.
> Currently only ON &
> >>> * RET are supported. Function is assuming that clkdm
> doesn't have
> >>> * hw_sup mode enabled. */
> >>> Index: linux-omap-2.6/arch/arm/mach-omap2/pm.c
> >>>
> ===================================================================
> >>> --- linux-omap-2.6.orig/arch/arm/mach-omap2/pm.c
> >>> 2008-09-26 16:39:30.000000000 +0530
> >>> +++ linux-omap-2.6/arch/arm/mach-omap2/pm.c 2008-09-26
> >>> 16:39:34.000000000 +0530
> >>> @@ -35,6 +35,7 @@
> >>>
> >>> unsigned short enable_dyn_sleep;
> >>> unsigned short clocks_off_while_idle;
> >>> +unsigned short enable_off_mode;
> >>> atomic_t sleep_block = ATOMIC_INIT(0);
> >>>
> >>> static ssize_t idle_show(struct kobject *, struct
> >>> kobj_attribute *, char *);
> >>> @@ -47,6 +48,9 @@ static struct kobj_attribute sleep_while
> >>> static struct kobj_attribute clocks_off_while_idle_attr =
> >>> __ATTR(clocks_off_while_idle, 0644, idle_show, idle_store);
> >>>
> >>> +static struct kobj_attribute enable_off_mode_attr =
> >>> + __ATTR(enable_off_mode, 0644, idle_show, idle_store);
> >>> +
> >>> static ssize_t idle_show(struct kobject *kobj, struct
> >>> kobj_attribute *attr,
> >>> char *buf)
> >>> {
> >>> @@ -54,6 +58,8 @@ static ssize_t idle_show(struct kobject
> >>> return sprintf(buf, "%hu\n", enable_dyn_sleep);
> >>> else if (attr == &clocks_off_while_idle_attr)
> >>> return sprintf(buf, "%hu\n", clocks_off_while_idle);
> >>> + else if (attr == &enable_off_mode_attr)
> >>> + return sprintf(buf, "%hu\n", enable_off_mode);
> >>> else
> >>> return -EINVAL;
> >>> }
> >>> @@ -69,13 +75,16 @@ static ssize_t idle_store(struct kobject
> >>> return -EINVAL;
> >>> }
> >>>
> >>> - if (attr == &sleep_while_idle_attr)
> >>> + if (attr == &sleep_while_idle_attr) {
> >>> enable_dyn_sleep = value;
> >>> - else if (attr == &clocks_off_while_idle_attr)
> >>> + } else if (attr == &clocks_off_while_idle_attr) {
> >>> clocks_off_while_idle = value;
> >>> - else
> >>> + } else if (attr == &enable_off_mode_attr) {
> >>> + enable_off_mode = value;
> >>> + pwrdm_for_each(set_next_pwrst);
> >>> + } else {
> >>> return -EINVAL;
> >>> -
> >>> + }
> >>> return n;
> >>> }
> >>>
> >>> @@ -114,6 +123,10 @@ static int __init omap_pm_init(void)
> >>> &clocks_off_while_idle_attr.attr);
> >>> if (error)
> >>> printk(KERN_ERR "sysfs_create_file failed:
> >>> %d\n", error);
> >>> + error = sysfs_create_file(power_kobj,
> >>> + &enable_off_mode_attr.attr);
> >>> + if (error)
> >>> + printk(KERN_ERR "sysfs_create_file failed:
> >>> %d\n", error);
> >>>
> >>> return error;
> >>> }
> >>> Index: linux-omap-2.6/arch/arm/mach-omap2/pm.h
> >>>
> ===================================================================
> >>> --- linux-omap-2.6.orig/arch/arm/mach-omap2/pm.h
> >>> 2008-09-26 16:39:30.000000000 +0530
> >>> +++ linux-omap-2.6/arch/arm/mach-omap2/pm.h 2008-09-26
> >>> 16:39:34.000000000 +0530
> >>> @@ -18,10 +18,12 @@ extern int omap3_pm_init(void);
> >>>
> >>> extern unsigned short enable_dyn_sleep;
> >>> extern unsigned short clocks_off_while_idle;
> >>> +extern unsigned short enable_off_mode;
> >>> extern atomic_t sleep_block;
> >>>
> >>> extern void omap2_block_sleep(void);
> >>> extern void omap2_allow_sleep(void);
> >>> +extern int set_next_pwrst(struct powerdomain *pwrdm);
> >>>
> >>> #define OMAP343X_TABLE_ADDRESS_OFFSET 0x31
> >>> #define OMAP343X_TABLE_VALUE_OFFSET 0x30
> >>>
> >>> --
> >>> To unsubscribe from this list: send the line "unsubscribe
> >>> linux-omap" in
> >>> the body of a message to majordomo@vger.kernel.org
> >>> More majordomo info at http://vger.kernel.org/majordomo-info.html
> >>>
> >>>
> > --
> > To unsubscribe from this list: send the line "unsubscribe
> linux-omap" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
> >
> >
>
> --
> Jouni Högander
>
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 15/16] OMAP3: Dynamic enable/disable of OFF support
2008-09-29 7:02 ` Rajendra Nayak
2008-09-30 9:33 ` Kevin Hilman
@ 2008-10-01 11:25 ` Kevin Hilman
1 sibling, 0 replies; 6+ messages in thread
From: Kevin Hilman @ 2008-10-01 11:25 UTC (permalink / raw)
To: Rajendra Nayak; +Cc: linux-omap
"Rajendra Nayak" <rnayak@ti.com> writes:
> I just managed to see that this patch seems to break suspend
> functionality. If after bootup I enable OFF mode the subsequent
> suspend tries to put a few power domains to OFF which are currently
> in RET, and since there is no code in place today to handle RET to
> OFF transitions, they don't transition to OFF and remain in RET.
Rajendra,
Try this patch on top of your series, it works for me to hit OFF in
suspend and idle after having first hit RET in suspend and idle.
Note that my tests on 3430SDP-ES2 show that dynamic-idle with off-mode
enabled eventually hangs. I am not seeing this hang on custom HW.
Kevin
===========================
>From a03d3cfd71e9438c9446365519f0cb9ced75d1dd Mon Sep 17 00:00:00 2001
From: Kevin Hilman <khilman@deeprootsystems.com>
Date: Tue, 30 Sep 2008 16:12:55 +0300
Subject: [PATCH] ARM: OMAP3: PM: allow runtime enable/disable of OFF mode
To enable off mode:
echo 1 > /sys/power/enable_off_mode
to disable:
echo 0 > /sys/power/enable_off_mode
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
---
arch/arm/mach-omap2/pm.c | 5 +++--
arch/arm/mach-omap2/pm.h | 2 +-
arch/arm/mach-omap2/pm34xx.c | 42 ++++++++++++++++--------------------------
3 files changed, 20 insertions(+), 29 deletions(-)
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index 412fc86..10f8058 100644
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -80,8 +80,9 @@ static ssize_t idle_store(struct kobject *kobj, struct kobj_attribute *attr,
} else if (attr == &clocks_off_while_idle_attr) {
clocks_off_while_idle = value;
} else if (attr == &enable_off_mode_attr) {
- enable_off_mode = value;
- pwrdm_for_each(set_next_pwrst);
+ int enable = (value > 0) ? 1 : 0;
+
+ omap3_pm_off_mode_enable(enable);
} else {
return -EINVAL;
}
diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h
index 7e2c88a..901db2c 100644
--- a/arch/arm/mach-omap2/pm.h
+++ b/arch/arm/mach-omap2/pm.h
@@ -23,7 +23,7 @@ extern atomic_t sleep_block;
extern void omap2_block_sleep(void);
extern void omap2_allow_sleep(void);
-extern int set_next_pwrst(struct powerdomain *pwrdm);
+extern void omap3_pm_off_mode_enable(int);
#define OMAP343X_TABLE_ADDRESS_OFFSET 0x31
#define OMAP343X_TABLE_VALUE_OFFSET 0x30
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index 05509e9..e6a18ea 100644
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -395,32 +395,6 @@ static int omap3_can_sleep(void)
return 1;
}
-int set_next_pwrst(struct powerdomain *pwrdm)
-{
- struct power_state *pwrst;
- int ret = 0;
- u32 state;
-
- if (!pwrdm->pwrsts)
- return 0;
-
- if (enable_off_mode)
- state = PWRDM_POWER_OFF;
- else
- state = PWRDM_POWER_RET;
-
- ret = pwrdm_set_next_pwrst(pwrdm, state);
- if (ret) {
- printk(KERN_ERR "Unable to set state of powerdomain: %s\n",
- pwrdm->name);
- goto err;
- }
- list_for_each_entry(pwrst, &pwrst_list, node)
- pwrst->next_state = state;
-err:
- return ret;
-}
-
/* This sets pwrdm state (other than mpu & core. Currently only ON &
* RET are supported. Function is assuming that clkdm doesn't have
* hw_sup mode enabled. */
@@ -706,6 +680,22 @@ static void __init prcm_setup_regs(void)
OCP_MOD, OMAP2_PRM_IRQENABLE_MPU_OFFSET);
}
+void omap3_pm_off_mode_enable(int enable)
+{
+ struct power_state *pwrst;
+ u32 state;
+
+ if (enable)
+ state = PWRDM_POWER_OFF;
+ else
+ state = PWRDM_POWER_RET;
+
+ list_for_each_entry(pwrst, &pwrst_list, node) {
+ pwrst->next_state = state;
+ set_pwrdm_state(pwrst->pwrdm, state);
+ }
+}
+
static int __init pwrdms_setup(struct powerdomain *pwrdm)
{
struct power_state *pwrst;
--
1.6.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2008-10-01 11:25 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-09-26 12:20 [PATCH 15/16] OMAP3: Dynamic enable/disable of OFF support Rajendra Nayak
2008-09-29 7:02 ` Rajendra Nayak
2008-09-30 9:33 ` Kevin Hilman
2008-09-30 9:49 ` Högander Jouni
2008-09-30 10:14 ` Rajendra Nayak
2008-10-01 11:25 ` Kevin Hilman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox