Skip to content

Commit 83f8ca4

Browse files
Lukasz Lubamyungjoo
authored andcommitted
PM / devfreq: add support for suspend/resume of a devfreq device
The patch prepares devfreq device for handling suspend/resume functionality. The new fields will store needed information during this process. Devfreq framework handles opp-suspend DT entry and there is no need of modyfications in the drivers code. It uses atomic variables to make sure no race condition affects the process. Suggested-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de> Suggested-by: Chanwoo Choi <cw00.choi@samsung.com> Signed-off-by: Lukasz Luba <l.luba@partner.samsung.com> Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com> Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
1 parent 6331417 commit 83f8ca4

File tree

2 files changed

+48
-6
lines changed

2 files changed

+48
-6
lines changed

drivers/devfreq/devfreq.c

Lines changed: 41 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,10 @@ static int devfreq_set_target(struct devfreq *devfreq, unsigned long new_freq,
316316
"Couldn't update frequency transition information.\n");
317317

318318
devfreq->previous_freq = new_freq;
319+
320+
if (devfreq->suspend_freq)
321+
devfreq->resume_freq = cur_freq;
322+
319323
return err;
320324
}
321325

@@ -667,6 +671,9 @@ struct devfreq *devfreq_add_device(struct device *dev,
667671
}
668672
devfreq->max_freq = devfreq->scaling_max_freq;
669673

674+
devfreq->suspend_freq = dev_pm_opp_get_suspend_opp_freq(dev);
675+
atomic_set(&devfreq->suspend_count, 0);
676+
670677
dev_set_name(&devfreq->dev, "devfreq%d",
671678
atomic_inc_return(&devfreq_no));
672679
err = device_register(&devfreq->dev);
@@ -867,14 +874,28 @@ EXPORT_SYMBOL(devm_devfreq_remove_device);
867874
*/
868875
int devfreq_suspend_device(struct devfreq *devfreq)
869876
{
877+
int ret;
878+
870879
if (!devfreq)
871880
return -EINVAL;
872881

873-
if (!devfreq->governor)
882+
if (atomic_inc_return(&devfreq->suspend_count) > 1)
874883
return 0;
875884

876-
return devfreq->governor->event_handler(devfreq,
877-
DEVFREQ_GOV_SUSPEND, NULL);
885+
if (devfreq->governor) {
886+
ret = devfreq->governor->event_handler(devfreq,
887+
DEVFREQ_GOV_SUSPEND, NULL);
888+
if (ret)
889+
return ret;
890+
}
891+
892+
if (devfreq->suspend_freq) {
893+
ret = devfreq_set_target(devfreq, devfreq->suspend_freq, 0);
894+
if (ret)
895+
return ret;
896+
}
897+
898+
return 0;
878899
}
879900
EXPORT_SYMBOL(devfreq_suspend_device);
880901

@@ -888,14 +909,28 @@ EXPORT_SYMBOL(devfreq_suspend_device);
888909
*/
889910
int devfreq_resume_device(struct devfreq *devfreq)
890911
{
912+
int ret;
913+
891914
if (!devfreq)
892915
return -EINVAL;
893916

894-
if (!devfreq->governor)
917+
if (atomic_dec_return(&devfreq->suspend_count) >= 1)
895918
return 0;
896919

897-
return devfreq->governor->event_handler(devfreq,
898-
DEVFREQ_GOV_RESUME, NULL);
920+
if (devfreq->resume_freq) {
921+
ret = devfreq_set_target(devfreq, devfreq->resume_freq, 0);
922+
if (ret)
923+
return ret;
924+
}
925+
926+
if (devfreq->governor) {
927+
ret = devfreq->governor->event_handler(devfreq,
928+
DEVFREQ_GOV_RESUME, NULL);
929+
if (ret)
930+
return ret;
931+
}
932+
933+
return 0;
899934
}
900935
EXPORT_SYMBOL(devfreq_resume_device);
901936

include/linux/devfreq.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,9 @@ struct devfreq_dev_profile {
131131
* @scaling_min_freq: Limit minimum frequency requested by OPP interface
132132
* @scaling_max_freq: Limit maximum frequency requested by OPP interface
133133
* @stop_polling: devfreq polling status of a device.
134+
* @suspend_freq: frequency of a device set during suspend phase.
135+
* @resume_freq: frequency of a device set in resume phase.
136+
* @suspend_count: suspend requests counter for a device.
134137
* @total_trans: Number of devfreq transitions
135138
* @trans_table: Statistics of devfreq transitions
136139
* @time_in_state: Statistics of devfreq states
@@ -167,6 +170,10 @@ struct devfreq {
167170
unsigned long scaling_max_freq;
168171
bool stop_polling;
169172

173+
unsigned long suspend_freq;
174+
unsigned long resume_freq;
175+
atomic_t suspend_count;
176+
170177
/* information for device frequency transition */
171178
unsigned int total_trans;
172179
unsigned int *trans_table;

0 commit comments

Comments
 (0)