[PATCH 05/21] Revert OMAP3+: PM: SR: add suspend/resume handlers
From: Nishanth Menon n...@ti.com
This reverts commit b6be18f0bab68ed304ebbb2d787d1c36237eda62.
Revert the patch so that we remove any opportunity of SR disable/enable
and any device_scale transitions from conflicting with suspend/resume
path by moving the sr enable/disable activity to the very last
stage(in pmxx.C). The previous patch tried to optimize suspend resume
time, but since device_scale opportunities are from multiple drivers
(other than cpufreq), hence reverting back to original approach
Conflicts:
arch/arm/mach-omap2/smartreflex.c
Change-Id: I236b0e8259cfb371899dd0c93875739a21358e33
Signed-off-by: Nishanth Menon n...@ti.com
Signed-off-by: Jean Pihet j-pi...@ti.com
---
arch/arm/mach-omap2/smartreflex.c | 90 -
1 files changed, 0 insertions(+), 90 deletions(-)
diff --git a/arch/arm/mach-omap2/smartreflex.c
b/arch/arm/mach-omap2/smartreflex.c
index 95fd228..7e755bb 100644
--- a/arch/arm/mach-omap2/smartreflex.c
+++ b/arch/arm/mach-omap2/smartreflex.c
@@ -24,7 +24,6 @@
#include linux/debugfs.h
#include linux/delay.h
#include linux/slab.h
-#include linux/pm.h
#include linux/pm_runtime.h
#include common.h
@@ -41,7 +40,6 @@ struct omap_sr {
int ip_type;
int nvalue_count;
boolautocomp_active;
- boolis_suspended;
u32 clk_length;
u32 err_weight;
u32 err_minlimit;
@@ -687,11 +685,6 @@ void omap_sr_enable(struct voltagedomain *voltdm)
if (!sr-autocomp_active)
return;
- if (sr-is_suspended) {
- dev_dbg(sr-pdev-dev, %s: in suspended state\n, __func__);
- return;
- }
-
if (!sr_class || !(sr_class-enable) || !(sr_class-configure)) {
dev_warn(sr-pdev-dev, %s: smartreflex class driver not
registered\n, __func__);
@@ -725,11 +718,6 @@ void omap_sr_disable(struct voltagedomain *voltdm)
if (!sr-autocomp_active)
return;
- if (sr-is_suspended) {
- dev_dbg(sr-pdev-dev, %s: in suspended state\n, __func__);
- return;
- }
-
if (!sr_class || !(sr_class-disable)) {
dev_warn(sr-pdev-dev, %s: smartreflex class driver not
registered\n, __func__);
@@ -763,11 +751,6 @@ void omap_sr_disable_reset_volt(struct voltagedomain
*voltdm)
if (!sr-autocomp_active)
return;
- if (sr-is_suspended) {
- dev_dbg(sr-pdev-dev, %s: in suspended state\n, __func__);
- return;
- }
-
if (!sr_class || !(sr_class-disable)) {
dev_warn(sr-pdev-dev, %s: smartreflex class driver not
registered\n, __func__);
@@ -826,11 +809,6 @@ static int omap_sr_autocomp_store(void *data, u64 val)
return -EINVAL;
}
- if (sr_info-is_suspended) {
- pr_warning(%s: in suspended state\n, __func__);
- return -EBUSY;
- }
-
/* control enable/disable only if there is a delta in value */
if (sr_info-autocomp_active != val) {
if (!val)
@@ -1033,78 +1011,10 @@ static int __devexit omap_sr_remove(struct
platform_device *pdev)
return 0;
}
-static int omap_sr_suspend(struct device *dev)
-{
- struct omap_sr_data *pdata;
- struct omap_sr *sr_info;
-
- pdata = dev_get_platdata(dev);
- if (!pdata) {
- dev_err(dev, %s: platform data missing\n, __func__);
- return -EINVAL;
- }
-
- sr_info = _sr_lookup(pdata-voltdm);
- if (IS_ERR(sr_info)) {
- dev_warn(dev, %s: omap_sr struct not found\n, __func__);
- return -EINVAL;
- }
-
- if (!sr_info-autocomp_active)
- return 0;
-
- if (sr_info-is_suspended)
- return 0;
-
- omap_sr_disable_reset_volt(pdata-voltdm);
- sr_info-is_suspended = true;
- /* Flag the same info to the other CPUs */
- smp_wmb();
-
- return 0;
-}
-
-static int omap_sr_resume(struct device *dev)
-{
- struct omap_sr_data *pdata;
- struct omap_sr *sr_info;
-
- pdata = dev_get_platdata(dev);
- if (!pdata) {
- dev_err(dev, %s: platform data missing\n, __func__);
- return -EINVAL;
- }
-
- sr_info = _sr_lookup(pdata-voltdm);
- if (IS_ERR(sr_info)) {
- dev_warn(dev, %s: omap_sr struct not found\n, __func__);
- return -EINVAL;
- }
-
- if (!sr_info-autocomp_active)
- return 0;
-
- if (!sr_info-is_suspended)
- return 0;
-
- sr_info-is_suspended = false;
- /* Flag the same info to the other CPUs */
- smp_wmb();
-
Re: [PATCH 05/21] Revert OMAP3+: PM: SR: add suspend/resume handlers
Salut Jean,
On 1/25/2012 4:16 PM, Jean Pihet wrote:
From: Nishanth Menonn...@ti.com
This reverts commit b6be18f0bab68ed304ebbb2d787d1c36237eda62.
That weird, because you revert a patch you introduced just before:
[PATCH 03/21] OMAP3+: PM: SR: add suspend/resume handlers
Moreover this commit id is not relevant since it is probably only in
Nishanth's GIT tree.
Revert the patch so that we remove any opportunity of SR disable/enable
and any device_scale transitions from conflicting with suspend/resume
path by moving the sr enable/disable activity to the very last
stage(in pmxx.C). The previous patch tried to optimize suspend resume
time, but since device_scale opportunities are from multiple drivers
(other than cpufreq), hence reverting back to original approach
Conflicts:
arch/arm/mach-omap2/smartreflex.c
Change-Id: I236b0e8259cfb371899dd0c93875739a21358e33
And this looks like gerrit leftover that should not be there.
I guess that path #3 and #5 should just be removed.
Regards,
Benoit
Signed-off-by: Nishanth Menonn...@ti.com
Signed-off-by: Jean Pihetj-pi...@ti.com
---
arch/arm/mach-omap2/smartreflex.c | 90 -
1 files changed, 0 insertions(+), 90 deletions(-)
diff --git a/arch/arm/mach-omap2/smartreflex.c
b/arch/arm/mach-omap2/smartreflex.c
index 95fd228..7e755bb 100644
--- a/arch/arm/mach-omap2/smartreflex.c
+++ b/arch/arm/mach-omap2/smartreflex.c
@@ -24,7 +24,6 @@
#includelinux/debugfs.h
#includelinux/delay.h
#includelinux/slab.h
-#includelinux/pm.h
#includelinux/pm_runtime.h
#include common.h
@@ -41,7 +40,6 @@ struct omap_sr {
int ip_type;
int nvalue_count;
boolautocomp_active;
- boolis_suspended;
u32 clk_length;
u32 err_weight;
u32 err_minlimit;
@@ -687,11 +685,6 @@ void omap_sr_enable(struct voltagedomain *voltdm)
if (!sr-autocomp_active)
return;
- if (sr-is_suspended) {
- dev_dbg(sr-pdev-dev, %s: in suspended state\n, __func__);
- return;
- }
-
if (!sr_class || !(sr_class-enable) || !(sr_class-configure)) {
dev_warn(sr-pdev-dev, %s: smartreflex class driver not
registered\n, __func__);
@@ -725,11 +718,6 @@ void omap_sr_disable(struct voltagedomain *voltdm)
if (!sr-autocomp_active)
return;
- if (sr-is_suspended) {
- dev_dbg(sr-pdev-dev, %s: in suspended state\n, __func__);
- return;
- }
-
if (!sr_class || !(sr_class-disable)) {
dev_warn(sr-pdev-dev, %s: smartreflex class driver not
registered\n, __func__);
@@ -763,11 +751,6 @@ void omap_sr_disable_reset_volt(struct voltagedomain
*voltdm)
if (!sr-autocomp_active)
return;
- if (sr-is_suspended) {
- dev_dbg(sr-pdev-dev, %s: in suspended state\n, __func__);
- return;
- }
-
if (!sr_class || !(sr_class-disable)) {
dev_warn(sr-pdev-dev, %s: smartreflex class driver not
registered\n, __func__);
@@ -826,11 +809,6 @@ static int omap_sr_autocomp_store(void *data, u64 val)
return -EINVAL;
}
- if (sr_info-is_suspended) {
- pr_warning(%s: in suspended state\n, __func__);
- return -EBUSY;
- }
-
/* control enable/disable only if there is a delta in value */
if (sr_info-autocomp_active != val) {
if (!val)
@@ -1033,78 +1011,10 @@ static int __devexit omap_sr_remove(struct
platform_device *pdev)
return 0;
}
-static int omap_sr_suspend(struct device *dev)
-{
- struct omap_sr_data *pdata;
- struct omap_sr *sr_info;
-
- pdata = dev_get_platdata(dev);
- if (!pdata) {
- dev_err(dev, %s: platform data missing\n, __func__);
- return -EINVAL;
- }
-
- sr_info = _sr_lookup(pdata-voltdm);
- if (IS_ERR(sr_info)) {
- dev_warn(dev, %s: omap_sr struct not found\n, __func__);
- return -EINVAL;
- }
-
- if (!sr_info-autocomp_active)
- return 0;
-
- if (sr_info-is_suspended)
- return 0;
-
- omap_sr_disable_reset_volt(pdata-voltdm);
- sr_info-is_suspended = true;
- /* Flag the same info to the other CPUs */
- smp_wmb();
-
- return 0;
-}
-
-static int omap_sr_resume(struct device *dev)
-{
- struct omap_sr_data *pdata;
- struct omap_sr *sr_info;
-
- pdata = dev_get_platdata(dev);
- if (!pdata) {
- dev_err(dev, %s: platform data missing\n, __func__);
- return -EINVAL;
- }
-
- sr_info =
Re: [PATCH 05/21] Revert OMAP3+: PM: SR: add suspend/resume handlers
Hi Benoit, On Wed, Jan 25, 2012 at 6:53 PM, Cousson, Benoit b-cous...@ti.com wrote: Salut Jean, On 1/25/2012 4:16 PM, Jean Pihet wrote: From: Nishanth Menonn...@ti.com This reverts commit b6be18f0bab68ed304ebbb2d787d1c36237eda62. That weird, because you revert a patch you introduced just before: [PATCH 03/21] OMAP3+: PM: SR: add suspend/resume handlers I left the 2 commits on purpose because I think the descriptions give a good description on why the commits have been introduced and then later removed. Moreover this commit id is not relevant since it is probably only in Nishanth's GIT tree. I removed this in the next version. Revert the patch so that we remove any opportunity of SR disable/enable and any device_scale transitions from conflicting with suspend/resume path by moving the sr enable/disable activity to the very last stage(in pmxx.C). The previous patch tried to optimize suspend resume time, but since device_scale opportunities are from multiple drivers (other than cpufreq), hence reverting back to original approach Conflicts: arch/arm/mach-omap2/smartreflex.c Change-Id: I236b0e8259cfb371899dd0c93875739a21358e33 Removed as well. Sorry about that. And this looks like gerrit leftover that should not be there. I guess that path #3 and #5 should just be removed. I am ok with both options (keeping or removing the 2 commits), please let me know what you prefer. Regards, Benoit Thanks, Jean -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 05/21] Revert OMAP3+: PM: SR: add suspend/resume handlers
On 1/25/2012 7:13 PM, Jean Pihet wrote: Hi Benoit, On Wed, Jan 25, 2012 at 6:53 PM, Cousson, Benoitb-cous...@ti.com wrote: Salut Jean, On 1/25/2012 4:16 PM, Jean Pihet wrote: From: Nishanth Menonn...@ti.com This reverts commit b6be18f0bab68ed304ebbb2d787d1c36237eda62. That weird, because you revert a patch you introduced just before: [PATCH 03/21] OMAP3+: PM: SR: add suspend/resume handlers I left the 2 commits on purpose because I think the descriptions give a good description on why the commits have been introduced and then later removed. Moreover this commit id is not relevant since it is probably only in Nishanth's GIT tree. I removed this in the next version. Revert the patch so that we remove any opportunity of SR disable/enable and any device_scale transitions from conflicting with suspend/resume path by moving the sr enable/disable activity to the very last stage(in pmxx.C). The previous patch tried to optimize suspend resume time, but since device_scale opportunities are from multiple drivers (other than cpufreq), hence reverting back to original approach Conflicts: arch/arm/mach-omap2/smartreflex.c Change-Id: I236b0e8259cfb371899dd0c93875739a21358e33 Removed as well. Sorry about that. And this looks like gerrit leftover that should not be there. I guess that path #3 and #5 should just be removed. I am ok with both options (keeping or removing the 2 commits), please let me know what you prefer. I guess that removing both is the only acceptable solution anyway. That might force you to change a little bit the #4, but maybe it not even needed. Regards, Benoit -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 05/21] Revert OMAP3+: PM: SR: add suspend/resume handlers
Cousson, Benoit b-cous...@ti.com writes: On 1/25/2012 7:13 PM, Jean Pihet wrote: [...] I guess that path #3 and #5 should just be removed. I am ok with both options (keeping or removing the 2 commits), please let me know what you prefer. I guess that removing both is the only acceptable solution anyway. Yes, please remove them both. Kevin -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 05/21] Revert OMAP3+: PM: SR: add suspend/resume handlers
On Wed, Jan 25, 2012 at 12:49, Kevin Hilman khil...@ti.com wrote: Cousson, Benoit b-cous...@ti.com writes: On 1/25/2012 7:13 PM, Jean Pihet wrote: [...] I guess that path #3 and #5 should just be removed. I am ok with both options (keeping or removing the 2 commits), please let me know what you prefer. I guess that removing both is the only acceptable solution anyway. Yes, please remove them both. Also, please drop Change-IDs as well.. :) Regards, Nishanth Menon -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 05/21] Revert OMAP3+: PM: SR: add suspend/resume handlers
Hi Nishant, On Wed, Jan 25, 2012 at 10:29 PM, Menon, Nishanth n...@ti.com wrote: On Wed, Jan 25, 2012 at 12:49, Kevin Hilman khil...@ti.com wrote: Cousson, Benoit b-cous...@ti.com writes: On 1/25/2012 7:13 PM, Jean Pihet wrote: [...] I guess that path #3 and #5 should just be removed. I am ok with both options (keeping or removing the 2 commits), please let me know what you prefer. I guess that removing both is the only acceptable solution anyway. Yes, please remove them both. Also, please drop Change-IDs as well.. :) Done in the next revision! Thanks for looking! Jean Regards, Nishanth Menon -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
