Skip to contentSkip to conversation

OMAP3: PM: move context-loss counting into OMAP PM

PATCH In review Kevin Hilman 2 participants 4 messages Jul 8, 2009 – Jul 15, 2009

Subsystems (4)
Arm (32-bit) Arm sub-architectures OMAP2+ support OMAP power management support
lore
Share & tools
lore

Kevin Hilman

author
#0 lore raw

PATCH 1/1 OMAP3: PM: move context-loss counting into OMAP PM

From: Rajendra Nayak <[email protected]>

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 <[email protected]>
Signed-off-by Kevin Hilman <[email protected]>

---
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(-)
arch/arm/mach-omap2/pm.c +0 -16
index 1192e01..fec7d00 100644
@@ -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;
arch/arm/plat-omap/omap-pm-noop.c +6 -1
index 4ba261a..07b208b 100644
@@ -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++;
 }
 
 /*
arch/arm/plat-omap/omap-pm-srf.c +11 -0
index 226662d..cac08e4 100644
@@ -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;
 }
Signature · 1 line
1.6.3.3
#1 lore raw
Quoted 111 lines

-----Original Message-----
From: [email protected] [mailto:linux-omap- [email protected]] On Behalf Of Kevin Hilman
Sent: Wednesday, July 08, 2009 1:34 PM
To: [email protected]
Cc: Rajendra Nayak; Peter 'p2' De Schrijver
Subject: [PATCH] OMAP3: PM: move context-loss counting into OMAP PM

From: Rajendra Nayak <[email protected]>

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 <[email protected]>
Signed-off-by Kevin Hilman <[email protected]>

---
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(-)
arch/arm/mach-omap2/pm.c +0 -16
index 1192e01..fec7d00 100644
@@ -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;
arch/arm/plat-omap/omap- renamed from arch/arm/plat-omap/omap-pm-noop.c +0 -0

pm-noop.c
index 4ba261a..07b208b 100644

arch/arm/plat-omap/omap-pm-noop.c +6 -1
@@ -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++;
 }

/*

arch/arm/plat-omap/omap- renamed from arch/arm/plat-omap/omap-pm-srf.c +0 -0

pm-srf.c
index 226662d..cac08e4 100644

arch/arm/plat-omap/omap-pm-srf.c +4 -0
@@ -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)

arch/arm/plat-omap/omap-pm-srf.c int omap_pm_get_dev_context_loss_count(struct device · line 302

Quoted 10 lines
arch/arm/plat-omap/omap-pm-srf.c +6 -0
 	 * 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.

Quoted 11 lines
arch/arm/plat-omap/omap-pm-srf.c +1 -1
+	}
 	return 0;
 }
 
--

1.6.3.3

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

author
#2 lore raw
Quoted 115 lines · Madhusudhan
Quoted 115 lines

-----Original Message-----
From: [email protected] [mailto:linux-omap- [email protected]] On Behalf Of Kevin Hilman
Sent: Wednesday, July 08, 2009 1:34 PM
To: [email protected]
Cc: Rajendra Nayak; Peter 'p2' De Schrijver
Subject: [PATCH] OMAP3: PM: move context-loss counting into OMAP PM

From: Rajendra Nayak <[email protected]>

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 <[email protected]>
Signed-off-by Kevin Hilman <[email protected]>

---
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(-)
arch/arm/mach-omap2/pm.c +0 -16
index 1192e01..fec7d00 100644
@@ -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;
arch/arm/plat-omap/omap- renamed from arch/arm/plat-omap/omap-pm-noop.c +0 -0

pm-noop.c
index 4ba261a..07b208b 100644

arch/arm/plat-omap/omap-pm-noop.c +6 -1
@@ -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++;
 }

/*

arch/arm/plat-omap/omap- renamed from arch/arm/plat-omap/omap-pm-srf.c +0 -0

pm-srf.c
index 226662d..cac08e4 100644

arch/arm/plat-omap/omap-pm-srf.c +6 -0
@@ -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);
Quoted 5 lines

arch/arm/plat-omap/omap-pm-srf.c int omap_pm_get_dev_context_loss_count(struct device *dev) · line 301

Quoted 4 lines
arch/arm/plat-omap/omap-pm-srf.c +4 -0
+	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.

Quoted 2 lines

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

author
#3 lore raw
In reply to Madhusudhan

Paul,

Quoted 107 lines · Madhusudhan
Quoted 107 lines

From: Rajendra Nayak <[email protected]>

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 <[email protected]>
Signed-off-by Kevin Hilman <[email protected]>

---
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(-)
arch/arm/mach-omap2/pm.c +0 -16
index 1192e01..fec7d00 100644
@@ -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;
arch/arm/plat-omap/omap- renamed from arch/arm/plat-omap/omap-pm-noop.c +0 -0

pm-noop.c
index 4ba261a..07b208b 100644

arch/arm/plat-omap/omap-pm-noop.c +6 -1
@@ -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++;
 }

/*

arch/arm/plat-omap/omap- renamed from arch/arm/plat-omap/omap-pm-srf.c +0 -0

pm-srf.c
index 226662d..cac08e4 100644

arch/arm/plat-omap/omap-pm-srf.c +6 -0
@@ -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);
Quoted 6 lines

arch/arm/plat-omap/omap-pm-srf.c int omap_pm_get_dev_context_loss_count(struct device *dev) · line 301

Quoted 4 lines
arch/arm/plat-omap/omap-pm-srf.c +4 -0
+	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