* [PATCH] OMAP3: PM: move context-loss counting into OMAP PM
@ 2009-07-08 18:34 Kevin Hilman
2009-07-14 19:20 ` Madhusudhan
0 siblings, 1 reply; 4+ messages in thread
From: Kevin Hilman @ 2009-07-08 18:34 UTC (permalink / raw)
To: linux-omap; +Cc: Rajendra Nayak, Peter 'p2' De Schrijver
From: Rajendra Nayak <rnayak@ti.com>
Drop get_last_off_on_transaction_id() and move functionality
into OMAP PM layer.
For SRF, use omapdev** to get powerdomain state counte
for NOOP, use an increasing counter to ensure context is always restord.
**NOTE: in future PM branch, this omapdev functinality will be replaced
by omap_hwmod. Thus, context loss counting will only exist
for modules with omap_hwmod implementations.
Cc: Peter 'p2' De Schrijver <peter.de-schrijver@nokia.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
---
Applies to current PM branch and pm-2.6.29
arch/arm/mach-omap2/pm.c | 16 ----------------
arch/arm/plat-omap/omap-pm-noop.c | 7 ++++++-
arch/arm/plat-omap/omap-pm-srf.c | 11 +++++++++++
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index 1192e01..fec7d00 100644
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -31,7 +31,6 @@
#include <asm/atomic.h>
#include <mach/powerdomain.h>
-#include <mach/omapdev.h>
#include <mach/resource.h>
#include <mach/omap34xx.h>
@@ -221,21 +220,6 @@ void omap2_allow_sleep(void)
BUG_ON(i < 0);
}
-unsigned get_last_off_on_transaction_id(struct device *dev)
-{
- struct platform_device *pdev = to_platform_device(dev);
- struct omapdev *odev = omapdev_find_pdev(pdev);
- struct powerdomain *pwrdm;
-
- if (odev) {
- pwrdm = omapdev_get_pwrdm(odev);
- if (pwrdm)
- return pwrdm->state_counter[0];
- }
-
- return 0;
-}
-
static int __init omap_pm_init(void)
{
int error = -1;
diff --git a/arch/arm/plat-omap/omap-pm-noop.c b/arch/arm/plat-omap/omap-pm-noop.c
index 4ba261a..07b208b 100644
--- a/arch/arm/plat-omap/omap-pm-noop.c
+++ b/arch/arm/plat-omap/omap-pm-noop.c
@@ -277,6 +277,8 @@ unsigned long omap_pm_cpu_get_freq(void)
int omap_pm_get_dev_context_loss_count(struct device *dev)
{
+ static u32 counter = 0;
+
if (!dev) {
WARN_ON(1);
return -EINVAL;
@@ -290,7 +292,10 @@ int omap_pm_get_dev_context_loss_count(struct device *dev)
* off counter.
*/
- return 0;
+ /* For the noop case, we cannot know the off counter, so
+ * return an increasing counter which will ensure that
+ * context is always restored. */
+ return counter++;
}
/*
diff --git a/arch/arm/plat-omap/omap-pm-srf.c b/arch/arm/plat-omap/omap-pm-srf.c
index 226662d..cac08e4 100644
--- a/arch/arm/plat-omap/omap-pm-srf.c
+++ b/arch/arm/plat-omap/omap-pm-srf.c
@@ -276,6 +276,10 @@ EXPORT_SYMBOL(omap_pm_cpu_get_freq);
int omap_pm_get_dev_context_loss_count(struct device *dev)
{
+ struct platform_device *pdev;
+ struct omapdev *odev;
+ struct powerdomain *pwrdm;
+
if (!dev) {
WARN_ON(1);
return -EINVAL;
@@ -288,7 +292,14 @@ int omap_pm_get_dev_context_loss_count(struct device *dev)
* Map the device to the powerdomain. Return the powerdomain
* off counter.
*/
+ pdev = to_platform_device(dev);
+ odev = omapdev_find_pdev(pdev);
+ if (odev) {
+ pwrdm = omapdev_get_pwrdm(odev);
+ if (pwrdm)
+ return pwrdm->state_counter[0];
+ }
return 0;
}
--
1.6.3.3
^ permalink raw reply related [flat|nested] 4+ messages in thread* RE: [PATCH] OMAP3: PM: move context-loss counting into OMAP PM
2009-07-08 18:34 [PATCH] OMAP3: PM: move context-loss counting into OMAP PM Kevin Hilman
@ 2009-07-14 19:20 ` Madhusudhan
2009-07-14 21:46 ` Kevin Hilman
2009-07-15 15:00 ` Kevin Hilman
0 siblings, 2 replies; 4+ messages in thread
From: Madhusudhan @ 2009-07-14 19:20 UTC (permalink / raw)
To: 'Kevin Hilman', linux-omap
Cc: 'Rajendra Nayak',
'Peter 'p2' De Schrijver'
> -----Original Message-----
> From: linux-omap-owner@vger.kernel.org [mailto:linux-omap-
> owner@vger.kernel.org] On Behalf Of Kevin Hilman
> Sent: Wednesday, July 08, 2009 1:34 PM
> To: linux-omap@vger.kernel.org
> Cc: Rajendra Nayak; Peter 'p2' De Schrijver
> Subject: [PATCH] OMAP3: PM: move context-loss counting into OMAP PM
>
> From: Rajendra Nayak <rnayak@ti.com>
>
> Drop get_last_off_on_transaction_id() and move functionality
> into OMAP PM layer.
>
> For SRF, use omapdev** to get powerdomain state counte
> for NOOP, use an increasing counter to ensure context is always restord.
>
> **NOTE: in future PM branch, this omapdev functinality will be replaced
> by omap_hwmod. Thus, context loss counting will only exist
> for modules with omap_hwmod implementations.
>
> Cc: Peter 'p2' De Schrijver <peter.de-schrijver@nokia.com>
> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
> ---
> Applies to current PM branch and pm-2.6.29
>
> arch/arm/mach-omap2/pm.c | 16 ----------------
> arch/arm/plat-omap/omap-pm-noop.c | 7 ++++++-
> arch/arm/plat-omap/omap-pm-srf.c | 11 +++++++++++
> 3 files changed, 17 insertions(+), 17 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
> index 1192e01..fec7d00 100644
> --- a/arch/arm/mach-omap2/pm.c
> +++ b/arch/arm/mach-omap2/pm.c
> @@ -31,7 +31,6 @@
> #include <asm/atomic.h>
>
> #include <mach/powerdomain.h>
> -#include <mach/omapdev.h>
> #include <mach/resource.h>
> #include <mach/omap34xx.h>
>
> @@ -221,21 +220,6 @@ void omap2_allow_sleep(void)
> BUG_ON(i < 0);
> }
>
> -unsigned get_last_off_on_transaction_id(struct device *dev)
> -{
> - struct platform_device *pdev = to_platform_device(dev);
> - struct omapdev *odev = omapdev_find_pdev(pdev);
> - struct powerdomain *pwrdm;
> -
> - if (odev) {
> - pwrdm = omapdev_get_pwrdm(odev);
> - if (pwrdm)
> - return pwrdm->state_counter[0];
> - }
> -
> - return 0;
> -}
> -
> static int __init omap_pm_init(void)
> {
> int error = -1;
> diff --git a/arch/arm/plat-omap/omap-pm-noop.c b/arch/arm/plat-omap/omap-
> pm-noop.c
> index 4ba261a..07b208b 100644
> --- a/arch/arm/plat-omap/omap-pm-noop.c
> +++ b/arch/arm/plat-omap/omap-pm-noop.c
> @@ -277,6 +277,8 @@ unsigned long omap_pm_cpu_get_freq(void)
>
> int omap_pm_get_dev_context_loss_count(struct device *dev)
> {
> + static u32 counter = 0;
> +
> if (!dev) {
> WARN_ON(1);
> return -EINVAL;
> @@ -290,7 +292,10 @@ int omap_pm_get_dev_context_loss_count(struct device
> *dev)
> * off counter.
> */
>
> - return 0;
> + /* For the noop case, we cannot know the off counter, so
> + * return an increasing counter which will ensure that
> + * context is always restored. */
> + return counter++;
> }
>
> /*
> diff --git a/arch/arm/plat-omap/omap-pm-srf.c b/arch/arm/plat-omap/omap-
> pm-srf.c
> index 226662d..cac08e4 100644
> --- a/arch/arm/plat-omap/omap-pm-srf.c
> +++ b/arch/arm/plat-omap/omap-pm-srf.c
> @@ -276,6 +276,10 @@ EXPORT_SYMBOL(omap_pm_cpu_get_freq);
>
> int omap_pm_get_dev_context_loss_count(struct device *dev)
> {
> + struct platform_device *pdev;
> + struct omapdev *odev;
> + struct powerdomain *pwrdm;
> +
> if (!dev) {
> WARN_ON(1);
> return -EINVAL;
> @@ -288,7 +292,14 @@ int omap_pm_get_dev_context_loss_count(struct device
> *dev)
> * Map the device to the powerdomain. Return the powerdomain
> * off counter.
> */
> + pdev = to_platform_device(dev);
> + odev = omapdev_find_pdev(pdev);
>
> + if (odev) {
> + pwrdm = omapdev_get_pwrdm(odev);
> + if (pwrdm)
> + return pwrdm->state_counter[0];
The state_counter is unsigned and the return type of this fn does not match.
How is the overflow handled for state_counter? Once the OFF mode count
increases to 65535 there could be a overflow here.
> + }
> return 0;
> }
>
> --
> 1.6.3.3
>
> --
> 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] 4+ messages in thread* Re: [PATCH] OMAP3: PM: move context-loss counting into OMAP PM
2009-07-14 19:20 ` Madhusudhan
@ 2009-07-14 21:46 ` Kevin Hilman
2009-07-15 15:00 ` Kevin Hilman
1 sibling, 0 replies; 4+ messages in thread
From: Kevin Hilman @ 2009-07-14 21:46 UTC (permalink / raw)
To: Madhusudhan
Cc: linux-omap, 'Rajendra Nayak',
'Peter 'p2' De Schrijver'
"Madhusudhan" <madhu.cr@ti.com> writes:
>> -----Original Message-----
>> From: linux-omap-owner@vger.kernel.org [mailto:linux-omap-
>> owner@vger.kernel.org] On Behalf Of Kevin Hilman
>> Sent: Wednesday, July 08, 2009 1:34 PM
>> To: linux-omap@vger.kernel.org
>> Cc: Rajendra Nayak; Peter 'p2' De Schrijver
>> Subject: [PATCH] OMAP3: PM: move context-loss counting into OMAP PM
>>
>> From: Rajendra Nayak <rnayak@ti.com>
>>
>> Drop get_last_off_on_transaction_id() and move functionality
>> into OMAP PM layer.
>>
>> For SRF, use omapdev** to get powerdomain state counte
>> for NOOP, use an increasing counter to ensure context is always restord.
>>
>> **NOTE: in future PM branch, this omapdev functinality will be replaced
>> by omap_hwmod. Thus, context loss counting will only exist
>> for modules with omap_hwmod implementations.
>>
>> Cc: Peter 'p2' De Schrijver <peter.de-schrijver@nokia.com>
>> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
>> ---
>> Applies to current PM branch and pm-2.6.29
>>
>> arch/arm/mach-omap2/pm.c | 16 ----------------
>> arch/arm/plat-omap/omap-pm-noop.c | 7 ++++++-
>> arch/arm/plat-omap/omap-pm-srf.c | 11 +++++++++++
>> 3 files changed, 17 insertions(+), 17 deletions(-)
>>
>> diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
>> index 1192e01..fec7d00 100644
>> --- a/arch/arm/mach-omap2/pm.c
>> +++ b/arch/arm/mach-omap2/pm.c
>> @@ -31,7 +31,6 @@
>> #include <asm/atomic.h>
>>
>> #include <mach/powerdomain.h>
>> -#include <mach/omapdev.h>
>> #include <mach/resource.h>
>> #include <mach/omap34xx.h>
>>
>> @@ -221,21 +220,6 @@ void omap2_allow_sleep(void)
>> BUG_ON(i < 0);
>> }
>>
>> -unsigned get_last_off_on_transaction_id(struct device *dev)
>> -{
>> - struct platform_device *pdev = to_platform_device(dev);
>> - struct omapdev *odev = omapdev_find_pdev(pdev);
>> - struct powerdomain *pwrdm;
>> -
>> - if (odev) {
>> - pwrdm = omapdev_get_pwrdm(odev);
>> - if (pwrdm)
>> - return pwrdm->state_counter[0];
>> - }
>> -
>> - return 0;
>> -}
>> -
>> static int __init omap_pm_init(void)
>> {
>> int error = -1;
>> diff --git a/arch/arm/plat-omap/omap-pm-noop.c b/arch/arm/plat-omap/omap-
>> pm-noop.c
>> index 4ba261a..07b208b 100644
>> --- a/arch/arm/plat-omap/omap-pm-noop.c
>> +++ b/arch/arm/plat-omap/omap-pm-noop.c
>> @@ -277,6 +277,8 @@ unsigned long omap_pm_cpu_get_freq(void)
>>
>> int omap_pm_get_dev_context_loss_count(struct device *dev)
>> {
>> + static u32 counter = 0;
>> +
>> if (!dev) {
>> WARN_ON(1);
>> return -EINVAL;
>> @@ -290,7 +292,10 @@ int omap_pm_get_dev_context_loss_count(struct device
>> *dev)
>> * off counter.
>> */
>>
>> - return 0;
>> + /* For the noop case, we cannot know the off counter, so
>> + * return an increasing counter which will ensure that
>> + * context is always restored. */
>> + return counter++;
>> }
>>
>> /*
>> diff --git a/arch/arm/plat-omap/omap-pm-srf.c b/arch/arm/plat-omap/omap-
>> pm-srf.c
>> index 226662d..cac08e4 100644
>> --- a/arch/arm/plat-omap/omap-pm-srf.c
>> +++ b/arch/arm/plat-omap/omap-pm-srf.c
>> @@ -276,6 +276,10 @@ EXPORT_SYMBOL(omap_pm_cpu_get_freq);
>>
>> int omap_pm_get_dev_context_loss_count(struct device *dev)
>> {
>> + struct platform_device *pdev;
>> + struct omapdev *odev;
>> + struct powerdomain *pwrdm;
>> +
>> if (!dev) {
>> WARN_ON(1);
>> return -EINVAL;
>> @@ -288,7 +292,14 @@ int omap_pm_get_dev_context_loss_count(struct device
>> *dev)
>> * Map the device to the powerdomain. Return the powerdomain
>> * off counter.
>> */
>> + pdev = to_platform_device(dev);
>> + odev = omapdev_find_pdev(pdev);
>>
>> + if (odev) {
>> + pwrdm = omapdev_get_pwrdm(odev);
>> + if (pwrdm)
>> + return pwrdm->state_counter[0];
> The state_counter is unsigned and the return type of this fn does not match.
Good catch.
> How is the overflow handled for state_counter? Once the OFF mode count
> increases to 65535 there could be a overflow here.
And overflow doesn't matter. Drivers should simply be checking for
current state != previous state.
Kevin
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] OMAP3: PM: move context-loss counting into OMAP PM
2009-07-14 19:20 ` Madhusudhan
2009-07-14 21:46 ` Kevin Hilman
@ 2009-07-15 15:00 ` Kevin Hilman
1 sibling, 0 replies; 4+ messages in thread
From: Kevin Hilman @ 2009-07-15 15:00 UTC (permalink / raw)
To: Paul Walmsley
Cc: linux-omap, 'Rajendra Nayak',
'Peter 'p2' De Schrijver', Madhusudhan
Paul,
"Madhusudhan" <madhu.cr@ti.com> writes:
>> From: Rajendra Nayak <rnayak@ti.com>
>>
>> Drop get_last_off_on_transaction_id() and move functionality
>> into OMAP PM layer.
>>
>> For SRF, use omapdev** to get powerdomain state counte
>> for NOOP, use an increasing counter to ensure context is always restord.
>>
>> **NOTE: in future PM branch, this omapdev functinality will be replaced
>> by omap_hwmod. Thus, context loss counting will only exist
>> for modules with omap_hwmod implementations.
>>
>> Cc: Peter 'p2' De Schrijver <peter.de-schrijver@nokia.com>
>> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
>> ---
>> Applies to current PM branch and pm-2.6.29
>>
>> arch/arm/mach-omap2/pm.c | 16 ----------------
>> arch/arm/plat-omap/omap-pm-noop.c | 7 ++++++-
>> arch/arm/plat-omap/omap-pm-srf.c | 11 +++++++++++
>> 3 files changed, 17 insertions(+), 17 deletions(-)
>>
>> diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
>> index 1192e01..fec7d00 100644
>> --- a/arch/arm/mach-omap2/pm.c
>> +++ b/arch/arm/mach-omap2/pm.c
>> @@ -31,7 +31,6 @@
>> #include <asm/atomic.h>
>>
>> #include <mach/powerdomain.h>
>> -#include <mach/omapdev.h>
>> #include <mach/resource.h>
>> #include <mach/omap34xx.h>
>>
>> @@ -221,21 +220,6 @@ void omap2_allow_sleep(void)
>> BUG_ON(i < 0);
>> }
>>
>> -unsigned get_last_off_on_transaction_id(struct device *dev)
>> -{
>> - struct platform_device *pdev = to_platform_device(dev);
>> - struct omapdev *odev = omapdev_find_pdev(pdev);
>> - struct powerdomain *pwrdm;
>> -
>> - if (odev) {
>> - pwrdm = omapdev_get_pwrdm(odev);
>> - if (pwrdm)
>> - return pwrdm->state_counter[0];
>> - }
>> -
>> - return 0;
>> -}
>> -
>> static int __init omap_pm_init(void)
>> {
>> int error = -1;
>> diff --git a/arch/arm/plat-omap/omap-pm-noop.c b/arch/arm/plat-omap/omap-
>> pm-noop.c
>> index 4ba261a..07b208b 100644
>> --- a/arch/arm/plat-omap/omap-pm-noop.c
>> +++ b/arch/arm/plat-omap/omap-pm-noop.c
>> @@ -277,6 +277,8 @@ unsigned long omap_pm_cpu_get_freq(void)
>>
>> int omap_pm_get_dev_context_loss_count(struct device *dev)
>> {
>> + static u32 counter = 0;
>> +
>> if (!dev) {
>> WARN_ON(1);
>> return -EINVAL;
>> @@ -290,7 +292,10 @@ int omap_pm_get_dev_context_loss_count(struct device
>> *dev)
>> * off counter.
>> */
>>
>> - return 0;
>> + /* For the noop case, we cannot know the off counter, so
>> + * return an increasing counter which will ensure that
>> + * context is always restored. */
>> + return counter++;
>> }
>>
>> /*
>> diff --git a/arch/arm/plat-omap/omap-pm-srf.c b/arch/arm/plat-omap/omap-
>> pm-srf.c
>> index 226662d..cac08e4 100644
>> --- a/arch/arm/plat-omap/omap-pm-srf.c
>> +++ b/arch/arm/plat-omap/omap-pm-srf.c
>> @@ -276,6 +276,10 @@ EXPORT_SYMBOL(omap_pm_cpu_get_freq);
>>
>> int omap_pm_get_dev_context_loss_count(struct device *dev)
>> {
>> + struct platform_device *pdev;
>> + struct omapdev *odev;
>> + struct powerdomain *pwrdm;
>> +
>> if (!dev) {
>> WARN_ON(1);
>> return -EINVAL;
>> @@ -288,7 +292,14 @@ int omap_pm_get_dev_context_loss_count(struct device
>> *dev)
>> * Map the device to the powerdomain. Return the powerdomain
>> * off counter.
>> */
>> + pdev = to_platform_device(dev);
>> + odev = omapdev_find_pdev(pdev);
>>
>> + if (odev) {
>> + pwrdm = omapdev_get_pwrdm(odev);
>> + if (pwrdm)
>> + return pwrdm->state_counter[0];
>
> The state_counter is unsigned and the return type of this fn does not match.
Paul, any thoughts on this?
Kevin
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-07-15 15:00 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-07-08 18:34 [PATCH] OMAP3: PM: move context-loss counting into OMAP PM Kevin Hilman
2009-07-14 19:20 ` Madhusudhan
2009-07-14 21:46 ` Kevin Hilman
2009-07-15 15:00 ` Kevin Hilman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox