|
 |
61f3c8 |
diff -urN linux-3.10.0-229.el7.original/drivers/cpufreq/cpufreq-nforce2.c linux-3.10.0-229.el7/drivers/cpufreq/cpufreq-nforce2.c
|
|
|
61f3c8 |
--- linux-3.10.0-229.el7.original/drivers/cpufreq/cpufreq-nforce2.c 2015-01-29 18:15:53.000000000 -0500
|
|
|
61f3c8 |
+++ linux-3.10.0-229.el7/drivers/cpufreq/cpufreq-nforce2.c 2015-03-09 09:22:18.376023945 -0400
|
|
|
61f3c8 |
@@ -270,7 +270,7 @@
|
|
|
61f3c8 |
pr_debug("Old CPU frequency %d kHz, new %d kHz\n",
|
|
|
61f3c8 |
freqs.old, freqs.new);
|
|
|
61f3c8 |
|
|
|
61f3c8 |
- cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
|
|
|
61f3c8 |
+ cpufreq_freq_transition_begin(policy, &freqs);
|
|
|
61f3c8 |
|
|
|
61f3c8 |
/* Disable IRQs */
|
|
|
61f3c8 |
/* local_irq_save(flags); */
|
|
|
61f3c8 |
@@ -285,7 +285,7 @@
|
|
|
61f3c8 |
/* Enable IRQs */
|
|
|
61f3c8 |
/* local_irq_restore(flags); */
|
|
|
61f3c8 |
|
|
|
61f3c8 |
- cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
|
|
|
61f3c8 |
+ cpufreq_freq_transition_end(policy, &freqs, 0);
|
|
|
61f3c8 |
|
|
|
61f3c8 |
return 0;
|
|
|
61f3c8 |
}
|
|
|
61f3c8 |
Binary files linux-3.10.0-229.el7.original/drivers/cpufreq/.cpufreq-nforce2.c.swp and linux-3.10.0-229.el7/drivers/cpufreq/.cpufreq-nforce2.c.swp differ
|
|
|
61f3c8 |
diff -urN linux-3.10.0-229.el7.original/drivers/cpufreq/exynos5440-cpufreq.c linux-3.10.0-229.el7/drivers/cpufreq/exynos5440-cpufreq.c
|
|
|
61f3c8 |
--- linux-3.10.0-229.el7.original/drivers/cpufreq/exynos5440-cpufreq.c 2015-01-29 18:15:53.000000000 -0500
|
|
|
61f3c8 |
+++ linux-3.10.0-229.el7/drivers/cpufreq/exynos5440-cpufreq.c 2015-03-09 09:22:18.377023945 -0400
|
|
|
61f3c8 |
@@ -238,7 +238,7 @@
|
|
|
61f3c8 |
freqs.old = dvfs_info->cur_frequency;
|
|
|
61f3c8 |
freqs.new = freq_table[index].frequency;
|
|
|
61f3c8 |
|
|
|
61f3c8 |
- cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
|
|
|
61f3c8 |
+ cpufreq_freq_transition_begin(policy, &freqs);
|
|
|
61f3c8 |
|
|
|
61f3c8 |
/* Set the target frequency in all C0_3_PSTATE register */
|
|
|
61f3c8 |
for_each_cpu(i, policy->cpus) {
|
|
|
61f3c8 |
@@ -279,7 +279,7 @@
|
|
|
61f3c8 |
dev_crit(dvfs_info->dev, "New frequency out of range\n");
|
|
|
61f3c8 |
freqs.new = dvfs_info->cur_frequency;
|
|
|
61f3c8 |
}
|
|
|
61f3c8 |
- cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
|
|
|
61f3c8 |
+ cpufreq_freq_transition_end(policy, &freqs, 0);
|
|
|
61f3c8 |
|
|
|
61f3c8 |
cpufreq_cpu_put(policy);
|
|
|
61f3c8 |
mutex_unlock(&cpufreq_lock);
|
|
|
61f3c8 |
diff -urN linux-3.10.0-229.el7.original/drivers/cpufreq/gx-suspmod.c linux-3.10.0-229.el7/drivers/cpufreq/gx-suspmod.c
|
|
|
61f3c8 |
--- linux-3.10.0-229.el7.original/drivers/cpufreq/gx-suspmod.c 2015-01-29 18:15:53.000000000 -0500
|
|
|
61f3c8 |
+++ linux-3.10.0-229.el7/drivers/cpufreq/gx-suspmod.c 2015-03-09 09:22:18.377023945 -0400
|
|
|
61f3c8 |
@@ -265,7 +265,7 @@
|
|
|
61f3c8 |
|
|
|
61f3c8 |
freqs.new = new_khz;
|
|
|
61f3c8 |
|
|
|
61f3c8 |
- cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
|
|
|
61f3c8 |
+ cpufreq_freq_transition_begin(policy, &freqs);
|
|
|
61f3c8 |
local_irq_save(flags);
|
|
|
61f3c8 |
|
|
|
61f3c8 |
if (new_khz != stock_freq) {
|
|
|
61f3c8 |
@@ -314,7 +314,7 @@
|
|
|
61f3c8 |
|
|
|
61f3c8 |
gx_params->pci_suscfg = suscfg;
|
|
|
61f3c8 |
|
|
|
61f3c8 |
- cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
|
|
|
61f3c8 |
+ cpufreq_freq_transition_end(policy, &freqs, 0);
|
|
|
61f3c8 |
|
|
|
61f3c8 |
pr_debug("suspend modulation w/ duration of ON:%d us, OFF:%d us\n",
|
|
|
61f3c8 |
gx_params->on_duration * 32, gx_params->off_duration * 32);
|
|
|
61f3c8 |
diff -urN linux-3.10.0-229.el7.original/drivers/cpufreq/integrator-cpufreq.c linux-3.10.0-229.el7/drivers/cpufreq/integrator-cpufreq.c
|
|
|
61f3c8 |
--- linux-3.10.0-229.el7.original/drivers/cpufreq/integrator-cpufreq.c 2015-01-29 18:15:53.000000000 -0500
|
|
|
61f3c8 |
+++ linux-3.10.0-229.el7/drivers/cpufreq/integrator-cpufreq.c 2015-03-09 09:22:18.377023945 -0400
|
|
|
61f3c8 |
@@ -121,7 +121,7 @@
|
|
|
61f3c8 |
return 0;
|
|
|
61f3c8 |
}
|
|
|
61f3c8 |
|
|
|
61f3c8 |
- cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
|
|
|
61f3c8 |
+ cpufreq_freq_transition_begin(policy, &freqs);
|
|
|
61f3c8 |
|
|
|
61f3c8 |
cm_osc = __raw_readl(CM_OSC);
|
|
|
61f3c8 |
|
|
|
61f3c8 |
@@ -142,7 +142,7 @@
|
|
|
61f3c8 |
*/
|
|
|
61f3c8 |
set_cpus_allowed(current, cpus_allowed);
|
|
|
61f3c8 |
|
|
|
61f3c8 |
- cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
|
|
|
61f3c8 |
+ cpufreq_freq_transition_end(policy, &freqs, 0);
|
|
|
61f3c8 |
|
|
|
61f3c8 |
return 0;
|
|
|
61f3c8 |
}
|
|
|
61f3c8 |
diff -urN linux-3.10.0-229.el7.original/drivers/cpufreq/longhaul.c linux-3.10.0-229.el7/drivers/cpufreq/longhaul.c
|
|
|
61f3c8 |
--- linux-3.10.0-229.el7.original/drivers/cpufreq/longhaul.c 2015-01-29 18:15:53.000000000 -0500
|
|
|
61f3c8 |
+++ linux-3.10.0-229.el7/drivers/cpufreq/longhaul.c 2015-03-09 09:22:18.377023945 -0400
|
|
|
61f3c8 |
@@ -269,7 +269,7 @@
|
|
|
61f3c8 |
freqs.old = calc_speed(longhaul_get_cpu_mult());
|
|
|
61f3c8 |
freqs.new = speed;
|
|
|
61f3c8 |
|
|
|
61f3c8 |
- cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
|
|
|
61f3c8 |
+ cpufreq_freq_transition_begin(policy, &freqs);
|
|
|
61f3c8 |
|
|
|
61f3c8 |
pr_debug("Setting to FSB:%dMHz Mult:%d.%dx (%s)\n",
|
|
|
61f3c8 |
fsb, mult/10, mult%10, print_speed(speed/1000));
|
|
|
61f3c8 |
@@ -386,7 +386,7 @@
|
|
|
61f3c8 |
}
|
|
|
61f3c8 |
}
|
|
|
61f3c8 |
/* Report true CPU frequency */
|
|
|
61f3c8 |
- cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
|
|
|
61f3c8 |
+ cpufreq_freq_transition_end(policy, &freqs, 0);
|
|
|
61f3c8 |
|
|
|
61f3c8 |
if (!bm_timeout)
|
|
|
61f3c8 |
printk(KERN_INFO PFX "Warning: Timeout while waiting for "
|
|
|
61f3c8 |
diff -urN linux-3.10.0-229.el7.original/drivers/cpufreq/powernow-k6.c linux-3.10.0-229.el7/drivers/cpufreq/powernow-k6.c
|
|
|
61f3c8 |
--- linux-3.10.0-229.el7.original/drivers/cpufreq/powernow-k6.c 2015-01-29 18:15:53.000000000 -0500
|
|
|
61f3c8 |
+++ linux-3.10.0-229.el7/drivers/cpufreq/powernow-k6.c 2015-03-09 09:23:09.182024898 -0400
|
|
|
61f3c8 |
@@ -83,7 +83,7 @@
|
|
|
61f3c8 |
freqs.old = busfreq * powernow_k6_get_cpu_multiplier();
|
|
|
61f3c8 |
freqs.new = busfreq * clock_ratio[best_i].driver_data;
|
|
|
61f3c8 |
|
|
|
61f3c8 |
- cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
|
|
|
61f3c8 |
+ cpufreq_freq_transition_begin(policy, &freqs);
|
|
|
61f3c8 |
|
|
|
61f3c8 |
/* we now need to transform best_i to the BVC format, see AMD#23446 */
|
|
|
61f3c8 |
|
|
|
61f3c8 |
@@ -98,7 +98,7 @@
|
|
|
61f3c8 |
msrval = POWERNOW_IOPORT + 0x0;
|
|
|
61f3c8 |
wrmsr(MSR_K6_EPMR, msrval, 0); /* disable it again */
|
|
|
61f3c8 |
|
|
|
61f3c8 |
- cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
|
|
|
61f3c8 |
+ cpufreq_freq_transition_end(policy, &freqs, 0);
|
|
|
61f3c8 |
|
|
|
61f3c8 |
return;
|
|
|
61f3c8 |
}
|
|
|
61f3c8 |
diff -urN linux-3.10.0-229.el7.original/drivers/cpufreq/powernow-k7.c linux-3.10.0-229.el7/drivers/cpufreq/powernow-k7.c
|
|
|
61f3c8 |
--- linux-3.10.0-229.el7.original/drivers/cpufreq/powernow-k7.c 2015-01-29 18:15:53.000000000 -0500
|
|
|
61f3c8 |
+++ linux-3.10.0-229.el7/drivers/cpufreq/powernow-k7.c 2015-03-09 09:23:52.126025704 -0400
|
|
|
61f3c8 |
@@ -269,7 +269,7 @@
|
|
|
61f3c8 |
|
|
|
61f3c8 |
freqs.new = powernow_table[index].frequency;
|
|
|
61f3c8 |
|
|
|
61f3c8 |
- cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
|
|
|
61f3c8 |
+ cpufreq_freq_transition_begin(policy, &freqs);
|
|
|
61f3c8 |
|
|
|
61f3c8 |
/* Now do the magic poking into the MSRs. */
|
|
|
61f3c8 |
|
|
|
61f3c8 |
@@ -290,7 +290,7 @@
|
|
|
61f3c8 |
if (have_a0 == 1)
|
|
|
61f3c8 |
local_irq_enable();
|
|
|
61f3c8 |
|
|
|
61f3c8 |
- cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
|
|
|
61f3c8 |
+ cpufreq_freq_transition_end(policy, &freqs, 0);
|
|
|
61f3c8 |
}
|
|
|
61f3c8 |
|
|
|
61f3c8 |
|
|
|
61f3c8 |
diff -urN linux-3.10.0-229.el7.original/drivers/cpufreq/sh-cpufreq.c linux-3.10.0-229.el7/drivers/cpufreq/sh-cpufreq.c
|
|
|
61f3c8 |
--- linux-3.10.0-229.el7.original/drivers/cpufreq/sh-cpufreq.c 2015-01-29 18:15:53.000000000 -0500
|
|
|
61f3c8 |
+++ linux-3.10.0-229.el7/drivers/cpufreq/sh-cpufreq.c 2015-03-09 09:22:18.378023945 -0400
|
|
|
61f3c8 |
@@ -68,10 +68,10 @@
|
|
|
61f3c8 |
freqs.new = (freq + 500) / 1000;
|
|
|
61f3c8 |
freqs.flags = 0;
|
|
|
61f3c8 |
|
|
|
61f3c8 |
- cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
|
|
|
61f3c8 |
+ cpufreq_freq_transition_begin(policy, &freqs);
|
|
|
61f3c8 |
set_cpus_allowed_ptr(current, &cpus_allowed);
|
|
|
61f3c8 |
clk_set_rate(cpuclk, freq);
|
|
|
61f3c8 |
- cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
|
|
|
61f3c8 |
+ cpufreq_freq_transition_end(policy, &freqs, 0);
|
|
|
61f3c8 |
|
|
|
61f3c8 |
dev_dbg(dev, "set frequency %lu Hz\n", freq);
|
|
|
61f3c8 |
|
|
|
61f3c8 |
diff -urN linux-3.10.0-229.el7.original/drivers/cpufreq/speedstep-centrino.c linux-3.10.0-229.el7/drivers/cpufreq/speedstep-centrino.c
|
|
|
61f3c8 |
--- linux-3.10.0-229.el7.original/drivers/cpufreq/speedstep-centrino.c 2015-01-29 18:15:53.000000000 -0500
|
|
|
61f3c8 |
+++ linux-3.10.0-229.el7/drivers/cpufreq/speedstep-centrino.c 2015-03-09 09:58:30.112064688 -0400
|
|
|
61f3c8 |
@@ -345,7 +345,6 @@
|
|
|
61f3c8 |
struct cpuinfo_x86 *cpu = &cpu_data(policy->cpu);
|
|
|
61f3c8 |
unsigned freq;
|
|
|
61f3c8 |
unsigned l, h;
|
|
|
61f3c8 |
- int ret;
|
|
|
61f3c8 |
int i;
|
|
|
61f3c8 |
|
|
|
61f3c8 |
/* Only Intel makes Enhanced Speedstep-capable CPUs */
|
|
|
61f3c8 |
@@ -402,15 +401,8 @@
|
|
|
61f3c8 |
|
|
|
61f3c8 |
pr_debug("centrino_cpu_init: cur=%dkHz\n", policy->cur);
|
|
|
61f3c8 |
|
|
|
61f3c8 |
- ret = cpufreq_frequency_table_cpuinfo(policy,
|
|
|
61f3c8 |
+ return cpufreq_table_validate_and_show(policy,
|
|
|
61f3c8 |
per_cpu(centrino_model, policy->cpu)->op_points);
|
|
|
61f3c8 |
- if (ret)
|
|
|
61f3c8 |
- return (ret);
|
|
|
61f3c8 |
-
|
|
|
61f3c8 |
- cpufreq_frequency_table_get_attr(
|
|
|
61f3c8 |
- per_cpu(centrino_model, policy->cpu)->op_points, policy->cpu);
|
|
|
61f3c8 |
-
|
|
|
61f3c8 |
- return 0;
|
|
|
61f3c8 |
}
|
|
|
61f3c8 |
|
|
|
61f3c8 |
static int centrino_cpu_exit(struct cpufreq_policy *policy)
|
|
|
61f3c8 |
@@ -428,19 +420,6 @@
|
|
|
61f3c8 |
}
|
|
|
61f3c8 |
|
|
|
61f3c8 |
/**
|
|
|
61f3c8 |
- * centrino_verify - verifies a new CPUFreq policy
|
|
|
61f3c8 |
- * @policy: new policy
|
|
|
61f3c8 |
- *
|
|
|
61f3c8 |
- * Limit must be within this model's frequency range at least one
|
|
|
61f3c8 |
- * border included.
|
|
|
61f3c8 |
- */
|
|
|
61f3c8 |
-static int centrino_verify (struct cpufreq_policy *policy)
|
|
|
61f3c8 |
-{
|
|
|
61f3c8 |
- return cpufreq_frequency_table_verify(policy,
|
|
|
61f3c8 |
- per_cpu(centrino_model, policy->cpu)->op_points);
|
|
|
61f3c8 |
-}
|
|
|
61f3c8 |
-
|
|
|
61f3c8 |
-/**
|
|
|
61f3c8 |
* centrino_setpolicy - set a new CPUFreq policy
|
|
|
61f3c8 |
* @policy: new policy
|
|
|
61f3c8 |
* @target_freq: the target frequency
|
|
|
61f3c8 |
@@ -561,20 +540,15 @@
|
|
|
61f3c8 |
return retval;
|
|
|
61f3c8 |
}
|
|
|
61f3c8 |
|
|
|
61f3c8 |
-static struct freq_attr* centrino_attr[] = {
|
|
|
61f3c8 |
- &cpufreq_freq_attr_scaling_available_freqs,
|
|
|
61f3c8 |
- NULL,
|
|
|
61f3c8 |
-};
|
|
|
61f3c8 |
-
|
|
|
61f3c8 |
static struct cpufreq_driver centrino_driver = {
|
|
|
61f3c8 |
.name = "centrino", /* should be speedstep-centrino,
|
|
|
61f3c8 |
but there's a 16 char limit */
|
|
|
61f3c8 |
.init = centrino_cpu_init,
|
|
|
61f3c8 |
.exit = centrino_cpu_exit,
|
|
|
61f3c8 |
- .verify = centrino_verify,
|
|
|
61f3c8 |
+ .verify = cpufreq_generic_frequency_table_verify,
|
|
|
61f3c8 |
.target = centrino_target,
|
|
|
61f3c8 |
.get = get_cur_freq,
|
|
|
61f3c8 |
- .attr = centrino_attr,
|
|
|
61f3c8 |
+ .attr = cpufreq_generic_attr,
|
|
|
61f3c8 |
};
|
|
|
61f3c8 |
|
|
|
61f3c8 |
/*
|
|
|
61f3c8 |
diff -urN linux-3.10.0-229.el7.original/drivers/cpufreq/speedstep-ich.c linux-3.10.0-229.el7/drivers/cpufreq/speedstep-ich.c
|
|
|
61f3c8 |
--- linux-3.10.0-229.el7.original/drivers/cpufreq/speedstep-ich.c 2015-01-29 18:15:53.000000000 -0500
|
|
|
61f3c8 |
+++ linux-3.10.0-229.el7/drivers/cpufreq/speedstep-ich.c 2015-03-09 09:58:30.113064688 -0400
|
|
|
61f3c8 |
@@ -289,18 +289,6 @@
|
|
|
61f3c8 |
}
|
|
|
61f3c8 |
|
|
|
61f3c8 |
|
|
|
61f3c8 |
-/**
|
|
|
61f3c8 |
- * speedstep_verify - verifies a new CPUFreq policy
|
|
|
61f3c8 |
- * @policy: new policy
|
|
|
61f3c8 |
- *
|
|
|
61f3c8 |
- * Limit must be within speedstep_low_freq and speedstep_high_freq, with
|
|
|
61f3c8 |
- * at least one border included.
|
|
|
61f3c8 |
- */
|
|
|
61f3c8 |
-static int speedstep_verify(struct cpufreq_policy *policy)
|
|
|
61f3c8 |
-{
|
|
|
61f3c8 |
- return cpufreq_frequency_table_verify(policy, &speedstep_freqs[0]);
|
|
|
61f3c8 |
-}
|
|
|
61f3c8 |
-
|
|
|
61f3c8 |
struct get_freqs {
|
|
|
61f3c8 |
struct cpufreq_policy *policy;
|
|
|
61f3c8 |
int ret;
|
|
|
61f3c8 |
@@ -320,7 +308,6 @@
|
|
|
61f3c8 |
|
|
|
61f3c8 |
static int speedstep_cpu_init(struct cpufreq_policy *policy)
|
|
|
61f3c8 |
{
|
|
|
61f3c8 |
- int result;
|
|
|
61f3c8 |
unsigned int policy_cpu, speed;
|
|
|
61f3c8 |
struct get_freqs gf;
|
|
|
61f3c8 |
|
|
|
61f3c8 |
@@ -349,36 +336,18 @@
|
|
|
61f3c8 |
/* cpuinfo and default policy values */
|
|
|
61f3c8 |
policy->cur = speed;
|
|
|
61f3c8 |
|
|
|
61f3c8 |
- result = cpufreq_frequency_table_cpuinfo(policy, speedstep_freqs);
|
|
|
61f3c8 |
- if (result)
|
|
|
61f3c8 |
- return result;
|
|
|
61f3c8 |
-
|
|
|
61f3c8 |
- cpufreq_frequency_table_get_attr(speedstep_freqs, policy->cpu);
|
|
|
61f3c8 |
-
|
|
|
61f3c8 |
- return 0;
|
|
|
61f3c8 |
+ return cpufreq_table_validate_and_show(policy, speedstep_freqs);
|
|
|
61f3c8 |
}
|
|
|
61f3c8 |
|
|
|
61f3c8 |
|
|
|
61f3c8 |
-static int speedstep_cpu_exit(struct cpufreq_policy *policy)
|
|
|
61f3c8 |
-{
|
|
|
61f3c8 |
- cpufreq_frequency_table_put_attr(policy->cpu);
|
|
|
61f3c8 |
- return 0;
|
|
|
61f3c8 |
-}
|
|
|
61f3c8 |
-
|
|
|
61f3c8 |
-static struct freq_attr *speedstep_attr[] = {
|
|
|
61f3c8 |
- &cpufreq_freq_attr_scaling_available_freqs,
|
|
|
61f3c8 |
- NULL,
|
|
|
61f3c8 |
-};
|
|
|
61f3c8 |
-
|
|
|
61f3c8 |
-
|
|
|
61f3c8 |
static struct cpufreq_driver speedstep_driver = {
|
|
|
61f3c8 |
.name = "speedstep-ich",
|
|
|
61f3c8 |
- .verify = speedstep_verify,
|
|
|
61f3c8 |
+ .verify = cpufreq_generic_frequency_table_verify,
|
|
|
61f3c8 |
.target = speedstep_target,
|
|
|
61f3c8 |
.init = speedstep_cpu_init,
|
|
|
61f3c8 |
- .exit = speedstep_cpu_exit,
|
|
|
61f3c8 |
+ .exit = cpufreq_generic_exit,
|
|
|
61f3c8 |
.get = speedstep_get,
|
|
|
61f3c8 |
- .attr = speedstep_attr,
|
|
|
61f3c8 |
+ .attr = cpufreq_generic_attr,
|
|
|
61f3c8 |
};
|
|
|
61f3c8 |
|
|
|
61f3c8 |
static const struct x86_cpu_id ss_smi_ids[] = {
|
|
|
61f3c8 |
diff -urN linux-3.10.0-229.el7.original/drivers/cpufreq/speedstep-smi.c linux-3.10.0-229.el7/drivers/cpufreq/speedstep-smi.c
|
|
|
61f3c8 |
--- linux-3.10.0-229.el7.original/drivers/cpufreq/speedstep-smi.c 2015-01-29 18:15:53.000000000 -0500
|
|
|
61f3c8 |
+++ linux-3.10.0-229.el7/drivers/cpufreq/speedstep-smi.c 2015-03-09 09:58:30.113064688 -0400
|
|
|
61f3c8 |
@@ -264,19 +264,6 @@
|
|
|
61f3c8 |
}
|
|
|
61f3c8 |
|
|
|
61f3c8 |
|
|
|
61f3c8 |
-/**
|
|
|
61f3c8 |
- * speedstep_verify - verifies a new CPUFreq policy
|
|
|
61f3c8 |
- * @policy: new policy
|
|
|
61f3c8 |
- *
|
|
|
61f3c8 |
- * Limit must be within speedstep_low_freq and speedstep_high_freq, with
|
|
|
61f3c8 |
- * at least one border included.
|
|
|
61f3c8 |
- */
|
|
|
61f3c8 |
-static int speedstep_verify(struct cpufreq_policy *policy)
|
|
|
61f3c8 |
-{
|
|
|
61f3c8 |
- return cpufreq_frequency_table_verify(policy, &speedstep_freqs[0]);
|
|
|
61f3c8 |
-}
|
|
|
61f3c8 |
-
|
|
|
61f3c8 |
-
|
|
|
61f3c8 |
static int speedstep_cpu_init(struct cpufreq_policy *policy)
|
|
|
61f3c8 |
{
|
|
|
61f3c8 |
int result;
|
|
|
61f3c8 |
@@ -329,19 +316,7 @@
|
|
|
61f3c8 |
policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
|
|
|
61f3c8 |
policy->cur = speed;
|
|
|
61f3c8 |
|
|
|
61f3c8 |
- result = cpufreq_frequency_table_cpuinfo(policy, speedstep_freqs);
|
|
|
61f3c8 |
- if (result)
|
|
|
61f3c8 |
- return result;
|
|
|
61f3c8 |
-
|
|
|
61f3c8 |
- cpufreq_frequency_table_get_attr(speedstep_freqs, policy->cpu);
|
|
|
61f3c8 |
-
|
|
|
61f3c8 |
- return 0;
|
|
|
61f3c8 |
-}
|
|
|
61f3c8 |
-
|
|
|
61f3c8 |
-static int speedstep_cpu_exit(struct cpufreq_policy *policy)
|
|
|
61f3c8 |
-{
|
|
|
61f3c8 |
- cpufreq_frequency_table_put_attr(policy->cpu);
|
|
|
61f3c8 |
- return 0;
|
|
|
61f3c8 |
+ return cpufreq_table_validate_and_show(policy, speedstep_freqs);
|
|
|
61f3c8 |
}
|
|
|
61f3c8 |
|
|
|
61f3c8 |
static unsigned int speedstep_get(unsigned int cpu)
|
|
|
61f3c8 |
@@ -362,20 +337,15 @@
|
|
|
61f3c8 |
return result;
|
|
|
61f3c8 |
}
|
|
|
61f3c8 |
|
|
|
61f3c8 |
-static struct freq_attr *speedstep_attr[] = {
|
|
|
61f3c8 |
- &cpufreq_freq_attr_scaling_available_freqs,
|
|
|
61f3c8 |
- NULL,
|
|
|
61f3c8 |
-};
|
|
|
61f3c8 |
-
|
|
|
61f3c8 |
static struct cpufreq_driver speedstep_driver = {
|
|
|
61f3c8 |
.name = "speedstep-smi",
|
|
|
61f3c8 |
- .verify = speedstep_verify,
|
|
|
61f3c8 |
+ .verify = cpufreq_generic_frequency_table_verify,
|
|
|
61f3c8 |
.target = speedstep_target,
|
|
|
61f3c8 |
.init = speedstep_cpu_init,
|
|
|
61f3c8 |
- .exit = speedstep_cpu_exit,
|
|
|
61f3c8 |
+ .exit = cpufreq_generic_exit,
|
|
|
61f3c8 |
.get = speedstep_get,
|
|
|
61f3c8 |
.resume = speedstep_resume,
|
|
|
61f3c8 |
- .attr = speedstep_attr,
|
|
|
61f3c8 |
+ .attr = cpufreq_generic_attr,
|
|
|
61f3c8 |
};
|
|
|
61f3c8 |
|
|
|
61f3c8 |
static const struct x86_cpu_id ss_smi_ids[] = {
|
|
|
61f3c8 |
diff -urN linux-3.10.0-229.el7.original/drivers/cpufreq/unicore2-cpufreq.c linux-3.10.0-229.el7/drivers/cpufreq/unicore2-cpufreq.c
|
|
|
61f3c8 |
--- linux-3.10.0-229.el7.original/drivers/cpufreq/unicore2-cpufreq.c 2015-01-29 18:15:53.000000000 -0500
|
|
|
61f3c8 |
+++ linux-3.10.0-229.el7/drivers/cpufreq/unicore2-cpufreq.c 2015-03-09 09:24:33.053026472 -0400
|
|
|
61f3c8 |
@@ -50,14 +50,14 @@
|
|
|
61f3c8 |
struct cpufreq_freqs freqs;
|
|
|
61f3c8 |
struct clk *mclk = clk_get(NULL, "MAIN_CLK");
|
|
|
61f3c8 |
|
|
|
61f3c8 |
- cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
|
|
|
61f3c8 |
+ cpufreq_freq_transition_begin(policy, &freqs);
|
|
|
61f3c8 |
|
|
|
61f3c8 |
if (!clk_set_rate(mclk, target_freq * 1000)) {
|
|
|
61f3c8 |
freqs.old = cur;
|
|
|
61f3c8 |
freqs.new = target_freq;
|
|
|
61f3c8 |
}
|
|
|
61f3c8 |
|
|
|
61f3c8 |
- cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
|
|
|
61f3c8 |
+ cpufreq_freq_transition_end(policy, &freqs, ret);
|
|
|
61f3c8 |
|
|
|
61f3c8 |
return 0;
|
|
|
61f3c8 |
}
|