diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-09-17 03:44:29 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-09-17 03:44:29 -0400 |
| commit | ca61a72ac371b5a12fafd36248b93431c6694c3c (patch) | |
| tree | efcaab34d3bffc19acc3dcf4d427d2b987e782b0 /kernel/sched | |
| parent | 2cdd5cc7032636d5f17822c6ba30ac08bfd2cb6d (diff) | |
| parent | 1c5c1b5d8efe21efa74b7a21e8c078711b984ae4 (diff) | |
Merge branch 'pm-cpufreq'
* pm-cpufreq: (36 commits)
cpufreq: Add qcs404 to cpufreq-dt-platdev blacklist
cpufreq: qcom: Add support for qcs404 on nvmem driver
cpufreq: qcom: Refactor the driver to make it easier to extend
cpufreq: qcom: Re-organise kryo cpufreq to use it for other nvmem based qcom socs
dt-bindings: opp: Add qcom-opp bindings with properties needed for CPR
dt-bindings: opp: qcom-nvmem: Support pstates provided by a power domain
Documentation: cpufreq: Update policy notifier documentation
cpufreq: Remove CPUFREQ_ADJUST and CPUFREQ_NOTIFY policy notifier events
sched/cpufreq: Align trace event behavior of fast switching
ACPI: cpufreq: Switch to QoS requests instead of cpufreq notifier
video: pxafb: Remove cpufreq policy notifier
video: sa1100fb: Remove cpufreq policy notifier
arch_topology: Use CPUFREQ_CREATE_POLICY instead of CPUFREQ_NOTIFY
cpufreq: powerpc_cbe: Switch to QoS requests for freq limits
cpufreq: powerpc: macintosh: Switch to QoS requests for freq limits
cpufreq: Print driver name if cpufreq_suspend() fails
cpufreq: mediatek: Add support for mt8183
cpufreq: mediatek: change to regulator_get_optional
cpufreq: imx-cpufreq-dt: Add i.MX8MN support
cpufreq: Use imx-cpufreq-dt for i.MX8MN's speed grading
...
Diffstat (limited to 'kernel/sched')
| -rw-r--r-- | kernel/sched/cpufreq_schedutil.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/kernel/sched/cpufreq_schedutil.c b/kernel/sched/cpufreq_schedutil.c index 867b4bb6d4be..b03ca2f73713 100644 --- a/kernel/sched/cpufreq_schedutil.c +++ b/kernel/sched/cpufreq_schedutil.c | |||
| @@ -117,6 +117,7 @@ static void sugov_fast_switch(struct sugov_policy *sg_policy, u64 time, | |||
| 117 | unsigned int next_freq) | 117 | unsigned int next_freq) |
| 118 | { | 118 | { |
| 119 | struct cpufreq_policy *policy = sg_policy->policy; | 119 | struct cpufreq_policy *policy = sg_policy->policy; |
| 120 | int cpu; | ||
| 120 | 121 | ||
| 121 | if (!sugov_update_next_freq(sg_policy, time, next_freq)) | 122 | if (!sugov_update_next_freq(sg_policy, time, next_freq)) |
| 122 | return; | 123 | return; |
| @@ -126,7 +127,11 @@ static void sugov_fast_switch(struct sugov_policy *sg_policy, u64 time, | |||
| 126 | return; | 127 | return; |
| 127 | 128 | ||
| 128 | policy->cur = next_freq; | 129 | policy->cur = next_freq; |
| 129 | trace_cpu_frequency(next_freq, smp_processor_id()); | 130 | |
| 131 | if (trace_cpu_frequency_enabled()) { | ||
| 132 | for_each_cpu(cpu, policy->cpus) | ||
| 133 | trace_cpu_frequency(next_freq, cpu); | ||
| 134 | } | ||
| 130 | } | 135 | } |
| 131 | 136 | ||
| 132 | static void sugov_deferred_update(struct sugov_policy *sg_policy, u64 time, | 137 | static void sugov_deferred_update(struct sugov_policy *sg_policy, u64 time, |