Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Lukasz Luba and committed by
MyungJoo Ham
83f8ca45 63314172

+48 -6
+41 -6
drivers/devfreq/devfreq.c
··· 316 316 "Couldn't update frequency transition information.\n"); 317 317 318 318 devfreq->previous_freq = new_freq; 319 + 320 + if (devfreq->suspend_freq) 321 + devfreq->resume_freq = cur_freq; 322 + 319 323 return err; 320 324 } 321 325 ··· 671 667 } 672 668 devfreq->max_freq = devfreq->scaling_max_freq; 673 669 670 + devfreq->suspend_freq = dev_pm_opp_get_suspend_opp_freq(dev); 671 + atomic_set(&devfreq->suspend_count, 0); 672 + 674 673 dev_set_name(&devfreq->dev, "devfreq%d", 675 674 atomic_inc_return(&devfreq_no)); 676 675 err = device_register(&devfreq->dev); ··· 874 867 */ 875 868 int devfreq_suspend_device(struct devfreq *devfreq) 876 869 { 870 + int ret; 871 + 877 872 if (!devfreq) 878 873 return -EINVAL; 879 874 880 - if (!devfreq->governor) 875 + if (atomic_inc_return(&devfreq->suspend_count) > 1) 881 876 return 0; 882 877 883 - return devfreq->governor->event_handler(devfreq, 884 - DEVFREQ_GOV_SUSPEND, NULL); 878 + if (devfreq->governor) { 879 + ret = devfreq->governor->event_handler(devfreq, 880 + DEVFREQ_GOV_SUSPEND, NULL); 881 + if (ret) 882 + return ret; 883 + } 884 + 885 + if (devfreq->suspend_freq) { 886 + ret = devfreq_set_target(devfreq, devfreq->suspend_freq, 0); 887 + if (ret) 888 + return ret; 889 + } 890 + 891 + return 0; 885 892 } 886 893 EXPORT_SYMBOL(devfreq_suspend_device); 887 894 ··· 909 888 */ 910 889 int devfreq_resume_device(struct devfreq *devfreq) 911 890 { 891 + int ret; 892 + 912 893 if (!devfreq) 913 894 return -EINVAL; 914 895 915 - if (!devfreq->governor) 896 + if (atomic_dec_return(&devfreq->suspend_count) >= 1) 916 897 return 0; 917 898 918 - return devfreq->governor->event_handler(devfreq, 919 - DEVFREQ_GOV_RESUME, NULL); 899 + if (devfreq->resume_freq) { 900 + ret = devfreq_set_target(devfreq, devfreq->resume_freq, 0); 901 + if (ret) 902 + return ret; 903 + } 904 + 905 + if (devfreq->governor) { 906 + ret = devfreq->governor->event_handler(devfreq, 907 + DEVFREQ_GOV_RESUME, NULL); 908 + if (ret) 909 + return ret; 910 + } 911 + 912 + return 0; 920 913 } 921 914 EXPORT_SYMBOL(devfreq_resume_device); 922 915
+7
include/linux/devfreq.h
··· 131 131 * @scaling_min_freq: Limit minimum frequency requested by OPP interface 132 132 * @scaling_max_freq: Limit maximum frequency requested by OPP interface 133 133 * @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. 134 137 * @total_trans: Number of devfreq transitions 135 138 * @trans_table: Statistics of devfreq transitions 136 139 * @time_in_state: Statistics of devfreq states ··· 169 166 unsigned long scaling_min_freq; 170 167 unsigned long scaling_max_freq; 171 168 bool stop_polling; 169 + 170 + unsigned long suspend_freq; 171 + unsigned long resume_freq; 172 + atomic_t suspend_count; 172 173 173 174 /* information for device frequency transition */ 174 175 unsigned int total_trans;