2014-01-14 19:02:40 +08:00
|
|
|
/*
|
|
|
|
* cpuidle-powernv - idle state cpuidle driver.
|
|
|
|
* Adapted from drivers/cpuidle/cpuidle-pseries
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/moduleparam.h>
|
|
|
|
#include <linux/cpuidle.h>
|
|
|
|
#include <linux/cpu.h>
|
|
|
|
#include <linux/notifier.h>
|
2014-02-26 08:09:06 +08:00
|
|
|
#include <linux/clockchips.h>
|
2014-02-26 08:09:20 +08:00
|
|
|
#include <linux/of.h>
|
2015-02-18 13:34:17 +08:00
|
|
|
#include <linux/slab.h>
|
2014-01-14 19:02:40 +08:00
|
|
|
|
|
|
|
#include <asm/machdep.h>
|
|
|
|
#include <asm/firmware.h>
|
2014-12-10 02:56:51 +08:00
|
|
|
#include <asm/opal.h>
|
2014-02-17 23:59:29 +08:00
|
|
|
#include <asm/runlatch.h>
|
powernv: Pass PSSCR value and mask to power9_idle_stop
The power9_idle_stop method currently takes only the requested stop
level as a parameter and picks up the rest of the PSSCR bits from a
hand-coded macro. This is not a very flexible design, especially when
the firmware has the capability to communicate the psscr value and the
mask associated with a particular stop state via device tree.
This patch modifies the power9_idle_stop API to take as parameters the
PSSCR value and the PSSCR mask corresponding to the stop state that
needs to be set. These PSSCR value and mask are respectively obtained
by parsing the "ibm,cpu-idle-state-psscr" and
"ibm,cpu-idle-state-psscr-mask" fields from the device tree.
In addition to this, the patch adds support for handling stop states
for which ESL and EC bits in the PSSCR are zero. As per the
architecture, a wakeup from these stop states resumes execution from
the subsequent instruction as opposed to waking up at the System
Vector.
The older firmware sets only the Requested Level (RL) field in the
psscr and psscr-mask exposed in the device tree. For older firmware
where psscr-mask=0xf, this patch will set the default sane values that
the set for for remaining PSSCR fields (i.e PSLL, MTL, ESL, EC, and
TR). For the new firmware, the patch will validate that the invariants
required by the ISA for the psscr values are maintained by the
firmware.
This skiboot patch that exports fully populated PSSCR values and the
mask for all the stop states can be found here:
https://lists.ozlabs.org/pipermail/skiboot/2016-September/004869.html
[Optimize the number of instructions before entering STOP with
ESL=EC=0, validate the PSSCR values provided by the firimware
maintains the invariants required as per the ISA suggested by Balbir
Singh]
Acked-by: Balbir Singh <bsingharora@gmail.com>
Signed-off-by: Gautham R. Shenoy <ego@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2017-01-25 16:36:28 +08:00
|
|
|
#include <asm/cpuidle.h>
|
2014-01-14 19:02:40 +08:00
|
|
|
|
2017-01-25 16:36:27 +08:00
|
|
|
/*
|
|
|
|
* Expose only those Hardware idle states via the cpuidle framework
|
|
|
|
* that have latency value below POWERNV_THRESHOLD_LATENCY_NS.
|
|
|
|
*/
|
2016-07-08 14:20:52 +08:00
|
|
|
#define POWERNV_THRESHOLD_LATENCY_NS 200000
|
|
|
|
|
2016-11-22 13:08:06 +08:00
|
|
|
static struct cpuidle_driver powernv_idle_driver = {
|
2014-01-14 19:02:40 +08:00
|
|
|
.name = "powernv_idle",
|
|
|
|
.owner = THIS_MODULE,
|
|
|
|
};
|
|
|
|
|
|
|
|
static int max_idle_state;
|
|
|
|
static struct cpuidle_state *cpuidle_state_table;
|
2016-07-08 14:20:52 +08:00
|
|
|
|
powernv: Pass PSSCR value and mask to power9_idle_stop
The power9_idle_stop method currently takes only the requested stop
level as a parameter and picks up the rest of the PSSCR bits from a
hand-coded macro. This is not a very flexible design, especially when
the firmware has the capability to communicate the psscr value and the
mask associated with a particular stop state via device tree.
This patch modifies the power9_idle_stop API to take as parameters the
PSSCR value and the PSSCR mask corresponding to the stop state that
needs to be set. These PSSCR value and mask are respectively obtained
by parsing the "ibm,cpu-idle-state-psscr" and
"ibm,cpu-idle-state-psscr-mask" fields from the device tree.
In addition to this, the patch adds support for handling stop states
for which ESL and EC bits in the PSSCR are zero. As per the
architecture, a wakeup from these stop states resumes execution from
the subsequent instruction as opposed to waking up at the System
Vector.
The older firmware sets only the Requested Level (RL) field in the
psscr and psscr-mask exposed in the device tree. For older firmware
where psscr-mask=0xf, this patch will set the default sane values that
the set for for remaining PSSCR fields (i.e PSLL, MTL, ESL, EC, and
TR). For the new firmware, the patch will validate that the invariants
required by the ISA for the psscr values are maintained by the
firmware.
This skiboot patch that exports fully populated PSSCR values and the
mask for all the stop states can be found here:
https://lists.ozlabs.org/pipermail/skiboot/2016-September/004869.html
[Optimize the number of instructions before entering STOP with
ESL=EC=0, validate the PSSCR values provided by the firimware
maintains the invariants required as per the ISA suggested by Balbir
Singh]
Acked-by: Balbir Singh <bsingharora@gmail.com>
Signed-off-by: Gautham R. Shenoy <ego@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2017-01-25 16:36:28 +08:00
|
|
|
struct stop_psscr_table {
|
|
|
|
u64 val;
|
|
|
|
u64 mask;
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct stop_psscr_table stop_psscr_table[CPUIDLE_STATE_MAX];
|
2016-07-08 14:20:52 +08:00
|
|
|
|
2015-06-18 19:23:11 +08:00
|
|
|
static u64 snooze_timeout;
|
|
|
|
static bool snooze_timeout_en;
|
2014-01-14 19:02:40 +08:00
|
|
|
|
|
|
|
static int snooze_loop(struct cpuidle_device *dev,
|
|
|
|
struct cpuidle_driver *drv,
|
|
|
|
int index)
|
|
|
|
{
|
2015-06-18 19:23:11 +08:00
|
|
|
u64 snooze_exit_time;
|
|
|
|
|
2014-01-14 19:02:40 +08:00
|
|
|
local_irq_enable();
|
|
|
|
set_thread_flag(TIF_POLLING_NRFLAG);
|
|
|
|
|
2015-06-18 19:23:11 +08:00
|
|
|
snooze_exit_time = get_tb() + snooze_timeout;
|
2014-02-17 23:59:29 +08:00
|
|
|
ppc64_runlatch_off();
|
2017-04-04 05:54:13 +08:00
|
|
|
HMT_very_low();
|
2014-01-14 19:02:40 +08:00
|
|
|
while (!need_resched()) {
|
2015-06-18 19:23:11 +08:00
|
|
|
if (snooze_timeout_en && get_tb() > snooze_exit_time)
|
|
|
|
break;
|
2014-01-14 19:02:40 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
HMT_medium();
|
2014-02-17 23:59:29 +08:00
|
|
|
ppc64_runlatch_on();
|
2014-01-14 19:02:40 +08:00
|
|
|
clear_thread_flag(TIF_POLLING_NRFLAG);
|
|
|
|
smp_mb();
|
|
|
|
return index;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int nap_loop(struct cpuidle_device *dev,
|
|
|
|
struct cpuidle_driver *drv,
|
|
|
|
int index)
|
|
|
|
{
|
2014-02-17 23:59:29 +08:00
|
|
|
ppc64_runlatch_off();
|
2014-01-14 19:02:40 +08:00
|
|
|
power7_idle();
|
2014-02-17 23:59:29 +08:00
|
|
|
ppc64_runlatch_on();
|
2014-01-14 19:02:40 +08:00
|
|
|
return index;
|
|
|
|
}
|
|
|
|
|
2015-06-24 14:48:01 +08:00
|
|
|
/* Register for fastsleep only in oneshot mode of broadcast */
|
|
|
|
#ifdef CONFIG_TICK_ONESHOT
|
2014-02-26 08:09:06 +08:00
|
|
|
static int fastsleep_loop(struct cpuidle_device *dev,
|
|
|
|
struct cpuidle_driver *drv,
|
|
|
|
int index)
|
|
|
|
{
|
|
|
|
unsigned long old_lpcr = mfspr(SPRN_LPCR);
|
|
|
|
unsigned long new_lpcr;
|
|
|
|
|
|
|
|
if (unlikely(system_state < SYSTEM_RUNNING))
|
|
|
|
return index;
|
|
|
|
|
|
|
|
new_lpcr = old_lpcr;
|
2014-06-11 13:59:27 +08:00
|
|
|
/* Do not exit powersave upon decrementer as we've setup the timer
|
|
|
|
* offload.
|
2014-02-26 08:09:06 +08:00
|
|
|
*/
|
2014-06-11 13:59:27 +08:00
|
|
|
new_lpcr &= ~LPCR_PECE1;
|
2014-02-26 08:09:06 +08:00
|
|
|
|
|
|
|
mtspr(SPRN_LPCR, new_lpcr);
|
|
|
|
power7_sleep();
|
|
|
|
|
|
|
|
mtspr(SPRN_LPCR, old_lpcr);
|
|
|
|
|
|
|
|
return index;
|
|
|
|
}
|
2015-06-24 14:48:01 +08:00
|
|
|
#endif
|
2016-07-08 14:20:52 +08:00
|
|
|
|
|
|
|
static int stop_loop(struct cpuidle_device *dev,
|
|
|
|
struct cpuidle_driver *drv,
|
|
|
|
int index)
|
|
|
|
{
|
|
|
|
ppc64_runlatch_off();
|
powernv: Pass PSSCR value and mask to power9_idle_stop
The power9_idle_stop method currently takes only the requested stop
level as a parameter and picks up the rest of the PSSCR bits from a
hand-coded macro. This is not a very flexible design, especially when
the firmware has the capability to communicate the psscr value and the
mask associated with a particular stop state via device tree.
This patch modifies the power9_idle_stop API to take as parameters the
PSSCR value and the PSSCR mask corresponding to the stop state that
needs to be set. These PSSCR value and mask are respectively obtained
by parsing the "ibm,cpu-idle-state-psscr" and
"ibm,cpu-idle-state-psscr-mask" fields from the device tree.
In addition to this, the patch adds support for handling stop states
for which ESL and EC bits in the PSSCR are zero. As per the
architecture, a wakeup from these stop states resumes execution from
the subsequent instruction as opposed to waking up at the System
Vector.
The older firmware sets only the Requested Level (RL) field in the
psscr and psscr-mask exposed in the device tree. For older firmware
where psscr-mask=0xf, this patch will set the default sane values that
the set for for remaining PSSCR fields (i.e PSLL, MTL, ESL, EC, and
TR). For the new firmware, the patch will validate that the invariants
required by the ISA for the psscr values are maintained by the
firmware.
This skiboot patch that exports fully populated PSSCR values and the
mask for all the stop states can be found here:
https://lists.ozlabs.org/pipermail/skiboot/2016-September/004869.html
[Optimize the number of instructions before entering STOP with
ESL=EC=0, validate the PSSCR values provided by the firimware
maintains the invariants required as per the ISA suggested by Balbir
Singh]
Acked-by: Balbir Singh <bsingharora@gmail.com>
Signed-off-by: Gautham R. Shenoy <ego@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2017-01-25 16:36:28 +08:00
|
|
|
power9_idle_stop(stop_psscr_table[index].val,
|
|
|
|
stop_psscr_table[index].mask);
|
2016-07-08 14:20:52 +08:00
|
|
|
ppc64_runlatch_on();
|
|
|
|
return index;
|
|
|
|
}
|
|
|
|
|
2014-01-14 19:02:40 +08:00
|
|
|
/*
|
|
|
|
* States for dedicated partition case.
|
|
|
|
*/
|
2016-07-08 14:20:50 +08:00
|
|
|
static struct cpuidle_state powernv_states[CPUIDLE_STATE_MAX] = {
|
2014-01-14 19:02:40 +08:00
|
|
|
{ /* Snooze */
|
|
|
|
.name = "snooze",
|
|
|
|
.desc = "snooze",
|
|
|
|
.exit_latency = 0,
|
|
|
|
.target_residency = 0,
|
2016-07-08 14:20:51 +08:00
|
|
|
.enter = snooze_loop },
|
2014-01-14 19:02:40 +08:00
|
|
|
};
|
|
|
|
|
2016-08-24 17:12:59 +08:00
|
|
|
static int powernv_cpuidle_cpu_online(unsigned int cpu)
|
2014-01-14 19:02:40 +08:00
|
|
|
{
|
2016-08-24 17:12:59 +08:00
|
|
|
struct cpuidle_device *dev = per_cpu(cpuidle_devices, cpu);
|
2014-01-14 19:02:40 +08:00
|
|
|
|
|
|
|
if (dev && cpuidle_get_driver()) {
|
2016-08-24 17:12:59 +08:00
|
|
|
cpuidle_pause_and_lock();
|
|
|
|
cpuidle_enable_device(dev);
|
|
|
|
cpuidle_resume_and_unlock();
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
2014-01-14 19:02:40 +08:00
|
|
|
|
2016-08-24 17:12:59 +08:00
|
|
|
static int powernv_cpuidle_cpu_dead(unsigned int cpu)
|
|
|
|
{
|
|
|
|
struct cpuidle_device *dev = per_cpu(cpuidle_devices, cpu);
|
2014-01-14 19:02:40 +08:00
|
|
|
|
2016-08-24 17:12:59 +08:00
|
|
|
if (dev && cpuidle_get_driver()) {
|
|
|
|
cpuidle_pause_and_lock();
|
|
|
|
cpuidle_disable_device(dev);
|
|
|
|
cpuidle_resume_and_unlock();
|
2014-01-14 19:02:40 +08:00
|
|
|
}
|
2016-08-24 17:12:59 +08:00
|
|
|
return 0;
|
2014-01-14 19:02:40 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* powernv_cpuidle_driver_init()
|
|
|
|
*/
|
|
|
|
static int powernv_cpuidle_driver_init(void)
|
|
|
|
{
|
|
|
|
int idle_state;
|
|
|
|
struct cpuidle_driver *drv = &powernv_idle_driver;
|
|
|
|
|
|
|
|
drv->state_count = 0;
|
|
|
|
|
|
|
|
for (idle_state = 0; idle_state < max_idle_state; ++idle_state) {
|
|
|
|
/* Is the state not enabled? */
|
|
|
|
if (cpuidle_state_table[idle_state].enter == NULL)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
drv->states[drv->state_count] = /* structure copy */
|
|
|
|
cpuidle_state_table[idle_state];
|
|
|
|
|
|
|
|
drv->state_count += 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-01-25 16:36:27 +08:00
|
|
|
static inline void add_powernv_state(int index, const char *name,
|
|
|
|
unsigned int flags,
|
|
|
|
int (*idle_fn)(struct cpuidle_device *,
|
|
|
|
struct cpuidle_driver *,
|
|
|
|
int),
|
|
|
|
unsigned int target_residency,
|
|
|
|
unsigned int exit_latency,
|
powernv: Pass PSSCR value and mask to power9_idle_stop
The power9_idle_stop method currently takes only the requested stop
level as a parameter and picks up the rest of the PSSCR bits from a
hand-coded macro. This is not a very flexible design, especially when
the firmware has the capability to communicate the psscr value and the
mask associated with a particular stop state via device tree.
This patch modifies the power9_idle_stop API to take as parameters the
PSSCR value and the PSSCR mask corresponding to the stop state that
needs to be set. These PSSCR value and mask are respectively obtained
by parsing the "ibm,cpu-idle-state-psscr" and
"ibm,cpu-idle-state-psscr-mask" fields from the device tree.
In addition to this, the patch adds support for handling stop states
for which ESL and EC bits in the PSSCR are zero. As per the
architecture, a wakeup from these stop states resumes execution from
the subsequent instruction as opposed to waking up at the System
Vector.
The older firmware sets only the Requested Level (RL) field in the
psscr and psscr-mask exposed in the device tree. For older firmware
where psscr-mask=0xf, this patch will set the default sane values that
the set for for remaining PSSCR fields (i.e PSLL, MTL, ESL, EC, and
TR). For the new firmware, the patch will validate that the invariants
required by the ISA for the psscr values are maintained by the
firmware.
This skiboot patch that exports fully populated PSSCR values and the
mask for all the stop states can be found here:
https://lists.ozlabs.org/pipermail/skiboot/2016-September/004869.html
[Optimize the number of instructions before entering STOP with
ESL=EC=0, validate the PSSCR values provided by the firimware
maintains the invariants required as per the ISA suggested by Balbir
Singh]
Acked-by: Balbir Singh <bsingharora@gmail.com>
Signed-off-by: Gautham R. Shenoy <ego@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2017-01-25 16:36:28 +08:00
|
|
|
u64 psscr_val, u64 psscr_mask)
|
2017-01-25 16:36:27 +08:00
|
|
|
{
|
|
|
|
strlcpy(powernv_states[index].name, name, CPUIDLE_NAME_LEN);
|
|
|
|
strlcpy(powernv_states[index].desc, name, CPUIDLE_NAME_LEN);
|
|
|
|
powernv_states[index].flags = flags;
|
|
|
|
powernv_states[index].target_residency = target_residency;
|
|
|
|
powernv_states[index].exit_latency = exit_latency;
|
|
|
|
powernv_states[index].enter = idle_fn;
|
powernv: Pass PSSCR value and mask to power9_idle_stop
The power9_idle_stop method currently takes only the requested stop
level as a parameter and picks up the rest of the PSSCR bits from a
hand-coded macro. This is not a very flexible design, especially when
the firmware has the capability to communicate the psscr value and the
mask associated with a particular stop state via device tree.
This patch modifies the power9_idle_stop API to take as parameters the
PSSCR value and the PSSCR mask corresponding to the stop state that
needs to be set. These PSSCR value and mask are respectively obtained
by parsing the "ibm,cpu-idle-state-psscr" and
"ibm,cpu-idle-state-psscr-mask" fields from the device tree.
In addition to this, the patch adds support for handling stop states
for which ESL and EC bits in the PSSCR are zero. As per the
architecture, a wakeup from these stop states resumes execution from
the subsequent instruction as opposed to waking up at the System
Vector.
The older firmware sets only the Requested Level (RL) field in the
psscr and psscr-mask exposed in the device tree. For older firmware
where psscr-mask=0xf, this patch will set the default sane values that
the set for for remaining PSSCR fields (i.e PSLL, MTL, ESL, EC, and
TR). For the new firmware, the patch will validate that the invariants
required by the ISA for the psscr values are maintained by the
firmware.
This skiboot patch that exports fully populated PSSCR values and the
mask for all the stop states can be found here:
https://lists.ozlabs.org/pipermail/skiboot/2016-September/004869.html
[Optimize the number of instructions before entering STOP with
ESL=EC=0, validate the PSSCR values provided by the firimware
maintains the invariants required as per the ISA suggested by Balbir
Singh]
Acked-by: Balbir Singh <bsingharora@gmail.com>
Signed-off-by: Gautham R. Shenoy <ego@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2017-01-25 16:36:28 +08:00
|
|
|
stop_psscr_table[index].val = psscr_val;
|
|
|
|
stop_psscr_table[index].mask = psscr_mask;
|
2017-01-25 16:36:27 +08:00
|
|
|
}
|
|
|
|
|
2017-03-15 16:15:53 +08:00
|
|
|
/*
|
|
|
|
* Returns 0 if prop1_len == prop2_len. Else returns -1
|
|
|
|
*/
|
|
|
|
static inline int validate_dt_prop_sizes(const char *prop1, int prop1_len,
|
|
|
|
const char *prop2, int prop2_len)
|
|
|
|
{
|
|
|
|
if (prop1_len == prop2_len)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
pr_warn("cpuidle-powernv: array sizes don't match for %s and %s\n",
|
|
|
|
prop1, prop2);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2014-02-26 08:09:20 +08:00
|
|
|
static int powernv_add_idle_states(void)
|
|
|
|
{
|
|
|
|
struct device_node *power_mgt;
|
|
|
|
int nr_idle_states = 1; /* Snooze */
|
2017-03-15 16:15:53 +08:00
|
|
|
int dt_idle_states, count;
|
2016-07-08 14:20:51 +08:00
|
|
|
u32 latency_ns[CPUIDLE_STATE_MAX];
|
|
|
|
u32 residency_ns[CPUIDLE_STATE_MAX];
|
|
|
|
u32 flags[CPUIDLE_STATE_MAX];
|
2016-07-08 14:20:52 +08:00
|
|
|
u64 psscr_val[CPUIDLE_STATE_MAX];
|
powernv: Pass PSSCR value and mask to power9_idle_stop
The power9_idle_stop method currently takes only the requested stop
level as a parameter and picks up the rest of the PSSCR bits from a
hand-coded macro. This is not a very flexible design, especially when
the firmware has the capability to communicate the psscr value and the
mask associated with a particular stop state via device tree.
This patch modifies the power9_idle_stop API to take as parameters the
PSSCR value and the PSSCR mask corresponding to the stop state that
needs to be set. These PSSCR value and mask are respectively obtained
by parsing the "ibm,cpu-idle-state-psscr" and
"ibm,cpu-idle-state-psscr-mask" fields from the device tree.
In addition to this, the patch adds support for handling stop states
for which ESL and EC bits in the PSSCR are zero. As per the
architecture, a wakeup from these stop states resumes execution from
the subsequent instruction as opposed to waking up at the System
Vector.
The older firmware sets only the Requested Level (RL) field in the
psscr and psscr-mask exposed in the device tree. For older firmware
where psscr-mask=0xf, this patch will set the default sane values that
the set for for remaining PSSCR fields (i.e PSLL, MTL, ESL, EC, and
TR). For the new firmware, the patch will validate that the invariants
required by the ISA for the psscr values are maintained by the
firmware.
This skiboot patch that exports fully populated PSSCR values and the
mask for all the stop states can be found here:
https://lists.ozlabs.org/pipermail/skiboot/2016-September/004869.html
[Optimize the number of instructions before entering STOP with
ESL=EC=0, validate the PSSCR values provided by the firimware
maintains the invariants required as per the ISA suggested by Balbir
Singh]
Acked-by: Balbir Singh <bsingharora@gmail.com>
Signed-off-by: Gautham R. Shenoy <ego@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2017-01-25 16:36:28 +08:00
|
|
|
u64 psscr_mask[CPUIDLE_STATE_MAX];
|
2016-07-08 14:20:52 +08:00
|
|
|
const char *names[CPUIDLE_STATE_MAX];
|
powernv: Pass PSSCR value and mask to power9_idle_stop
The power9_idle_stop method currently takes only the requested stop
level as a parameter and picks up the rest of the PSSCR bits from a
hand-coded macro. This is not a very flexible design, especially when
the firmware has the capability to communicate the psscr value and the
mask associated with a particular stop state via device tree.
This patch modifies the power9_idle_stop API to take as parameters the
PSSCR value and the PSSCR mask corresponding to the stop state that
needs to be set. These PSSCR value and mask are respectively obtained
by parsing the "ibm,cpu-idle-state-psscr" and
"ibm,cpu-idle-state-psscr-mask" fields from the device tree.
In addition to this, the patch adds support for handling stop states
for which ESL and EC bits in the PSSCR are zero. As per the
architecture, a wakeup from these stop states resumes execution from
the subsequent instruction as opposed to waking up at the System
Vector.
The older firmware sets only the Requested Level (RL) field in the
psscr and psscr-mask exposed in the device tree. For older firmware
where psscr-mask=0xf, this patch will set the default sane values that
the set for for remaining PSSCR fields (i.e PSLL, MTL, ESL, EC, and
TR). For the new firmware, the patch will validate that the invariants
required by the ISA for the psscr values are maintained by the
firmware.
This skiboot patch that exports fully populated PSSCR values and the
mask for all the stop states can be found here:
https://lists.ozlabs.org/pipermail/skiboot/2016-September/004869.html
[Optimize the number of instructions before entering STOP with
ESL=EC=0, validate the PSSCR values provided by the firimware
maintains the invariants required as per the ISA suggested by Balbir
Singh]
Acked-by: Balbir Singh <bsingharora@gmail.com>
Signed-off-by: Gautham R. Shenoy <ego@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2017-01-25 16:36:28 +08:00
|
|
|
u32 has_stop_states = 0;
|
2015-02-18 13:34:17 +08:00
|
|
|
int i, rc;
|
2014-02-26 08:09:20 +08:00
|
|
|
|
|
|
|
/* Currently we have snooze statically defined */
|
|
|
|
|
|
|
|
power_mgt = of_find_node_by_path("/ibm,opal/power-mgt");
|
|
|
|
if (!power_mgt) {
|
|
|
|
pr_warn("opal: PowerMgmt Node not found\n");
|
2015-02-18 13:34:17 +08:00
|
|
|
goto out;
|
2014-02-26 08:09:20 +08:00
|
|
|
}
|
|
|
|
|
2015-02-19 13:24:53 +08:00
|
|
|
/* Read values of any property to determine the num of idle states */
|
|
|
|
dt_idle_states = of_property_count_u32_elems(power_mgt, "ibm,cpu-idle-state-flags");
|
|
|
|
if (dt_idle_states < 0) {
|
|
|
|
pr_warn("cpuidle-powernv: no idle states found in the DT\n");
|
2015-02-18 13:34:17 +08:00
|
|
|
goto out;
|
2014-02-26 08:09:20 +08:00
|
|
|
}
|
|
|
|
|
2017-03-15 16:15:53 +08:00
|
|
|
count = of_property_count_u32_elems(power_mgt,
|
|
|
|
"ibm,cpu-idle-state-latencies-ns");
|
|
|
|
|
|
|
|
if (validate_dt_prop_sizes("ibm,cpu-idle-state-flags", dt_idle_states,
|
|
|
|
"ibm,cpu-idle-state-latencies-ns",
|
|
|
|
count) != 0)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
count = of_property_count_strings(power_mgt,
|
|
|
|
"ibm,cpu-idle-state-names");
|
|
|
|
if (validate_dt_prop_sizes("ibm,cpu-idle-state-flags", dt_idle_states,
|
|
|
|
"ibm,cpu-idle-state-names",
|
|
|
|
count) != 0)
|
|
|
|
goto out;
|
|
|
|
|
2016-07-08 14:20:51 +08:00
|
|
|
/*
|
|
|
|
* Since snooze is used as first idle state, max idle states allowed is
|
|
|
|
* CPUIDLE_STATE_MAX -1
|
|
|
|
*/
|
|
|
|
if (dt_idle_states > CPUIDLE_STATE_MAX - 1) {
|
|
|
|
pr_warn("cpuidle-powernv: discovered idle states more than allowed");
|
|
|
|
dt_idle_states = CPUIDLE_STATE_MAX - 1;
|
|
|
|
}
|
|
|
|
|
2015-02-19 13:24:53 +08:00
|
|
|
if (of_property_read_u32_array(power_mgt,
|
|
|
|
"ibm,cpu-idle-state-flags", flags, dt_idle_states)) {
|
|
|
|
pr_warn("cpuidle-powernv : missing ibm,cpu-idle-state-flags in DT\n");
|
2016-07-08 14:20:51 +08:00
|
|
|
goto out;
|
2015-02-19 13:24:53 +08:00
|
|
|
}
|
2015-02-18 13:34:17 +08:00
|
|
|
|
2016-07-08 14:20:51 +08:00
|
|
|
if (of_property_read_u32_array(power_mgt,
|
|
|
|
"ibm,cpu-idle-state-latencies-ns", latency_ns,
|
|
|
|
dt_idle_states)) {
|
2015-02-18 13:34:17 +08:00
|
|
|
pr_warn("cpuidle-powernv: missing ibm,cpu-idle-state-latencies-ns in DT\n");
|
2016-07-08 14:20:51 +08:00
|
|
|
goto out;
|
2014-10-14 15:53:00 +08:00
|
|
|
}
|
2016-07-08 14:20:52 +08:00
|
|
|
if (of_property_read_string_array(power_mgt,
|
|
|
|
"ibm,cpu-idle-state-names", names, dt_idle_states) < 0) {
|
|
|
|
pr_warn("cpuidle-powernv: missing ibm,cpu-idle-state-names in DT\n");
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If the idle states use stop instruction, probe for psscr values
|
powernv: Pass PSSCR value and mask to power9_idle_stop
The power9_idle_stop method currently takes only the requested stop
level as a parameter and picks up the rest of the PSSCR bits from a
hand-coded macro. This is not a very flexible design, especially when
the firmware has the capability to communicate the psscr value and the
mask associated with a particular stop state via device tree.
This patch modifies the power9_idle_stop API to take as parameters the
PSSCR value and the PSSCR mask corresponding to the stop state that
needs to be set. These PSSCR value and mask are respectively obtained
by parsing the "ibm,cpu-idle-state-psscr" and
"ibm,cpu-idle-state-psscr-mask" fields from the device tree.
In addition to this, the patch adds support for handling stop states
for which ESL and EC bits in the PSSCR are zero. As per the
architecture, a wakeup from these stop states resumes execution from
the subsequent instruction as opposed to waking up at the System
Vector.
The older firmware sets only the Requested Level (RL) field in the
psscr and psscr-mask exposed in the device tree. For older firmware
where psscr-mask=0xf, this patch will set the default sane values that
the set for for remaining PSSCR fields (i.e PSLL, MTL, ESL, EC, and
TR). For the new firmware, the patch will validate that the invariants
required by the ISA for the psscr values are maintained by the
firmware.
This skiboot patch that exports fully populated PSSCR values and the
mask for all the stop states can be found here:
https://lists.ozlabs.org/pipermail/skiboot/2016-September/004869.html
[Optimize the number of instructions before entering STOP with
ESL=EC=0, validate the PSSCR values provided by the firimware
maintains the invariants required as per the ISA suggested by Balbir
Singh]
Acked-by: Balbir Singh <bsingharora@gmail.com>
Signed-off-by: Gautham R. Shenoy <ego@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2017-01-25 16:36:28 +08:00
|
|
|
* and psscr mask which are necessary to specify required stop level.
|
2016-07-08 14:20:52 +08:00
|
|
|
*/
|
powernv: Pass PSSCR value and mask to power9_idle_stop
The power9_idle_stop method currently takes only the requested stop
level as a parameter and picks up the rest of the PSSCR bits from a
hand-coded macro. This is not a very flexible design, especially when
the firmware has the capability to communicate the psscr value and the
mask associated with a particular stop state via device tree.
This patch modifies the power9_idle_stop API to take as parameters the
PSSCR value and the PSSCR mask corresponding to the stop state that
needs to be set. These PSSCR value and mask are respectively obtained
by parsing the "ibm,cpu-idle-state-psscr" and
"ibm,cpu-idle-state-psscr-mask" fields from the device tree.
In addition to this, the patch adds support for handling stop states
for which ESL and EC bits in the PSSCR are zero. As per the
architecture, a wakeup from these stop states resumes execution from
the subsequent instruction as opposed to waking up at the System
Vector.
The older firmware sets only the Requested Level (RL) field in the
psscr and psscr-mask exposed in the device tree. For older firmware
where psscr-mask=0xf, this patch will set the default sane values that
the set for for remaining PSSCR fields (i.e PSLL, MTL, ESL, EC, and
TR). For the new firmware, the patch will validate that the invariants
required by the ISA for the psscr values are maintained by the
firmware.
This skiboot patch that exports fully populated PSSCR values and the
mask for all the stop states can be found here:
https://lists.ozlabs.org/pipermail/skiboot/2016-September/004869.html
[Optimize the number of instructions before entering STOP with
ESL=EC=0, validate the PSSCR values provided by the firimware
maintains the invariants required as per the ISA suggested by Balbir
Singh]
Acked-by: Balbir Singh <bsingharora@gmail.com>
Signed-off-by: Gautham R. Shenoy <ego@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2017-01-25 16:36:28 +08:00
|
|
|
has_stop_states = (flags[0] &
|
|
|
|
(OPAL_PM_STOP_INST_FAST | OPAL_PM_STOP_INST_DEEP));
|
|
|
|
if (has_stop_states) {
|
2017-03-15 16:15:53 +08:00
|
|
|
count = of_property_count_u64_elems(power_mgt,
|
|
|
|
"ibm,cpu-idle-state-psscr");
|
|
|
|
if (validate_dt_prop_sizes("ibm,cpu-idle-state-flags",
|
|
|
|
dt_idle_states,
|
|
|
|
"ibm,cpu-idle-state-psscr",
|
|
|
|
count) != 0)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
count = of_property_count_u64_elems(power_mgt,
|
|
|
|
"ibm,cpu-idle-state-psscr-mask");
|
|
|
|
if (validate_dt_prop_sizes("ibm,cpu-idle-state-flags",
|
|
|
|
dt_idle_states,
|
|
|
|
"ibm,cpu-idle-state-psscr-mask",
|
|
|
|
count) != 0)
|
|
|
|
goto out;
|
|
|
|
|
2016-07-08 14:20:52 +08:00
|
|
|
if (of_property_read_u64_array(power_mgt,
|
|
|
|
"ibm,cpu-idle-state-psscr", psscr_val, dt_idle_states)) {
|
powernv: Pass PSSCR value and mask to power9_idle_stop
The power9_idle_stop method currently takes only the requested stop
level as a parameter and picks up the rest of the PSSCR bits from a
hand-coded macro. This is not a very flexible design, especially when
the firmware has the capability to communicate the psscr value and the
mask associated with a particular stop state via device tree.
This patch modifies the power9_idle_stop API to take as parameters the
PSSCR value and the PSSCR mask corresponding to the stop state that
needs to be set. These PSSCR value and mask are respectively obtained
by parsing the "ibm,cpu-idle-state-psscr" and
"ibm,cpu-idle-state-psscr-mask" fields from the device tree.
In addition to this, the patch adds support for handling stop states
for which ESL and EC bits in the PSSCR are zero. As per the
architecture, a wakeup from these stop states resumes execution from
the subsequent instruction as opposed to waking up at the System
Vector.
The older firmware sets only the Requested Level (RL) field in the
psscr and psscr-mask exposed in the device tree. For older firmware
where psscr-mask=0xf, this patch will set the default sane values that
the set for for remaining PSSCR fields (i.e PSLL, MTL, ESL, EC, and
TR). For the new firmware, the patch will validate that the invariants
required by the ISA for the psscr values are maintained by the
firmware.
This skiboot patch that exports fully populated PSSCR values and the
mask for all the stop states can be found here:
https://lists.ozlabs.org/pipermail/skiboot/2016-September/004869.html
[Optimize the number of instructions before entering STOP with
ESL=EC=0, validate the PSSCR values provided by the firimware
maintains the invariants required as per the ISA suggested by Balbir
Singh]
Acked-by: Balbir Singh <bsingharora@gmail.com>
Signed-off-by: Gautham R. Shenoy <ego@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2017-01-25 16:36:28 +08:00
|
|
|
pr_warn("cpuidle-powernv: missing ibm,cpu-idle-state-psscr in DT\n");
|
2016-07-08 14:20:52 +08:00
|
|
|
goto out;
|
|
|
|
}
|
2014-10-14 15:53:00 +08:00
|
|
|
|
powernv: Pass PSSCR value and mask to power9_idle_stop
The power9_idle_stop method currently takes only the requested stop
level as a parameter and picks up the rest of the PSSCR bits from a
hand-coded macro. This is not a very flexible design, especially when
the firmware has the capability to communicate the psscr value and the
mask associated with a particular stop state via device tree.
This patch modifies the power9_idle_stop API to take as parameters the
PSSCR value and the PSSCR mask corresponding to the stop state that
needs to be set. These PSSCR value and mask are respectively obtained
by parsing the "ibm,cpu-idle-state-psscr" and
"ibm,cpu-idle-state-psscr-mask" fields from the device tree.
In addition to this, the patch adds support for handling stop states
for which ESL and EC bits in the PSSCR are zero. As per the
architecture, a wakeup from these stop states resumes execution from
the subsequent instruction as opposed to waking up at the System
Vector.
The older firmware sets only the Requested Level (RL) field in the
psscr and psscr-mask exposed in the device tree. For older firmware
where psscr-mask=0xf, this patch will set the default sane values that
the set for for remaining PSSCR fields (i.e PSLL, MTL, ESL, EC, and
TR). For the new firmware, the patch will validate that the invariants
required by the ISA for the psscr values are maintained by the
firmware.
This skiboot patch that exports fully populated PSSCR values and the
mask for all the stop states can be found here:
https://lists.ozlabs.org/pipermail/skiboot/2016-September/004869.html
[Optimize the number of instructions before entering STOP with
ESL=EC=0, validate the PSSCR values provided by the firimware
maintains the invariants required as per the ISA suggested by Balbir
Singh]
Acked-by: Balbir Singh <bsingharora@gmail.com>
Signed-off-by: Gautham R. Shenoy <ego@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2017-01-25 16:36:28 +08:00
|
|
|
if (of_property_read_u64_array(power_mgt,
|
|
|
|
"ibm,cpu-idle-state-psscr-mask",
|
|
|
|
psscr_mask, dt_idle_states)) {
|
|
|
|
pr_warn("cpuidle-powernv:Missing ibm,cpu-idle-state-psscr-mask in DT\n");
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-03-15 16:15:53 +08:00
|
|
|
count = of_property_count_u32_elems(power_mgt,
|
|
|
|
"ibm,cpu-idle-state-residency-ns");
|
|
|
|
|
|
|
|
if (count < 0) {
|
|
|
|
rc = count;
|
|
|
|
} else if (validate_dt_prop_sizes("ibm,cpu-idle-state-flags",
|
|
|
|
dt_idle_states,
|
|
|
|
"ibm,cpu-idle-state-residency-ns",
|
|
|
|
count) != 0) {
|
|
|
|
goto out;
|
|
|
|
} else {
|
|
|
|
rc = of_property_read_u32_array(power_mgt,
|
|
|
|
"ibm,cpu-idle-state-residency-ns",
|
|
|
|
residency_ns, dt_idle_states);
|
|
|
|
}
|
2014-02-26 08:09:20 +08:00
|
|
|
|
|
|
|
for (i = 0; i < dt_idle_states; i++) {
|
2017-01-25 16:36:27 +08:00
|
|
|
unsigned int exit_latency, target_residency;
|
2016-07-08 14:20:52 +08:00
|
|
|
/*
|
|
|
|
* If an idle state has exit latency beyond
|
|
|
|
* POWERNV_THRESHOLD_LATENCY_NS then don't use it
|
|
|
|
* in cpu-idle.
|
|
|
|
*/
|
|
|
|
if (latency_ns[i] > POWERNV_THRESHOLD_LATENCY_NS)
|
|
|
|
continue;
|
2017-01-25 16:36:27 +08:00
|
|
|
/*
|
|
|
|
* Firmware passes residency and latency values in ns.
|
|
|
|
* cpuidle expects it in us.
|
|
|
|
*/
|
|
|
|
exit_latency = latency_ns[i] / 1000;
|
|
|
|
if (!rc)
|
|
|
|
target_residency = residency_ns[i] / 1000;
|
|
|
|
else
|
|
|
|
target_residency = 0;
|
2014-02-26 08:09:20 +08:00
|
|
|
|
powernv: Pass PSSCR value and mask to power9_idle_stop
The power9_idle_stop method currently takes only the requested stop
level as a parameter and picks up the rest of the PSSCR bits from a
hand-coded macro. This is not a very flexible design, especially when
the firmware has the capability to communicate the psscr value and the
mask associated with a particular stop state via device tree.
This patch modifies the power9_idle_stop API to take as parameters the
PSSCR value and the PSSCR mask corresponding to the stop state that
needs to be set. These PSSCR value and mask are respectively obtained
by parsing the "ibm,cpu-idle-state-psscr" and
"ibm,cpu-idle-state-psscr-mask" fields from the device tree.
In addition to this, the patch adds support for handling stop states
for which ESL and EC bits in the PSSCR are zero. As per the
architecture, a wakeup from these stop states resumes execution from
the subsequent instruction as opposed to waking up at the System
Vector.
The older firmware sets only the Requested Level (RL) field in the
psscr and psscr-mask exposed in the device tree. For older firmware
where psscr-mask=0xf, this patch will set the default sane values that
the set for for remaining PSSCR fields (i.e PSLL, MTL, ESL, EC, and
TR). For the new firmware, the patch will validate that the invariants
required by the ISA for the psscr values are maintained by the
firmware.
This skiboot patch that exports fully populated PSSCR values and the
mask for all the stop states can be found here:
https://lists.ozlabs.org/pipermail/skiboot/2016-September/004869.html
[Optimize the number of instructions before entering STOP with
ESL=EC=0, validate the PSSCR values provided by the firimware
maintains the invariants required as per the ISA suggested by Balbir
Singh]
Acked-by: Balbir Singh <bsingharora@gmail.com>
Signed-off-by: Gautham R. Shenoy <ego@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2017-01-25 16:36:28 +08:00
|
|
|
if (has_stop_states) {
|
|
|
|
int err = validate_psscr_val_mask(&psscr_val[i],
|
|
|
|
&psscr_mask[i],
|
|
|
|
flags[i]);
|
|
|
|
if (err) {
|
|
|
|
report_invalid_psscr_val(psscr_val[i], err);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-02-18 13:34:17 +08:00
|
|
|
/*
|
2017-01-25 16:36:27 +08:00
|
|
|
* For nap and fastsleep, use default target_residency
|
|
|
|
* values if f/w does not expose it.
|
2014-10-14 15:53:00 +08:00
|
|
|
*/
|
2015-02-19 13:24:53 +08:00
|
|
|
if (flags[i] & OPAL_PM_NAP_ENABLED) {
|
2017-01-25 16:36:27 +08:00
|
|
|
if (!rc)
|
|
|
|
target_residency = 100;
|
2014-02-26 08:09:20 +08:00
|
|
|
/* Add NAP state */
|
2017-01-25 16:36:27 +08:00
|
|
|
add_powernv_state(nr_idle_states, "Nap",
|
|
|
|
CPUIDLE_FLAG_NONE, nap_loop,
|
powernv: Pass PSSCR value and mask to power9_idle_stop
The power9_idle_stop method currently takes only the requested stop
level as a parameter and picks up the rest of the PSSCR bits from a
hand-coded macro. This is not a very flexible design, especially when
the firmware has the capability to communicate the psscr value and the
mask associated with a particular stop state via device tree.
This patch modifies the power9_idle_stop API to take as parameters the
PSSCR value and the PSSCR mask corresponding to the stop state that
needs to be set. These PSSCR value and mask are respectively obtained
by parsing the "ibm,cpu-idle-state-psscr" and
"ibm,cpu-idle-state-psscr-mask" fields from the device tree.
In addition to this, the patch adds support for handling stop states
for which ESL and EC bits in the PSSCR are zero. As per the
architecture, a wakeup from these stop states resumes execution from
the subsequent instruction as opposed to waking up at the System
Vector.
The older firmware sets only the Requested Level (RL) field in the
psscr and psscr-mask exposed in the device tree. For older firmware
where psscr-mask=0xf, this patch will set the default sane values that
the set for for remaining PSSCR fields (i.e PSLL, MTL, ESL, EC, and
TR). For the new firmware, the patch will validate that the invariants
required by the ISA for the psscr values are maintained by the
firmware.
This skiboot patch that exports fully populated PSSCR values and the
mask for all the stop states can be found here:
https://lists.ozlabs.org/pipermail/skiboot/2016-September/004869.html
[Optimize the number of instructions before entering STOP with
ESL=EC=0, validate the PSSCR values provided by the firimware
maintains the invariants required as per the ISA suggested by Balbir
Singh]
Acked-by: Balbir Singh <bsingharora@gmail.com>
Signed-off-by: Gautham R. Shenoy <ego@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2017-01-25 16:36:28 +08:00
|
|
|
target_residency, exit_latency, 0, 0);
|
2016-07-08 14:20:52 +08:00
|
|
|
} else if ((flags[i] & OPAL_PM_STOP_INST_FAST) &&
|
|
|
|
!(flags[i] & OPAL_PM_TIMEBASE_STOP)) {
|
2017-01-25 16:36:27 +08:00
|
|
|
add_powernv_state(nr_idle_states, names[i],
|
|
|
|
CPUIDLE_FLAG_NONE, stop_loop,
|
|
|
|
target_residency, exit_latency,
|
powernv: Pass PSSCR value and mask to power9_idle_stop
The power9_idle_stop method currently takes only the requested stop
level as a parameter and picks up the rest of the PSSCR bits from a
hand-coded macro. This is not a very flexible design, especially when
the firmware has the capability to communicate the psscr value and the
mask associated with a particular stop state via device tree.
This patch modifies the power9_idle_stop API to take as parameters the
PSSCR value and the PSSCR mask corresponding to the stop state that
needs to be set. These PSSCR value and mask are respectively obtained
by parsing the "ibm,cpu-idle-state-psscr" and
"ibm,cpu-idle-state-psscr-mask" fields from the device tree.
In addition to this, the patch adds support for handling stop states
for which ESL and EC bits in the PSSCR are zero. As per the
architecture, a wakeup from these stop states resumes execution from
the subsequent instruction as opposed to waking up at the System
Vector.
The older firmware sets only the Requested Level (RL) field in the
psscr and psscr-mask exposed in the device tree. For older firmware
where psscr-mask=0xf, this patch will set the default sane values that
the set for for remaining PSSCR fields (i.e PSLL, MTL, ESL, EC, and
TR). For the new firmware, the patch will validate that the invariants
required by the ISA for the psscr values are maintained by the
firmware.
This skiboot patch that exports fully populated PSSCR values and the
mask for all the stop states can be found here:
https://lists.ozlabs.org/pipermail/skiboot/2016-September/004869.html
[Optimize the number of instructions before entering STOP with
ESL=EC=0, validate the PSSCR values provided by the firimware
maintains the invariants required as per the ISA suggested by Balbir
Singh]
Acked-by: Balbir Singh <bsingharora@gmail.com>
Signed-off-by: Gautham R. Shenoy <ego@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2017-01-25 16:36:28 +08:00
|
|
|
psscr_val[i], psscr_mask[i]);
|
2015-06-24 14:48:01 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* All cpuidle states with CPUIDLE_FLAG_TIMER_STOP set must come
|
|
|
|
* within this config dependency check.
|
|
|
|
*/
|
|
|
|
#ifdef CONFIG_TICK_ONESHOT
|
|
|
|
if (flags[i] & OPAL_PM_SLEEP_ENABLED ||
|
2015-02-19 13:24:53 +08:00
|
|
|
flags[i] & OPAL_PM_SLEEP_ENABLED_ER1) {
|
2017-01-25 16:36:27 +08:00
|
|
|
if (!rc)
|
|
|
|
target_residency = 300000;
|
2014-02-26 08:09:20 +08:00
|
|
|
/* Add FASTSLEEP state */
|
2017-01-25 16:36:27 +08:00
|
|
|
add_powernv_state(nr_idle_states, "FastSleep",
|
|
|
|
CPUIDLE_FLAG_TIMER_STOP,
|
|
|
|
fastsleep_loop,
|
powernv: Pass PSSCR value and mask to power9_idle_stop
The power9_idle_stop method currently takes only the requested stop
level as a parameter and picks up the rest of the PSSCR bits from a
hand-coded macro. This is not a very flexible design, especially when
the firmware has the capability to communicate the psscr value and the
mask associated with a particular stop state via device tree.
This patch modifies the power9_idle_stop API to take as parameters the
PSSCR value and the PSSCR mask corresponding to the stop state that
needs to be set. These PSSCR value and mask are respectively obtained
by parsing the "ibm,cpu-idle-state-psscr" and
"ibm,cpu-idle-state-psscr-mask" fields from the device tree.
In addition to this, the patch adds support for handling stop states
for which ESL and EC bits in the PSSCR are zero. As per the
architecture, a wakeup from these stop states resumes execution from
the subsequent instruction as opposed to waking up at the System
Vector.
The older firmware sets only the Requested Level (RL) field in the
psscr and psscr-mask exposed in the device tree. For older firmware
where psscr-mask=0xf, this patch will set the default sane values that
the set for for remaining PSSCR fields (i.e PSLL, MTL, ESL, EC, and
TR). For the new firmware, the patch will validate that the invariants
required by the ISA for the psscr values are maintained by the
firmware.
This skiboot patch that exports fully populated PSSCR values and the
mask for all the stop states can be found here:
https://lists.ozlabs.org/pipermail/skiboot/2016-September/004869.html
[Optimize the number of instructions before entering STOP with
ESL=EC=0, validate the PSSCR values provided by the firimware
maintains the invariants required as per the ISA suggested by Balbir
Singh]
Acked-by: Balbir Singh <bsingharora@gmail.com>
Signed-off-by: Gautham R. Shenoy <ego@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2017-01-25 16:36:28 +08:00
|
|
|
target_residency, exit_latency, 0, 0);
|
2016-07-08 14:20:52 +08:00
|
|
|
} else if ((flags[i] & OPAL_PM_STOP_INST_DEEP) &&
|
|
|
|
(flags[i] & OPAL_PM_TIMEBASE_STOP)) {
|
2017-01-25 16:36:27 +08:00
|
|
|
add_powernv_state(nr_idle_states, names[i],
|
|
|
|
CPUIDLE_FLAG_TIMER_STOP, stop_loop,
|
|
|
|
target_residency, exit_latency,
|
powernv: Pass PSSCR value and mask to power9_idle_stop
The power9_idle_stop method currently takes only the requested stop
level as a parameter and picks up the rest of the PSSCR bits from a
hand-coded macro. This is not a very flexible design, especially when
the firmware has the capability to communicate the psscr value and the
mask associated with a particular stop state via device tree.
This patch modifies the power9_idle_stop API to take as parameters the
PSSCR value and the PSSCR mask corresponding to the stop state that
needs to be set. These PSSCR value and mask are respectively obtained
by parsing the "ibm,cpu-idle-state-psscr" and
"ibm,cpu-idle-state-psscr-mask" fields from the device tree.
In addition to this, the patch adds support for handling stop states
for which ESL and EC bits in the PSSCR are zero. As per the
architecture, a wakeup from these stop states resumes execution from
the subsequent instruction as opposed to waking up at the System
Vector.
The older firmware sets only the Requested Level (RL) field in the
psscr and psscr-mask exposed in the device tree. For older firmware
where psscr-mask=0xf, this patch will set the default sane values that
the set for for remaining PSSCR fields (i.e PSLL, MTL, ESL, EC, and
TR). For the new firmware, the patch will validate that the invariants
required by the ISA for the psscr values are maintained by the
firmware.
This skiboot patch that exports fully populated PSSCR values and the
mask for all the stop states can be found here:
https://lists.ozlabs.org/pipermail/skiboot/2016-September/004869.html
[Optimize the number of instructions before entering STOP with
ESL=EC=0, validate the PSSCR values provided by the firimware
maintains the invariants required as per the ISA suggested by Balbir
Singh]
Acked-by: Balbir Singh <bsingharora@gmail.com>
Signed-off-by: Gautham R. Shenoy <ego@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2017-01-25 16:36:28 +08:00
|
|
|
psscr_val[i], psscr_mask[i]);
|
2014-02-26 08:09:20 +08:00
|
|
|
}
|
2015-06-24 14:48:01 +08:00
|
|
|
#endif
|
2015-02-18 13:34:17 +08:00
|
|
|
nr_idle_states++;
|
2014-02-26 08:09:20 +08:00
|
|
|
}
|
2015-02-18 13:34:17 +08:00
|
|
|
out:
|
2014-02-26 08:09:20 +08:00
|
|
|
return nr_idle_states;
|
|
|
|
}
|
|
|
|
|
2014-01-14 19:02:40 +08:00
|
|
|
/*
|
|
|
|
* powernv_idle_probe()
|
|
|
|
* Choose state table for shared versus dedicated partition
|
|
|
|
*/
|
|
|
|
static int powernv_idle_probe(void)
|
|
|
|
{
|
|
|
|
if (cpuidle_disable != IDLE_NO_OVERRIDE)
|
|
|
|
return -ENODEV;
|
|
|
|
|
2015-12-09 14:18:20 +08:00
|
|
|
if (firmware_has_feature(FW_FEATURE_OPAL)) {
|
2014-01-14 19:02:40 +08:00
|
|
|
cpuidle_state_table = powernv_states;
|
2014-02-26 08:09:20 +08:00
|
|
|
/* Device tree can indicate more idle states */
|
|
|
|
max_idle_state = powernv_add_idle_states();
|
2015-06-18 19:23:11 +08:00
|
|
|
if (max_idle_state > 1) {
|
|
|
|
snooze_timeout_en = true;
|
|
|
|
snooze_timeout = powernv_states[1].target_residency *
|
|
|
|
tb_ticks_per_usec;
|
|
|
|
}
|
2014-01-14 19:02:40 +08:00
|
|
|
} else
|
|
|
|
return -ENODEV;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int __init powernv_processor_idle_init(void)
|
|
|
|
{
|
|
|
|
int retval;
|
|
|
|
|
|
|
|
retval = powernv_idle_probe();
|
|
|
|
if (retval)
|
|
|
|
return retval;
|
|
|
|
|
|
|
|
powernv_cpuidle_driver_init();
|
|
|
|
retval = cpuidle_register(&powernv_idle_driver, NULL);
|
|
|
|
if (retval) {
|
|
|
|
printk(KERN_DEBUG "Registration of powernv driver failed.\n");
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
2016-08-24 17:12:59 +08:00
|
|
|
retval = cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN,
|
|
|
|
"cpuidle/powernv:online",
|
|
|
|
powernv_cpuidle_cpu_online, NULL);
|
|
|
|
WARN_ON(retval < 0);
|
|
|
|
retval = cpuhp_setup_state_nocalls(CPUHP_CPUIDLE_DEAD,
|
|
|
|
"cpuidle/powernv:dead", NULL,
|
|
|
|
powernv_cpuidle_cpu_dead);
|
|
|
|
WARN_ON(retval < 0);
|
2014-01-14 19:02:40 +08:00
|
|
|
printk(KERN_DEBUG "powernv_idle_driver registered\n");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
device_initcall(powernv_processor_idle_init);
|