Skip to content

Commit 2c3b046

Browse files
rafaeljwrafaeljw
committed
Pull devfreq framework changes for v4.21 from MyungJoo Ham: "This includes the suspend-frequency support for devfreq, which is similar with suspend_freq in cpufreq." * 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq: PM / devfreq: add devfreq_suspend/resume() functions PM / devfreq: add support for suspend/resume of a devfreq device PM / devfreq: refactor set_target frequency function
2 parents 40e020c + 5903195 commit 2c3b046

File tree

2 files changed

+134
-32
lines changed

2 files changed

+134
-32
lines changed

‎drivers/devfreq/devfreq.c

Lines changed: 121 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,44 @@ static int devfreq_notify_transition(struct devfreq *devfreq,
285285
return 0;
286286
}
287287

288+
static int devfreq_set_target(struct devfreq *devfreq, unsigned long new_freq,
289+
u32 flags)
290+
{
291+
struct devfreq_freqs freqs;
292+
unsigned long cur_freq;
293+
int err = 0;
294+
295+
if (devfreq->profile->get_cur_freq)
296+
devfreq->profile->get_cur_freq(devfreq->dev.parent, &cur_freq);
297+
else
298+
cur_freq = devfreq->previous_freq;
299+
300+
freqs.old = cur_freq;
301+
freqs.new = new_freq;
302+
devfreq_notify_transition(devfreq, &freqs, DEVFREQ_PRECHANGE);
303+
304+
err = devfreq->profile->target(devfreq->dev.parent, &new_freq, flags);
305+
if (err) {
306+
freqs.new = cur_freq;
307+
devfreq_notify_transition(devfreq, &freqs, DEVFREQ_POSTCHANGE);
308+
return err;
309+
}
310+
311+
freqs.new = new_freq;
312+
devfreq_notify_transition(devfreq, &freqs, DEVFREQ_POSTCHANGE);
313+
314+
if (devfreq_update_status(devfreq, new_freq))
315+
dev_err(&devfreq->dev,
316+
"Couldn't update frequency transition information.\n");
317+
318+
devfreq->previous_freq = new_freq;
319+
320+
if (devfreq->suspend_freq)
321+
devfreq->resume_freq = cur_freq;
322+
323+
return err;
324+
}
325+
288326
/* Load monitoring helper functions for governors use */
289327

290328
/**
@@ -296,8 +334,7 @@ static int devfreq_notify_transition(struct devfreq *devfreq,
296334
*/
297335
int update_devfreq(struct devfreq *devfreq)
298336
{
299-
struct devfreq_freqs freqs;
300-
unsigned long freq, cur_freq, min_freq, max_freq;
337+
unsigned long freq, min_freq, max_freq;
301338
int err = 0;
302339
u32 flags = 0;
303340

@@ -333,31 +370,8 @@ int update_devfreq(struct devfreq *devfreq)
333370
flags |= DEVFREQ_FLAG_LEAST_UPPER_BOUND; /* Use LUB */
334371
}
335372

336-
if (devfreq->profile->get_cur_freq)
337-
devfreq->profile->get_cur_freq(devfreq->dev.parent, &cur_freq);
338-
else
339-
cur_freq = devfreq->previous_freq;
373+
return devfreq_set_target(devfreq, freq, flags);
340374

341-
freqs.old = cur_freq;
342-
freqs.new = freq;
343-
devfreq_notify_transition(devfreq, &freqs, DEVFREQ_PRECHANGE);
344-
345-
err = devfreq->profile->target(devfreq->dev.parent, &freq, flags);
346-
if (err) {
347-
freqs.new = cur_freq;
348-
devfreq_notify_transition(devfreq, &freqs, DEVFREQ_POSTCHANGE);
349-
return err;
350-
}
351-
352-
freqs.new = freq;
353-
devfreq_notify_transition(devfreq, &freqs, DEVFREQ_POSTCHANGE);
354-
355-
if (devfreq_update_status(devfreq, freq))
356-
dev_err(&devfreq->dev,
357-
"Couldn't update frequency transition information.\n");
358-
359-
devfreq->previous_freq = freq;
360-
return err;
361375
}
362376
EXPORT_SYMBOL(update_devfreq);
363377

@@ -657,6 +671,9 @@ struct devfreq *devfreq_add_device(struct device *dev,
657671
}
658672
devfreq->max_freq = devfreq->scaling_max_freq;
659673

674+
devfreq->suspend_freq = dev_pm_opp_get_suspend_opp_freq(dev);
675+
atomic_set(&devfreq->suspend_count, 0);
676+
660677
dev_set_name(&devfreq->dev, "devfreq%d",
661678
atomic_inc_return(&devfreq_no));
662679
err = device_register(&devfreq->dev);
@@ -857,14 +874,28 @@ EXPORT_SYMBOL(devm_devfreq_remove_device);
857874
*/
858875
int devfreq_suspend_device(struct devfreq *devfreq)
859876
{
877+
int ret;
878+
860879
if (!devfreq)
861880
return -EINVAL;
862881

863-
if (!devfreq->governor)
882+
if (atomic_inc_return(&devfreq->suspend_count) > 1)
864883
return 0;
865884

866-
return devfreq->governor->event_handler(devfreq,
867-
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;
868899
}
869900
EXPORT_SYMBOL(devfreq_suspend_device);
870901

@@ -878,17 +909,75 @@ EXPORT_SYMBOL(devfreq_suspend_device);
878909
*/
879910
int devfreq_resume_device(struct devfreq *devfreq)
880911
{
912+
int ret;
913+
881914
if (!devfreq)
882915
return -EINVAL;
883916

884-
if (!devfreq->governor)
917+
if (atomic_dec_return(&devfreq->suspend_count) >= 1)
885918
return 0;
886919

887-
return devfreq->governor->event_handler(devfreq,
888-
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;
889934
}
890935
EXPORT_SYMBOL(devfreq_resume_device);
891936

937+
/**
938+
* devfreq_suspend() - Suspend devfreq governors and devices
939+
*
940+
* Called during system wide Suspend/Hibernate cycles for suspending governors
941+
* and devices preserving the state for resume. On some platforms the devfreq
942+
* device must have precise state (frequency) after resume in order to provide
943+
* fully operating setup.
944+
*/
945+
void devfreq_suspend(void)
946+
{
947+
struct devfreq *devfreq;
948+
int ret;
949+
950+
mutex_lock(&devfreq_list_lock);
951+
list_for_each_entry(devfreq, &devfreq_list, node) {
952+
ret = devfreq_suspend_device(devfreq);
953+
if (ret)
954+
dev_err(&devfreq->dev,
955+
"failed to suspend devfreq device\n");
956+
}
957+
mutex_unlock(&devfreq_list_lock);
958+
}
959+
960+
/**
961+
* devfreq_resume() - Resume devfreq governors and devices
962+
*
963+
* Called during system wide Suspend/Hibernate cycle for resuming governors and
964+
* devices that are suspended with devfreq_suspend().
965+
*/
966+
void devfreq_resume(void)
967+
{
968+
struct devfreq *devfreq;
969+
int ret;
970+
971+
mutex_lock(&devfreq_list_lock);
972+
list_for_each_entry(devfreq, &devfreq_list, node) {
973+
ret = devfreq_resume_device(devfreq);
974+
if (ret)
975+
dev_warn(&devfreq->dev,
976+
"failed to resume devfreq device\n");
977+
}
978+
mutex_unlock(&devfreq_list_lock);
979+
}
980+
892981
/**
893982
* devfreq_add_governor() - Add devfreq governor
894983
* @governor: the devfreq governor to be added

‎include/linux/devfreq.h

Lines changed: 13 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;
@@ -198,6 +205,9 @@ extern void devm_devfreq_remove_device(struct device *dev,
198205
extern int devfreq_suspend_device(struct devfreq *devfreq);
199206
extern int devfreq_resume_device(struct devfreq *devfreq);
200207

208+
extern void devfreq_suspend(void);
209+
extern void devfreq_resume(void);
210+
201211
/**
202212
* update_devfreq() - Reevaluate the device and configure frequency
203213
* @devfreq: the devfreq device
@@ -324,6 +334,9 @@ static inline int devfreq_resume_device(struct devfreq *devfreq)
324334
return 0;
325335
}
326336

337+
static inline void devfreq_suspend(void) {}
338+
static inline void devfreq_resume(void) {}
339+
327340
static inline struct dev_pm_opp *devfreq_recommended_opp(struct device *dev,
328341
unsigned long *freq, u32 flags)
329342
{

0 commit comments

Comments
 (0)