- Fix for a recently introduced CPU hotplug regression in ARM KVM
from Ming Lei.
- Fixes for breakage in the at32ap, loongson2_cpufreq, and unicore32
cpufreq drivers introduced during the 3.14 cycle (-stable material)
from Chen Gang and Viresh Kumar.
- New powernv cpufreq driver from Vaidyanathan Srinivasan, with bits
from Gautham R Shenoy and Srivatsa S Bhat.
- Exynos cpufreq driver fix preventing it from being included into
multiplatform builds that aren't supported by it from Sachin Kamat.
- cpufreq cleanups related to the usage of the driver_data field in
struct cpufreq_frequency_table from Viresh Kumar.
- cpufreq ppc driver cleanup from Sachin Kamat.
- Intel BayTrail support for intel_idle and ACPI idle from Len Brown.
- Intel CPU model 54 (Atom N2000 series) support for intel_idle from
Jan Kiszka.
- intel_idle fix for Intel Ivy Town residency targets from Len Brown.
- turbostat updates (Intel Broadwell support and output cleanups)
from Len Brown.
- New cpuidle sysfs attribute for exporting C-states' target residency
information to user space from Daniel Lezcano.
- New kernel command line argument to prevent power domains enabled
by the bootloader from being turned off even if they are not in use
(for diagnostics purposes) from Tushar Behera.
- Fixes for wakeup sysfs attributes documentation from Geert Uytterhoeven.
- New ACPI video blacklist entry for ThinkPad Helix from Stephen Chandler
Paul.
- Assorted ACPI cleanups and a Kconfig help update from Jonghwan Choi,
Zhihui Zhang, Hanjun Guo.
/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
iQIcBAABCAAGBQJTRxLAAAoJEILEb/54YlRxnCwP/16UwO/eVE8SIi0TqQboikFC
k8u7F3zgDYG+xPSzXlCR+J7thTxGueQlrb+aM18PYuMVgaw2rpy7U7SIqEk8s6oR
uFnzZCWKA5ZebbZn+NlodnQaJmbgJxwsVJDuuechUka/e67CaIc54JULi2ynZ0lz
Kg/nU3NJhu4S81cT5SOTkJ9xE63oxHcCwKbNqEmxn7x7ddFzGK/DThG67NMEnW1F
vHbBTSyI6vmXXg1f9aobUtuo3PfJkkx5jD+nR1H2e6wmB64tW7JPVKV3mi6LJfYM
ui/8/gNb3PUMHMX1QbL9EFbPxl9miQx2NJ7dgFKa1HZ/WPyiXpJjz7uGr9O3Fau3
cFVREdaW8p2TAYWOEgH8luohhdK0j8UEpR/sEm0TrTjsK8wqczVf/hz6RraVJZiN
ck6eVHjY6m3/bFQauZQ/r+DNeeNcdr+iLejgjbh/MXuF3j0kx+1dkKkzCEU2TgEZ
9etF0uzjlgyXySyxNKBeSW13+ssVA6kF5/BHns7LHoxTfGu7Y4oVaWUi+j74i66O
bc+2ileNal71mS4v9gomnj6Ffj8oH8KXFA7k0sEsAdwLZNgThB5bTppmY/U7Y5Ce
hTS81tcGe2vOVQzF9iFOF7LNKKussAVAtrgkkrA8lJLeOTfQbIo4+fMhORxf3X/p
3O7R/jc4cT+IXK8a2xRt
=hGKg
-----END PGP SIGNATURE-----
Merge tag 'pm+acpi-3.15-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull more ACPI and power management fixes and updates from Rafael Wysocki:
"This is PM and ACPI material that has emerged over the last two weeks
and one fix for a CPU hotplug regression introduced by the recent CPU
hotplug notifiers registration series.
Included are intel_idle and turbostat updates from Len Brown (these
have been in linux-next for quite some time), a new cpufreq driver for
powernv (that might spend some more time in linux-next, but BenH was
asking me so nicely to push it for 3.15 that I couldn't resist), some
cpufreq fixes and cleanups (including fixes for some silly breakage in
a couple of cpufreq drivers introduced during the 3.14 cycle),
assorted ACPI cleanups, wakeup framework documentation fixes, a new
sysfs attribute for cpuidle and a new command line argument for power
domains diagnostics.
Specifics:
- Fix for a recently introduced CPU hotplug regression in ARM KVM
from Ming Lei.
- Fixes for breakage in the at32ap, loongson2_cpufreq, and unicore32
cpufreq drivers introduced during the 3.14 cycle (-stable material)
from Chen Gang and Viresh Kumar.
- New powernv cpufreq driver from Vaidyanathan Srinivasan, with bits
from Gautham R Shenoy and Srivatsa S Bhat.
- Exynos cpufreq driver fix preventing it from being included into
multiplatform builds that aren't supported by it from Sachin Kamat.
- cpufreq cleanups related to the usage of the driver_data field in
struct cpufreq_frequency_table from Viresh Kumar.
- cpufreq ppc driver cleanup from Sachin Kamat.
- Intel BayTrail support for intel_idle and ACPI idle from Len Brown.
- Intel CPU model 54 (Atom N2000 series) support for intel_idle from
Jan Kiszka.
- intel_idle fix for Intel Ivy Town residency targets from Len Brown.
- turbostat updates (Intel Broadwell support and output cleanups)
from Len Brown.
- New cpuidle sysfs attribute for exporting C-states' target
residency information to user space from Daniel Lezcano.
- New kernel command line argument to prevent power domains enabled
by the bootloader from being turned off even if they are not in use
(for diagnostics purposes) from Tushar Behera.
- Fixes for wakeup sysfs attributes documentation from Geert
Uytterhoeven.
- New ACPI video blacklist entry for ThinkPad Helix from Stephen
Chandler Paul.
- Assorted ACPI cleanups and a Kconfig help update from Jonghwan
Choi, Zhihui Zhang, Hanjun Guo"
* tag 'pm+acpi-3.15-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (28 commits)
ACPI: Update the ACPI spec information in Kconfig
arm, kvm: fix double lock on cpu_add_remove_lock
cpuidle: sysfs: Export target residency information
cpufreq: ppc: Remove duplicate inclusion of fsl_soc.h
cpufreq: create another field .flags in cpufreq_frequency_table
cpufreq: use kzalloc() to allocate memory for cpufreq_frequency_table
cpufreq: don't print value of .driver_data from core
cpufreq: ia64: don't set .driver_data to index
cpufreq: powernv: Select CPUFreq related Kconfig options for powernv
cpufreq: powernv: Use cpufreq_frequency_table.driver_data to store pstate ids
cpufreq: powernv: cpufreq driver for powernv platform
cpufreq: at32ap: don't declare local variable as static
cpufreq: loongson2_cpufreq: don't declare local variable as static
cpufreq: unicore32: fix typo issue for 'clk'
cpufreq: exynos: Disable on multiplatform build
PM / wakeup: Correct presence vs. emptiness of wakeup_* attributes
PM / domains: Add pd_ignore_unused to keep power domains enabled
ACPI / dock: Drop dock_device_ids[] table
ACPI / video: Favor native backlight interface for ThinkPad Helix
ACPI / thermal: Fix wrong variable usage in debug statement
...
tirimbino
Linus Torvalds
11 years ago
commit
eeb91e4f9d
@ -0,0 +1,341 @@ |
||||
/*
|
||||
* POWERNV cpufreq driver for the IBM POWER processors |
||||
* |
||||
* (C) Copyright IBM 2014 |
||||
* |
||||
* Author: Vaidyanathan Srinivasan <svaidy at linux.vnet.ibm.com> |
||||
* |
||||
* This program is free software; you can redistribute it and/or modify |
||||
* it under the terms of the GNU General Public License as published by |
||||
* the Free Software Foundation; either version 2, or (at your option) |
||||
* any later version. |
||||
* |
||||
* This program is distributed in the hope that it will be useful, |
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
* GNU General Public License for more details. |
||||
* |
||||
*/ |
||||
|
||||
#define pr_fmt(fmt) "powernv-cpufreq: " fmt |
||||
|
||||
#include <linux/kernel.h> |
||||
#include <linux/sysfs.h> |
||||
#include <linux/cpumask.h> |
||||
#include <linux/module.h> |
||||
#include <linux/cpufreq.h> |
||||
#include <linux/smp.h> |
||||
#include <linux/of.h> |
||||
|
||||
#include <asm/cputhreads.h> |
||||
#include <asm/reg.h> |
||||
|
||||
#define POWERNV_MAX_PSTATES 256 |
||||
|
||||
static struct cpufreq_frequency_table powernv_freqs[POWERNV_MAX_PSTATES+1]; |
||||
|
||||
/*
|
||||
* Note: The set of pstates consists of contiguous integers, the |
||||
* smallest of which is indicated by powernv_pstate_info.min, the |
||||
* largest of which is indicated by powernv_pstate_info.max. |
||||
* |
||||
* The nominal pstate is the highest non-turbo pstate in this |
||||
* platform. This is indicated by powernv_pstate_info.nominal. |
||||
*/ |
||||
static struct powernv_pstate_info { |
||||
int min; |
||||
int max; |
||||
int nominal; |
||||
int nr_pstates; |
||||
} powernv_pstate_info; |
||||
|
||||
/*
|
||||
* Initialize the freq table based on data obtained |
||||
* from the firmware passed via device-tree |
||||
*/ |
||||
static int init_powernv_pstates(void) |
||||
{ |
||||
struct device_node *power_mgt; |
||||
int i, pstate_min, pstate_max, pstate_nominal, nr_pstates = 0; |
||||
const __be32 *pstate_ids, *pstate_freqs; |
||||
u32 len_ids, len_freqs; |
||||
|
||||
power_mgt = of_find_node_by_path("/ibm,opal/power-mgt"); |
||||
if (!power_mgt) { |
||||
pr_warn("power-mgt node not found\n"); |
||||
return -ENODEV; |
||||
} |
||||
|
||||
if (of_property_read_u32(power_mgt, "ibm,pstate-min", &pstate_min)) { |
||||
pr_warn("ibm,pstate-min node not found\n"); |
||||
return -ENODEV; |
||||
} |
||||
|
||||
if (of_property_read_u32(power_mgt, "ibm,pstate-max", &pstate_max)) { |
||||
pr_warn("ibm,pstate-max node not found\n"); |
||||
return -ENODEV; |
||||
} |
||||
|
||||
if (of_property_read_u32(power_mgt, "ibm,pstate-nominal", |
||||
&pstate_nominal)) { |
||||
pr_warn("ibm,pstate-nominal not found\n"); |
||||
return -ENODEV; |
||||
} |
||||
pr_info("cpufreq pstate min %d nominal %d max %d\n", pstate_min, |
||||
pstate_nominal, pstate_max); |
||||
|
||||
pstate_ids = of_get_property(power_mgt, "ibm,pstate-ids", &len_ids); |
||||
if (!pstate_ids) { |
||||
pr_warn("ibm,pstate-ids not found\n"); |
||||
return -ENODEV; |
||||
} |
||||
|
||||
pstate_freqs = of_get_property(power_mgt, "ibm,pstate-frequencies-mhz", |
||||
&len_freqs); |
||||
if (!pstate_freqs) { |
||||
pr_warn("ibm,pstate-frequencies-mhz not found\n"); |
||||
return -ENODEV; |
||||
} |
||||
|
||||
WARN_ON(len_ids != len_freqs); |
||||
nr_pstates = min(len_ids, len_freqs) / sizeof(u32); |
||||
if (!nr_pstates) { |
||||
pr_warn("No PStates found\n"); |
||||
return -ENODEV; |
||||
} |
||||
|
||||
pr_debug("NR PStates %d\n", nr_pstates); |
||||
for (i = 0; i < nr_pstates; i++) { |
||||
u32 id = be32_to_cpu(pstate_ids[i]); |
||||
u32 freq = be32_to_cpu(pstate_freqs[i]); |
||||
|
||||
pr_debug("PState id %d freq %d MHz\n", id, freq); |
||||
powernv_freqs[i].frequency = freq * 1000; /* kHz */ |
||||
powernv_freqs[i].driver_data = id; |
||||
} |
||||
/* End of list marker entry */ |
||||
powernv_freqs[i].frequency = CPUFREQ_TABLE_END; |
||||
|
||||
powernv_pstate_info.min = pstate_min; |
||||
powernv_pstate_info.max = pstate_max; |
||||
powernv_pstate_info.nominal = pstate_nominal; |
||||
powernv_pstate_info.nr_pstates = nr_pstates; |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
/* Returns the CPU frequency corresponding to the pstate_id. */ |
||||
static unsigned int pstate_id_to_freq(int pstate_id) |
||||
{ |
||||
int i; |
||||
|
||||
i = powernv_pstate_info.max - pstate_id; |
||||
BUG_ON(i >= powernv_pstate_info.nr_pstates || i < 0); |
||||
|
||||
return powernv_freqs[i].frequency; |
||||
} |
||||
|
||||
/*
|
||||
* cpuinfo_nominal_freq_show - Show the nominal CPU frequency as indicated by |
||||
* the firmware |
||||
*/ |
||||
static ssize_t cpuinfo_nominal_freq_show(struct cpufreq_policy *policy, |
||||
char *buf) |
||||
{ |
||||
return sprintf(buf, "%u\n", |
||||
pstate_id_to_freq(powernv_pstate_info.nominal)); |
||||
} |
||||
|
||||
struct freq_attr cpufreq_freq_attr_cpuinfo_nominal_freq = |
||||
__ATTR_RO(cpuinfo_nominal_freq); |
||||
|
||||
static struct freq_attr *powernv_cpu_freq_attr[] = { |
||||
&cpufreq_freq_attr_scaling_available_freqs, |
||||
&cpufreq_freq_attr_cpuinfo_nominal_freq, |
||||
NULL, |
||||
}; |
||||
|
||||
/* Helper routines */ |
||||
|
||||
/* Access helpers to power mgt SPR */ |
||||
|
||||
static inline unsigned long get_pmspr(unsigned long sprn) |
||||
{ |
||||
switch (sprn) { |
||||
case SPRN_PMCR: |
||||
return mfspr(SPRN_PMCR); |
||||
|
||||
case SPRN_PMICR: |
||||
return mfspr(SPRN_PMICR); |
||||
|
||||
case SPRN_PMSR: |
||||
return mfspr(SPRN_PMSR); |
||||
} |
||||
BUG(); |
||||
} |
||||
|
||||
static inline void set_pmspr(unsigned long sprn, unsigned long val) |
||||
{ |
||||
switch (sprn) { |
||||
case SPRN_PMCR: |
||||
mtspr(SPRN_PMCR, val); |
||||
return; |
||||
|
||||
case SPRN_PMICR: |
||||
mtspr(SPRN_PMICR, val); |
||||
return; |
||||
} |
||||
BUG(); |
||||
} |
||||
|
||||
/*
|
||||
* Use objects of this type to query/update |
||||
* pstates on a remote CPU via smp_call_function. |
||||
*/ |
||||
struct powernv_smp_call_data { |
||||
unsigned int freq; |
||||
int pstate_id; |
||||
}; |
||||
|
||||
/*
|
||||
* powernv_read_cpu_freq: Reads the current frequency on this CPU. |
||||
* |
||||
* Called via smp_call_function. |
||||
* |
||||
* Note: The caller of the smp_call_function should pass an argument of |
||||
* the type 'struct powernv_smp_call_data *' along with this function. |
||||
* |
||||
* The current frequency on this CPU will be returned via |
||||
* ((struct powernv_smp_call_data *)arg)->freq; |
||||
*/ |
||||
static void powernv_read_cpu_freq(void *arg) |
||||
{ |
||||
unsigned long pmspr_val; |
||||
s8 local_pstate_id; |
||||
struct powernv_smp_call_data *freq_data = arg; |
||||
|
||||
pmspr_val = get_pmspr(SPRN_PMSR); |
||||
|
||||
/*
|
||||
* The local pstate id corresponds bits 48..55 in the PMSR. |
||||
* Note: Watch out for the sign! |
||||
*/ |
||||
local_pstate_id = (pmspr_val >> 48) & 0xFF; |
||||
freq_data->pstate_id = local_pstate_id; |
||||
freq_data->freq = pstate_id_to_freq(freq_data->pstate_id); |
||||
|
||||
pr_debug("cpu %d pmsr %016lX pstate_id %d frequency %d kHz\n", |
||||
raw_smp_processor_id(), pmspr_val, freq_data->pstate_id, |
||||
freq_data->freq); |
||||
} |
||||
|
||||
/*
|
||||
* powernv_cpufreq_get: Returns the CPU frequency as reported by the |
||||
* firmware for CPU 'cpu'. This value is reported through the sysfs |
||||
* file cpuinfo_cur_freq. |
||||
*/ |
||||
unsigned int powernv_cpufreq_get(unsigned int cpu) |
||||
{ |
||||
struct powernv_smp_call_data freq_data; |
||||
|
||||
smp_call_function_any(cpu_sibling_mask(cpu), powernv_read_cpu_freq, |
||||
&freq_data, 1); |
||||
|
||||
return freq_data.freq; |
||||
} |
||||
|
||||
/*
|
||||
* set_pstate: Sets the pstate on this CPU. |
||||
* |
||||
* This is called via an smp_call_function. |
||||
* |
||||
* The caller must ensure that freq_data is of the type |
||||
* (struct powernv_smp_call_data *) and the pstate_id which needs to be set |
||||
* on this CPU should be present in freq_data->pstate_id. |
||||
*/ |
||||
static void set_pstate(void *freq_data) |
||||
{ |
||||
unsigned long val; |
||||
unsigned long pstate_ul = |
||||
((struct powernv_smp_call_data *) freq_data)->pstate_id; |
||||
|
||||
val = get_pmspr(SPRN_PMCR); |
||||
val = val & 0x0000FFFFFFFFFFFFULL; |
||||
|
||||
pstate_ul = pstate_ul & 0xFF; |
||||
|
||||
/* Set both global(bits 56..63) and local(bits 48..55) PStates */ |
||||
val = val | (pstate_ul << 56) | (pstate_ul << 48); |
||||
|
||||
pr_debug("Setting cpu %d pmcr to %016lX\n", |
||||
raw_smp_processor_id(), val); |
||||
set_pmspr(SPRN_PMCR, val); |
||||
} |
||||
|
||||
/*
|
||||
* powernv_cpufreq_target_index: Sets the frequency corresponding to |
||||
* the cpufreq table entry indexed by new_index on the cpus in the |
||||
* mask policy->cpus |
||||
*/ |
||||
static int powernv_cpufreq_target_index(struct cpufreq_policy *policy, |
||||
unsigned int new_index) |
||||
{ |
||||
struct powernv_smp_call_data freq_data; |
||||
|
||||
freq_data.pstate_id = powernv_freqs[new_index].driver_data; |
||||
|
||||
/*
|
||||
* Use smp_call_function to send IPI and execute the |
||||
* mtspr on target CPU. We could do that without IPI |
||||
* if current CPU is within policy->cpus (core) |
||||
*/ |
||||
smp_call_function_any(policy->cpus, set_pstate, &freq_data, 1); |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
static int powernv_cpufreq_cpu_init(struct cpufreq_policy *policy) |
||||
{ |
||||
int base, i; |
||||
|
||||
base = cpu_first_thread_sibling(policy->cpu); |
||||
|
||||
for (i = 0; i < threads_per_core; i++) |
||||
cpumask_set_cpu(base + i, policy->cpus); |
||||
|
||||
return cpufreq_table_validate_and_show(policy, powernv_freqs); |
||||
} |
||||
|
||||
static struct cpufreq_driver powernv_cpufreq_driver = { |
||||
.name = "powernv-cpufreq", |
||||
.flags = CPUFREQ_CONST_LOOPS, |
||||
.init = powernv_cpufreq_cpu_init, |
||||
.verify = cpufreq_generic_frequency_table_verify, |
||||
.target_index = powernv_cpufreq_target_index, |
||||
.get = powernv_cpufreq_get, |
||||
.attr = powernv_cpu_freq_attr, |
||||
}; |
||||
|
||||
static int __init powernv_cpufreq_init(void) |
||||
{ |
||||
int rc = 0; |
||||
|
||||
/* Discover pstates from device tree and init */ |
||||
rc = init_powernv_pstates(); |
||||
if (rc) { |
||||
pr_info("powernv-cpufreq disabled. System does not support PState control\n"); |
||||
return rc; |
||||
} |
||||
|
||||
return cpufreq_register_driver(&powernv_cpufreq_driver); |
||||
} |
||||
module_init(powernv_cpufreq_init); |
||||
|
||||
static void __exit powernv_cpufreq_exit(void) |
||||
{ |
||||
cpufreq_unregister_driver(&powernv_cpufreq_driver); |
||||
} |
||||
module_exit(powernv_cpufreq_exit); |
||||
|
||||
MODULE_LICENSE("GPL"); |
||||
MODULE_AUTHOR("Vaidyanathan Srinivasan <svaidy at linux.vnet.ibm.com>"); |
||||
Loading…
Reference in new issue