PM / devfreq: Restart previous governor if new governor fails to start
PATCH v5 1/1 PM / devfreq: Restart previous governor if new governor fails to start
From: Saravana Kannan <[email protected]>
If the new governor fails to start, switch back to old governor so that the devfreq state is not left in some weird limbo.
---
V5:
* assume fatal on revert failure and set df->governor to NULL
V4:
* Removed prev_governor check.
V3:
* Fix NULL deref for real this time.
* Addressed some style preferences.
V2:
* Fixed typo in commit text
* Fixed potential NULL deref
drivers/devfreq/devfreq.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
drivers/devfreq/devfreq.c +14 -2
@@ -1124,7 +1124,7 @@ static ssize_t governor_store(struct device *dev, struct device_attribute *attr,struct devfreq *df =to_devfreq (dev);int ret;char str_governor[DEVFREQ_NAME_LEN +1 ]; -struct devfreq_governor *governor; +const struct devfreq_governor *governor, *prev_governor; ret = sscanf(buf, "%" __stringify(DEVFREQ_NAME_LEN) "s", str_governor);if (ret !=1 )
@@ -1153,12 +1153,24 @@ static ssize_t governor_store(struct device *dev, struct device_attribute *attr, goto out; } } + prev_governor = df->governor; df->governor = governor;strncpy (df->governor_name, governor->name,DEVFREQ_NAME_LEN ); ret = df->governor->event_handler (df,DEVFREQ_GOV_START ,NULL ); -if (ret) +if (ret) {dev_warn (dev,"%s: Governor %s not started(%d)\n" , __func__, df->governor->name, ret); + df->governor = prev_governor; +strncpy (df->governor_name, prev_governor->name, +DEVFREQ_NAME_LEN ); + ret = df->governor->event_handler (df,DEVFREQ_GOV_START ,NULL ); +if (ret) { +dev_warn (dev, +"%s: reverting to Governor %s failed (%d)\n" , + __func__, df->governor_name, ret); + df->governor =NULL ; + } + } out:mutex_unlock (&devfreq_list_lock);
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Quoted 9 lines
From: Saravana Kannan <[email protected]>
If the new governor fails to start, switch back to old governor so that the devfreq state is not left in some weird limbo.
[Mjungjoo: assume fatal on revert failure and set df->governor to NULL]Signed-off-by Sibi Sankar <[email protected]>Signed-off-by Saravana Kannan <[email protected]>Reviewed-by Chanwoo Choi <[email protected]>
I'll modify WARN->ERROR for the case when it's fatal:
drivers/devfreq/devfreq.c static ssize_t governor_store(struct device *dev, struct device_attribute *attr, · line 1172
Quoted 6 lines
drivers/devfreq/devfreq.c +6
-0+if (ret) { +dev_warn (dev, +"%s: reverting to Governor %s failed (%d)\n" , + __func__, df->governor_name, ret); + df->governor =NULL ; + }
Quoted 18 lines
---
V5:
* assume fatal on revert failure and setdf->governorto NULLV4:
* Removedprev_governorcheck.V3:
* Fix NULL deref for real this time.
* Addressed some style preferences.V2:
* Fixed typo in commit text
* Fixed potential NULL deref
drivers/devfreq/devfreq.c| 16 ++++++++++++++--1 file changed, 14 insertions(+), 2 deletions(-)
Quoted 11 lines · MyungJoo Ham
Quoted 9 lines
From: Saravana Kannan <[email protected]>
If the new governor fails to start, switch back to old governor so that the devfreq state is not left in some weird limbo.
[Mjungjoo: assume fatal on revert failure and set df->governor to NULL]Signed-off-by Sibi Sankar <[email protected]>Signed-off-by Saravana Kannan <[email protected]>Reviewed-by Chanwoo Choi <[email protected]>I'll modify
WARN->ERRORfor the case when it's fatal:
Sure, thanks.
Quoted 29 lines
drivers/devfreq/devfreq.c static ssize_t governor_store(struct device *dev, struct device_attribute *attr, · line 1172
Quoted 7 lines
drivers/devfreq/devfreq.c +6
-0+if (ret) { +dev_warn (dev, +"%s: reverting to Governor %s failed (%d)\n" , + __func__, df->governor_name, ret); + df->governor =NULL ; + }Acked-by MyungJoo Ham <[email protected]>Quoted 18 lines
---
V5:
* assume fatal on revert failure and setdf->governorto NULLV4:
* Removedprev_governorcheck.V3:
* Fix NULL deref for real this time.
* Addressed some style preferences.V2:
* Fixed typo in commit text
* Fixed potential NULL deref
drivers/devfreq/devfreq.c| 16 ++++++++++++++--1 file changed, 14 insertions(+), 2 deletions(-)
Signature · 3 lines
-- Sibi Sankar -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.