* [PATCH 0/2] powernv:stop: Use psscr_val,mask provided by firmware @ 2016-09-29 7:05 Gautham R. Shenoy 2016-09-29 7:05 ` [PATCH 1/2] powernv:idle: Add IDLE_STATE_ENTER_SEQ_NORET macro Gautham R. Shenoy 2016-09-29 7:05 ` [PATCH 2/2] powernv: Pass PSSCR value and mask to power9_idle_stop Gautham R. Shenoy 0 siblings, 2 replies; 9+ messages in thread From: Gautham R. Shenoy @ 2016-09-29 7:05 UTC (permalink / raw) To: Benjamin Herrenschmidt, Paul Mackerras, Rafael J. Wysocki, Daniel Lezcano, Michael Neuling, Michael Ellerman, Vaidyanathan Srinivasan, Shreyas B. Prabhu, Balbir Singh, Shilpasri G Bhat Cc: linuxppc-dev, linux-kernel, linux-pm, Gautham R. Shenoy From: "Gautham R. Shenoy" <ego@linux.vnet.ibm.com> Hi, In the current implementation, the code for ISA v3.0 stop implementation has a couple of shortcomings. a) The code hand-codes the values for ESL,EC,TR,MTL bits of PSSCR and uses only the RL field from the firmware. While this is not incorrect, since the hand-coded values are legitimate, it is not a very flexible design since the firmware has the capability to communicate these values via the "ibm,cpu-idle-state-psscr" and "ibm,cpu-idle-state-psscr-mask" properties. In case where the firmware provides values for these fields that is different from the hand-coded values, the current code will not work as intended. b) Due to issue a), the current code assumes that ESL=EC=1 for all the stop states and hence the wakeup from the stop instruction will happen at 0x100, the system-reset vector. However, the ISA v3.0 allows the ESL=EC=0 behaviour where the corresponding stop-state loses no state and wakes up from the subsequent instruction. The current code doesn't handle this case. This patch series addresses these issues. The first patch in the series renames the existing IDLE_STATE_ENTER_SEQ macro to IDLE_STATE_ENTER_SEQ_NORET. It reuses the name IDLE_STATE_ENTER_SEQ for entering into stop-states which wake up at the subsequent instruction. The second patch in the series fixes issues a) and b) by ensuring that the psscr-value and the psscr-mask provided by the firmware are what will be used to set a particular stop state. It also adds support for handling wake-up from stop states which were entered with ESL=EC=0. These patches depend on the following skiboot patch that exports the PSSCR values and the mask for all the stop states: https://lists.ozlabs.org/pipermail/skiboot/2016-September/004869.html Gautham R. Shenoy (2): powernv:idle: Add IDLE_STATE_ENTER_SEQ_NORET macro powernv: Pass PSSCR value and mask to power9_idle_stop arch/powerpc/include/asm/cpuidle.h | 5 ++- arch/powerpc/include/asm/processor.h | 3 +- arch/powerpc/kernel/exceptions-64s.S | 6 +-- arch/powerpc/kernel/idle_book3s.S | 41 ++++++++++------- arch/powerpc/platforms/powernv/idle.c | 76 +++++++++++++++++++++++++++----- arch/powerpc/platforms/powernv/powernv.h | 3 +- arch/powerpc/platforms/powernv/smp.c | 7 +-- drivers/cpuidle/cpuidle-powernv.c | 30 ++++++++++--- 8 files changed, 127 insertions(+), 44 deletions(-) -- 1.9.4 ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/2] powernv:idle: Add IDLE_STATE_ENTER_SEQ_NORET macro 2016-09-29 7:05 [PATCH 0/2] powernv:stop: Use psscr_val,mask provided by firmware Gautham R. Shenoy @ 2016-09-29 7:05 ` Gautham R. Shenoy 2016-09-29 7:05 ` [PATCH 2/2] powernv: Pass PSSCR value and mask to power9_idle_stop Gautham R. Shenoy 1 sibling, 0 replies; 9+ messages in thread From: Gautham R. Shenoy @ 2016-09-29 7:05 UTC (permalink / raw) To: Benjamin Herrenschmidt, Paul Mackerras, Rafael J. Wysocki, Daniel Lezcano, Michael Neuling, Michael Ellerman, Vaidyanathan Srinivasan, Shreyas B. Prabhu, Balbir Singh, Shilpasri G Bhat Cc: linuxppc-dev, linux-kernel, linux-pm, Gautham R. Shenoy From: "Gautham R. Shenoy" <ego@linux.vnet.ibm.com> Currently all the low-power idle states are expected to wake up at reset vector 0x100. Which is why the macro IDLE_STATE_ENTER_SEQ that puts the CPU to an idle state and never returns. On ISA_300, when the ESL and EC bits in the PSSCR are zero, the CPU is expected to wake up at the next instruction of the idle instruction. This patch adds a new macro named IDLE_STATE_ENTER_SEQ_NORET for the no-return variant and reuses the name IDLE_STATE_ENTER_SEQ for a variant that allows resuming operation at the instruction next to the idle-instruction. Signed-off-by: Gautham R. Shenoy <ego@linux.vnet.ibm.com> --- arch/powerpc/include/asm/cpuidle.h | 5 ++++- arch/powerpc/kernel/exceptions-64s.S | 6 +++--- arch/powerpc/kernel/idle_book3s.S | 10 +++++----- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/arch/powerpc/include/asm/cpuidle.h b/arch/powerpc/include/asm/cpuidle.h index 01b8a13..9fd23f6 100644 --- a/arch/powerpc/include/asm/cpuidle.h +++ b/arch/powerpc/include/asm/cpuidle.h @@ -21,7 +21,7 @@ extern u64 pnv_first_deep_stop_state; /* Idle state entry routines */ #ifdef CONFIG_PPC_P7_NAP -#define IDLE_STATE_ENTER_SEQ(IDLE_INST) \ +#define IDLE_STATE_ENTER_SEQ(IDLE_INST) \ /* Magic NAP/SLEEP/WINKLE mode enter sequence */ \ std r0,0(r1); \ ptesync; \ @@ -29,6 +29,9 @@ extern u64 pnv_first_deep_stop_state; 1: cmp cr0,r0,r0; \ bne 1b; \ IDLE_INST; \ + +#define IDLE_STATE_ENTER_SEQ_NORET(IDLE_INST) \ + IDLE_STATE_ENTER_SEQ(IDLE_INST) \ b . #endif /* CONFIG_PPC_P7_NAP */ diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index bffec73..238307d 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -1301,12 +1301,12 @@ machine_check_handle_early: lbz r3,PACA_THREAD_IDLE_STATE(r13) cmpwi r3,PNV_THREAD_NAP bgt 10f - IDLE_STATE_ENTER_SEQ(PPC_NAP) + IDLE_STATE_ENTER_SEQ_NORET(PPC_NAP) /* No return */ 10: cmpwi r3,PNV_THREAD_SLEEP bgt 2f - IDLE_STATE_ENTER_SEQ(PPC_SLEEP) + IDLE_STATE_ENTER_SEQ_NORET(PPC_SLEEP) /* No return */ 2: @@ -1320,7 +1320,7 @@ machine_check_handle_early: */ ori r13,r13,1 SET_PACA(r13) - IDLE_STATE_ENTER_SEQ(PPC_WINKLE) + IDLE_STATE_ENTER_SEQ_NORET(PPC_WINKLE) /* No return */ 4: #endif diff --git a/arch/powerpc/kernel/idle_book3s.S b/arch/powerpc/kernel/idle_book3s.S index bd739fe..32d666b 100644 --- a/arch/powerpc/kernel/idle_book3s.S +++ b/arch/powerpc/kernel/idle_book3s.S @@ -188,7 +188,7 @@ pnv_enter_arch207_idle_mode: stb r3,PACA_THREAD_IDLE_STATE(r13) cmpwi cr3,r3,PNV_THREAD_SLEEP bge cr3,2f - IDLE_STATE_ENTER_SEQ(PPC_NAP) + IDLE_STATE_ENTER_SEQ_NORET(PPC_NAP) /* No return */ 2: /* Sleep or winkle */ @@ -222,7 +222,7 @@ pnv_fastsleep_workaround_at_entry: common_enter: /* common code for all the threads entering sleep or winkle */ bgt cr3,enter_winkle - IDLE_STATE_ENTER_SEQ(PPC_SLEEP) + IDLE_STATE_ENTER_SEQ_NORET(PPC_SLEEP) fastsleep_workaround_at_entry: ori r15,r15,PNV_CORE_IDLE_LOCK_BIT @@ -244,7 +244,7 @@ fastsleep_workaround_at_entry: enter_winkle: bl save_sprs_to_stack - IDLE_STATE_ENTER_SEQ(PPC_WINKLE) + IDLE_STATE_ENTER_SEQ_NORET(PPC_WINKLE) /* * r3 - requested stop state @@ -257,7 +257,7 @@ power_enter_stop: ld r4,ADDROFF(pnv_first_deep_stop_state)(r5) cmpd r3,r4 bge 2f - IDLE_STATE_ENTER_SEQ(PPC_STOP) + IDLE_STATE_ENTER_SEQ_NORET(PPC_STOP) 2: /* * Entering deep idle state. @@ -279,7 +279,7 @@ lwarx_loop_stop: bl save_sprs_to_stack - IDLE_STATE_ENTER_SEQ(PPC_STOP) + IDLE_STATE_ENTER_SEQ_NORET(PPC_STOP) _GLOBAL(power7_idle) /* Now check if user or arch enabled NAP mode */ -- 1.9.4 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/2] powernv: Pass PSSCR value and mask to power9_idle_stop 2016-09-29 7:05 [PATCH 0/2] powernv:stop: Use psscr_val,mask provided by firmware Gautham R. Shenoy 2016-09-29 7:05 ` [PATCH 1/2] powernv:idle: Add IDLE_STATE_ENTER_SEQ_NORET macro Gautham R. Shenoy @ 2016-09-29 7:05 ` Gautham R. Shenoy 2016-10-04 10:32 ` Michael Ellerman 1 sibling, 1 reply; 9+ messages in thread From: Gautham R. Shenoy @ 2016-09-29 7:05 UTC (permalink / raw) To: Benjamin Herrenschmidt, Paul Mackerras, Rafael J. Wysocki, Daniel Lezcano, Michael Neuling, Michael Ellerman, Vaidyanathan Srinivasan, Shreyas B. Prabhu, Balbir Singh, Shilpasri G Bhat Cc: linuxppc-dev, linux-kernel, linux-pm, Gautham R. Shenoy From: "Gautham R. Shenoy" <ego@linux.vnet.ibm.com> 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. This patch depends on the following skiboot patch that exports the PSSCR values and the mask for all the stop states: https://lists.ozlabs.org/pipermail/skiboot/2016-September/004869.html Signed-off-by: Gautham R. Shenoy <ego@linux.vnet.ibm.com> --- arch/powerpc/include/asm/processor.h | 3 +- arch/powerpc/kernel/idle_book3s.S | 31 ++++++++----- arch/powerpc/platforms/powernv/idle.c | 76 +++++++++++++++++++++++++++----- arch/powerpc/platforms/powernv/powernv.h | 3 +- arch/powerpc/platforms/powernv/smp.c | 7 +-- drivers/cpuidle/cpuidle-powernv.c | 30 ++++++++++--- 6 files changed, 115 insertions(+), 35 deletions(-) diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h index 68e3bf5..4ead497 100644 --- a/arch/powerpc/include/asm/processor.h +++ b/arch/powerpc/include/asm/processor.h @@ -460,7 +460,8 @@ extern int powersave_nap; /* set if nap mode can be used in idle loop */ extern unsigned long power7_nap(int check_irq); extern unsigned long power7_sleep(void); extern unsigned long power7_winkle(void); -extern unsigned long power9_idle_stop(unsigned long stop_level); +extern unsigned long power9_idle_stop(unsigned long stop_psscr_val, + unsigned long stop_psscr_mask); extern void flush_instruction_cache(void); extern void hard_reset_now(void); diff --git a/arch/powerpc/kernel/idle_book3s.S b/arch/powerpc/kernel/idle_book3s.S index 32d666b..9f77cd4 100644 --- a/arch/powerpc/kernel/idle_book3s.S +++ b/arch/powerpc/kernel/idle_book3s.S @@ -40,9 +40,7 @@ #define _WORC GPR11 #define _PTCR GPR12 -#define PSSCR_HV_TEMPLATE PSSCR_ESL | PSSCR_EC | \ - PSSCR_PSLL_MASK | PSSCR_TR_MASK | \ - PSSCR_MTL_MASK +#define PSSCR_EC_ESL_MASK_SHIFTED (PSSCR_EC | PSSCR_ESL) >> 16 .text @@ -247,13 +245,23 @@ enter_winkle: IDLE_STATE_ENTER_SEQ_NORET(PPC_WINKLE) /* - * r3 - requested stop state + * r3 - PSSCR value corresponding to the requested stop state. */ power_enter_stop: /* + * Check if we are executing the lite variant with ESL=EC=0 + */ + andis. r4, r3, PSSCR_EC_ESL_MASK_SHIFTED + andi. r3, r3, PSSCR_RL_MASK /* r3 = requested stop state */ + cmpdi r4, 0 + bne 1f + IDLE_STATE_ENTER_SEQ(PPC_STOP) + li r3,0 /* Since we didn't lose state, return 0 */ + b pnv_wakeup_noloss +/* * Check if the requested state is a deep idle state. */ - LOAD_REG_ADDRBASE(r5,pnv_first_deep_stop_state) +1: LOAD_REG_ADDRBASE(r5,pnv_first_deep_stop_state) ld r4,ADDROFF(pnv_first_deep_stop_state)(r5) cmpd r3,r4 bge 2f @@ -330,16 +338,17 @@ ALT_FTR_SECTION_END_NESTED_IFSET(CPU_FTR_ARCH_207S, 66); \ ld r3,ORIG_GPR3(r1); /* Restore original r3 */ \ 20: nop; - /* - * r3 - requested stop state + * r3 - The PSSCR value corresponding to the stop state. + * r4 - The PSSCR mask corrresonding to the stop state. */ _GLOBAL(power9_idle_stop) - LOAD_REG_IMMEDIATE(r4, PSSCR_HV_TEMPLATE) - or r4,r4,r3 - mtspr SPRN_PSSCR, r4 - li r4, 1 + mfspr r5, SPRN_PSSCR + andc r5, r5, r4 + or r3, r3, r5 + mtspr SPRN_PSSCR, r3 LOAD_REG_ADDR(r5,power_enter_stop) + li r4, 1 b pnv_powersave_common /* No return */ /* diff --git a/arch/powerpc/platforms/powernv/idle.c b/arch/powerpc/platforms/powernv/idle.c index 479c256..575f2aa 100644 --- a/arch/powerpc/platforms/powernv/idle.c +++ b/arch/powerpc/platforms/powernv/idle.c @@ -237,15 +237,21 @@ static DEVICE_ATTR(fastsleep_workaround_applyonce, 0600, show_fastsleep_workaround_applyonce, store_fastsleep_workaround_applyonce); +/* + * The default stop state that will be used by ppc_md.power_save + * function on platforms that support stop instruction. + */ +u64 pnv_default_stop_val; +u64 pnv_default_stop_mask; /* * Used for ppc_md.power_save which needs a function with no parameters */ static void power9_idle(void) { - /* Requesting stop state 0 */ - power9_idle_stop(0); + power9_idle_stop(pnv_default_stop_val, pnv_default_stop_mask); } + /* * First deep stop state. Used to figure out when to save/restore * hypervisor context. @@ -253,9 +259,11 @@ static void power9_idle(void) u64 pnv_first_deep_stop_state = MAX_STOP_STATE; /* - * Deepest stop idle state. Used when a cpu is offlined + * psscr value and mask of the deepest stop idle state. + * Used when a cpu is offlined. */ -u64 pnv_deepest_stop_state; +u64 pnv_deepest_stop_psscr_val; +u64 pnv_deepest_stop_psscr_mask; /* * Power ISA 3.0 idle initialization. @@ -302,28 +310,61 @@ static int __init pnv_arch300_idle_init(struct device_node *np, u32 *flags, int dt_idle_states) { u64 *psscr_val = NULL; + u64 *psscr_mask = NULL; + u32 *residency_ns = NULL; + u64 max_residency_ns = 0; int rc = 0, i; + bool default_stop_found = false; psscr_val = kcalloc(dt_idle_states, sizeof(*psscr_val), GFP_KERNEL); - if (!psscr_val) { + psscr_mask = kcalloc(dt_idle_states, sizeof(*psscr_mask), + GFP_KERNEL); + residency_ns = kcalloc(dt_idle_states, sizeof(*residency_ns), + GFP_KERNEL); + + if (!psscr_val || !psscr_mask || !residency_ns) { rc = -1; goto out; } + if (of_property_read_u64_array(np, "ibm,cpu-idle-state-psscr", psscr_val, dt_idle_states)) { - pr_warn("cpuidle-powernv: missing ibm,cpu-idle-states-psscr in DT\n"); + pr_warn("cpuidle-powernv: missing ibm,cpu-idle-state-psscr in DT\n"); + rc = -1; + goto out; + } + + if (of_property_read_u64_array(np, + "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"); rc = -1; goto out; } + if (of_property_read_u32_array(np, + "ibm,cpu-idle-state-residency-ns", + residency_ns, dt_idle_states)) { + pr_warn("cpuidle-powernv: missing ibm,cpu-idle-state-residency-ns in DT\n"); + rc = -1; + goto out; + + } + /* - * Set pnv_first_deep_stop_state and pnv_deepest_stop_state. + * Set pnv_first_deep_stop_state, pnv_deepest_stop_psscr_{val,mask}, + * and the pnv_default_stop_{val,mask}. + * * pnv_first_deep_stop_state should be set to the first stop * level to cause hypervisor state loss. - * pnv_deepest_stop_state should be set to the deepest stop - * stop state. + * + * pnv_deepest_stop_{val,mask} should be set to values corresponding to + * the deepest stop state. + * + * pnv_default_stop_{val,mask} should be set to values corresponding to + * the shallowest (OPAL_PM_STOP_INST_FAST) loss-less stop state. */ pnv_first_deep_stop_state = MAX_STOP_STATE; for (i = 0; i < dt_idle_states; i++) { @@ -333,12 +374,23 @@ static int __init pnv_arch300_idle_init(struct device_node *np, u32 *flags, (pnv_first_deep_stop_state > psscr_rl)) pnv_first_deep_stop_state = psscr_rl; - if (pnv_deepest_stop_state < psscr_rl) - pnv_deepest_stop_state = psscr_rl; - } + if (max_residency_ns < residency_ns[i]) { + max_residency_ns = residency_ns[i]; + pnv_deepest_stop_psscr_val = psscr_val[i]; + pnv_deepest_stop_psscr_mask = psscr_mask[i]; + } + if (!default_stop_found && + (flags[i] & OPAL_PM_STOP_INST_FAST)) { + pnv_default_stop_val = psscr_val[i]; + pnv_default_stop_mask = psscr_mask[i]; + default_stop_found = true; + } + } out: kfree(psscr_val); + kfree(psscr_mask); + kfree(residency_ns); return rc; } diff --git a/arch/powerpc/platforms/powernv/powernv.h b/arch/powerpc/platforms/powernv/powernv.h index da7c843..6130522 100644 --- a/arch/powerpc/platforms/powernv/powernv.h +++ b/arch/powerpc/platforms/powernv/powernv.h @@ -18,7 +18,8 @@ static inline void pnv_pci_shutdown(void) { } #endif extern u32 pnv_get_supported_cpuidle_states(void); -extern u64 pnv_deepest_stop_state; +extern u64 pnv_deepest_stop_psscr_val; +extern u64 pnv_deepest_stop_psscr_mask; extern void pnv_lpc_init(void); diff --git a/arch/powerpc/platforms/powernv/smp.c b/arch/powerpc/platforms/powernv/smp.c index c789258..55c4aaa 100644 --- a/arch/powerpc/platforms/powernv/smp.c +++ b/arch/powerpc/platforms/powernv/smp.c @@ -182,9 +182,10 @@ static void pnv_smp_cpu_kill_self(void) ppc64_runlatch_off(); - if (cpu_has_feature(CPU_FTR_ARCH_300)) - srr1 = power9_idle_stop(pnv_deepest_stop_state); - else if (idle_states & OPAL_PM_WINKLE_ENABLED) + if (cpu_has_feature(CPU_FTR_ARCH_300)) { + srr1 = power9_idle_stop(pnv_deepest_stop_psscr_val, + pnv_deepest_stop_psscr_mask); + } else if (idle_states & OPAL_PM_WINKLE_ENABLED) srr1 = power7_winkle(); else if ((idle_states & OPAL_PM_SLEEP_ENABLED) || (idle_states & OPAL_PM_SLEEP_ENABLED_ER1)) diff --git a/drivers/cpuidle/cpuidle-powernv.c b/drivers/cpuidle/cpuidle-powernv.c index f7ca891..6f2bee0 100644 --- a/drivers/cpuidle/cpuidle-powernv.c +++ b/drivers/cpuidle/cpuidle-powernv.c @@ -30,7 +30,11 @@ struct cpuidle_driver powernv_idle_driver = { static int max_idle_state; static struct cpuidle_state *cpuidle_state_table; -static u64 stop_psscr_table[CPUIDLE_STATE_MAX]; +struct stop_psscr_table { + u64 val; + u64 mask; +}; +static struct stop_psscr_table stop_psscr_table[CPUIDLE_STATE_MAX]; static u64 snooze_timeout; static bool snooze_timeout_en; @@ -102,7 +106,8 @@ static int stop_loop(struct cpuidle_device *dev, int index) { ppc64_runlatch_off(); - power9_idle_stop(stop_psscr_table[index]); + power9_idle_stop(stop_psscr_table[index].val, + stop_psscr_table[index].mask); ppc64_runlatch_on(); return index; } @@ -186,6 +191,7 @@ static int powernv_add_idle_states(void) u32 residency_ns[CPUIDLE_STATE_MAX]; u32 flags[CPUIDLE_STATE_MAX]; u64 psscr_val[CPUIDLE_STATE_MAX]; + u64 psscr_mask[CPUIDLE_STATE_MAX]; const char *names[CPUIDLE_STATE_MAX]; int i, rc; @@ -233,14 +239,22 @@ static int powernv_add_idle_states(void) /* * If the idle states use stop instruction, probe for psscr values - * which are necessary to specify required stop level. + * and psscr mask which are necessary to specify required stop level. */ - if (flags[0] & (OPAL_PM_STOP_INST_FAST | OPAL_PM_STOP_INST_DEEP)) + if (flags[0] & (OPAL_PM_STOP_INST_FAST | OPAL_PM_STOP_INST_DEEP)) { if (of_property_read_u64_array(power_mgt, "ibm,cpu-idle-state-psscr", psscr_val, dt_idle_states)) { - pr_warn("cpuidle-powernv: missing ibm,cpu-idle-states-psscr in DT\n"); + pr_warn("cpuidle-powernv: missing ibm,cpu-idle-state-psscr in DT\n"); + goto out; + } + + 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; } + } rc = of_property_read_u32_array(power_mgt, "ibm,cpu-idle-state-residency-ns", residency_ns, dt_idle_states); @@ -274,7 +288,8 @@ static int powernv_add_idle_states(void) powernv_states[nr_idle_states].flags = 0; powernv_states[nr_idle_states].enter = stop_loop; - stop_psscr_table[nr_idle_states] = psscr_val[i]; + stop_psscr_table[nr_idle_states].val = psscr_val[i]; + stop_psscr_table[nr_idle_states].mask = psscr_mask[i]; } /* @@ -299,7 +314,8 @@ static int powernv_add_idle_states(void) powernv_states[nr_idle_states].flags = CPUIDLE_FLAG_TIMER_STOP; powernv_states[nr_idle_states].enter = stop_loop; - stop_psscr_table[nr_idle_states] = psscr_val[i]; + stop_psscr_table[nr_idle_states].val = psscr_val[i]; + stop_psscr_table[nr_idle_states].mask = psscr_mask[i]; } #endif powernv_states[nr_idle_states].exit_latency = -- 1.9.4 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] powernv: Pass PSSCR value and mask to power9_idle_stop 2016-09-29 7:05 ` [PATCH 2/2] powernv: Pass PSSCR value and mask to power9_idle_stop Gautham R. Shenoy @ 2016-10-04 10:32 ` Michael Ellerman 2016-10-04 11:33 ` Balbir Singh 0 siblings, 1 reply; 9+ messages in thread From: Michael Ellerman @ 2016-10-04 10:32 UTC (permalink / raw) To: Gautham R. Shenoy, Stewart Smith, skiboot Cc: Benjamin Herrenschmidt, Paul Mackerras, Rafael J. Wysocki, Daniel Lezcano, Michael Neuling, Vaidyanathan Srinivasan, Shreyas B. Prabhu, Balbir Singh, Shilpasri G Bhat, linuxppc-dev, linux-kernel, linux-pm, Gautham R. Shenoy "Gautham R. Shenoy" <ego@linux.vnet.ibm.com> writes: > From: "Gautham R. Shenoy" <ego@linux.vnet.ibm.com> > > 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. That looks good. > This patch depends on the following skiboot patch that exports the > PSSCR values and the mask for all the stop states: > https://lists.ozlabs.org/pipermail/skiboot/2016-September/004869.html But we can't depend on a skiboot patch. The kernel has to cope with running on an old skiboot. I realise this is for Power9, and we haven't shipped any of them yet. But skiboot has had Power9 support since May, so I don't think we want to declare that all of those skiboot versions are unsupported because of this. So is there any way we can make this work on skiboot versions that don't have the patch above? cheers ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] powernv: Pass PSSCR value and mask to power9_idle_stop 2016-10-04 10:32 ` Michael Ellerman @ 2016-10-04 11:33 ` Balbir Singh 2016-10-07 7:20 ` Gautham R Shenoy 0 siblings, 1 reply; 9+ messages in thread From: Balbir Singh @ 2016-10-04 11:33 UTC (permalink / raw) To: Michael Ellerman, Gautham R. Shenoy, Stewart Smith, skiboot@lists.ozlabs.org Cc: Benjamin Herrenschmidt, Paul Mackerras, Rafael J. Wysocki, Daniel Lezcano, Michael Neuling, Vaidyanathan Srinivasan, Shreyas B. Prabhu, Shilpasri G Bhat, linuxppc-dev, linux-kernel, linux-pm On 04/10/16 21:32, Michael Ellerman wrote: > "Gautham R. Shenoy" <ego@linux.vnet.ibm.com> writes: > >> From: "Gautham R. Shenoy" <ego@linux.vnet.ibm.com> >> >> 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. > > That looks good. > >> This patch depends on the following skiboot patch that exports the >> PSSCR values and the mask for all the stop states: >> https://lists.ozlabs.org/pipermail/skiboot/2016-September/004869.html > > But we can't depend on a skiboot patch. The kernel has to cope with > running on an old skiboot. Hi, Michael I think with an older skiboot the flags don't get exported and the new cpuidle (stop state) does not get discovered. I don't think there is any breakage. Gautham am I missing something? Balbir Singh. ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] powernv: Pass PSSCR value and mask to power9_idle_stop 2016-10-04 11:33 ` Balbir Singh @ 2016-10-07 7:20 ` Gautham R Shenoy 2016-10-12 5:35 ` Stewart Smith 0 siblings, 1 reply; 9+ messages in thread From: Gautham R Shenoy @ 2016-10-07 7:20 UTC (permalink / raw) To: Balbir Singh Cc: Michael Ellerman, Gautham R. Shenoy, Stewart Smith, skiboot@lists.ozlabs.org, Benjamin Herrenschmidt, Paul Mackerras, Rafael J. Wysocki, Daniel Lezcano, Michael Neuling, Vaidyanathan Srinivasan, Shreyas B. Prabhu, Shilpasri G Bhat, linuxppc-dev, linux-kernel, linux-pm Hi Balbir, Michael, On Tue, Oct 04, 2016 at 10:33:27PM +1100, Balbir Singh wrote: > > > On 04/10/16 21:32, Michael Ellerman wrote: > > "Gautham R. Shenoy" <ego@linux.vnet.ibm.com> writes: > > > >> From: "Gautham R. Shenoy" <ego@linux.vnet.ibm.com> > >> > >> 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. > > > > That looks good. > > > >> This patch depends on the following skiboot patch that exports the > >> PSSCR values and the mask for all the stop states: > >> https://lists.ozlabs.org/pipermail/skiboot/2016-September/004869.html > > > > But we can't depend on a skiboot patch. The kernel has to cope with > > running on an old skiboot. > Hmm.. We can still do that. The older skiboot only provides the RL field of the PSSCR value for each stop state and the corresponding PSSCR mask is set to 0xF in the older skiboot for all the stop states. We can insist that the future skiboot sets the ESL, EC, PSLL, TR, MTL and the the RL fields of the PSSCR for any exported stop state. This should be reflected in the psscr_mask of that stop state. Thus, the psscr_mask of any stop state proposed in the future will have: (PSSCR_ESL_MASK | PSCCR_EC_MASK | PSCCR_PSLL_MASK | PSSCR_TR_MASK | PSSCR_MTL_MASK | PSSCR_RL_MASK) bits set in the skiboot. To handle the older firmware, we can do something like the following during the discovery of the stop states to mimic the behaviour present in the 4.8 kernel running on older firmware. =============== drivers/cpuidle/cpuidle-powernv.c ======================= /* * By default we set the ESL and EC bits in the PSSCR. * The MTL and PSLL are set to the maximum value possible as per the * ISA, i.e 15. * The Transition Rate is set to the Maximum value 3. */ #define DEFAULT_PSSCR_VAL PSSCR_ESL_MASK | \ PSCCR_EC_MASK | PSCCR_PSLL_MASK |\ PSSCR_TR_MASK | PSSCR_MTL_MASK #define DEFAULT_PSSCR_MASK PSSCR_ESL_MASK | \ PSCCR_EC_MASK | PSCCR_PSLL_MASK |\ PSSCR_TR_MASK | PSSCR_MTL_MASK | \ PSSCR_RL_MASK static int powernv_add_idle_states(void) { . . . for (i = 0; i < dt_idle_states; i++) { u64 val, mask; . . . val = (DEFAULT_PSSCR_VAL & ~psscr_mask[i]) | psscr_val[i]; mask = DEFAULT_PSSCR_MASK | psscr_mask[i]; stop_psscr_table[nr_idle_states].val = val; stop_psscr_table[nr_idle_states].mask = mask; } } ============================================================================ Is this approach ok ? > Hi, Michael > > I think with an older skiboot the flags don't get exported and the > new cpuidle (stop state) does not get discovered. I don't think there > is any breakage. Gautham am I missing something? In the second verison of the patch, I am not adding any new flags in the skiboot, but explicitly providing the psscr_value and psscr_mask for each stop state. Thus if you see the v2 of the skiboot patch, the lite versions of stop0,stop1 and stop2 are defined with no additional flags. The second version of the kernel patch wouldn't then work with the older skiboot since the older skiboot exports only the RL field of the psscr_val while the new kernel patch expects all the relavant bits of the psscr_val be set. This would result in a breakage. > > Balbir Singh. > -- Thanks and Regards gautham. ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] powernv: Pass PSSCR value and mask to power9_idle_stop 2016-10-07 7:20 ` Gautham R Shenoy @ 2016-10-12 5:35 ` Stewart Smith 2016-10-13 11:23 ` Gautham R Shenoy 0 siblings, 1 reply; 9+ messages in thread From: Stewart Smith @ 2016-10-12 5:35 UTC (permalink / raw) To: Gautham R Shenoy, Balbir Singh Cc: Michael Ellerman, Gautham R. Shenoy, skiboot@lists.ozlabs.org, Benjamin Herrenschmidt, Paul Mackerras, Rafael J. Wysocki, Daniel Lezcano, Michael Neuling, Vaidyanathan Srinivasan, Shreyas B. Prabhu, Shilpasri G Bhat, linuxppc-dev, linux-kernel, linux-pm Gautham R Shenoy <ego@linux.vnet.ibm.com> writes: > On Tue, Oct 04, 2016 at 10:33:27PM +1100, Balbir Singh wrote: >> >> >> On 04/10/16 21:32, Michael Ellerman wrote: >> > "Gautham R. Shenoy" <ego@linux.vnet.ibm.com> writes: >> > >> >> From: "Gautham R. Shenoy" <ego@linux.vnet.ibm.com> >> >> >> >> 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. >> > >> > That looks good. >> > >> >> This patch depends on the following skiboot patch that exports the >> >> PSSCR values and the mask for all the stop states: >> >> https://lists.ozlabs.org/pipermail/skiboot/2016-September/004869.html >> > >> > But we can't depend on a skiboot patch. The kernel has to cope with >> > running on an old skiboot. >> > > Hmm.. We can still do that. The older skiboot only provides the RL > field of the PSSCR value for each stop state and the corresponding > PSSCR mask is set to 0xF in the older skiboot for all the stop states. > > We can insist that the future skiboot sets the ESL, EC, PSLL, TR, MTL > and the the RL fields of the PSSCR for any exported stop state. This > should be reflected in the psscr_mask of that stop state. Thus, the > psscr_mask of any stop state proposed in the future will have: > (PSSCR_ESL_MASK | PSCCR_EC_MASK | PSCCR_PSLL_MASK | PSSCR_TR_MASK | > PSSCR_MTL_MASK | PSSCR_RL_MASK) bits set in the skiboot. > > To handle the older firmware, we can do something like the following > during the discovery of the stop states to mimic the behaviour present > in the 4.8 kernel running on older firmware. > > =============== drivers/cpuidle/cpuidle-powernv.c ======================= > /* > * By default we set the ESL and EC bits in the PSSCR. > * The MTL and PSLL are set to the maximum value possible as per the > * ISA, i.e 15. > * The Transition Rate is set to the Maximum value 3. > */ > #define DEFAULT_PSSCR_VAL PSSCR_ESL_MASK | \ > PSCCR_EC_MASK | PSCCR_PSLL_MASK |\ > PSSCR_TR_MASK | PSSCR_MTL_MASK > > #define DEFAULT_PSSCR_MASK PSSCR_ESL_MASK | \ > PSCCR_EC_MASK | PSCCR_PSLL_MASK |\ > PSSCR_TR_MASK | PSSCR_MTL_MASK | \ > PSSCR_RL_MASK > > > static int powernv_add_idle_states(void) > { > . > . > . > for (i = 0; i < dt_idle_states; i++) { > u64 val, mask; > . > . > . > val = (DEFAULT_PSSCR_VAL & ~psscr_mask[i]) | psscr_val[i]; > mask = DEFAULT_PSSCR_MASK | psscr_mask[i]; > stop_psscr_table[nr_idle_states].val = val; > stop_psscr_table[nr_idle_states].mask = mask; > } > } > ============================================================================ > > > Is this approach ok ? What if we just treat the 0xF state from firmware as special and set it to DEFAULT_PSSCR_MASK in that case? That deals with old skiboot, new kernel, and sets a pretty small special case that's easy to track into the future as something we should watch out for. Additionally, if we make skiboot set sane values in ~DEFAULT_PSSCR_MASK for valid fields in PSSCR on boot/(also kexec?), then we should end up in a situation where everything works with everything (even if you don't get the best power saving). Specifically, new skiboot, old kernel... but it looks like there's nothing currently missing there Should this patch also have Fixes: 3005c597ba4 and CC to stable? -- Stewart Smith OPAL Architect, IBM. ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] powernv: Pass PSSCR value and mask to power9_idle_stop 2016-10-12 5:35 ` Stewart Smith @ 2016-10-13 11:23 ` Gautham R Shenoy 0 siblings, 0 replies; 9+ messages in thread From: Gautham R Shenoy @ 2016-10-13 11:23 UTC (permalink / raw) To: Stewart Smith Cc: Gautham R Shenoy, Balbir Singh, Michael Ellerman, skiboot@lists.ozlabs.org, Benjamin Herrenschmidt, Paul Mackerras, Rafael J. Wysocki, Daniel Lezcano, Michael Neuling, Vaidyanathan Srinivasan, Shreyas B. Prabhu, Shilpasri G Bhat, linuxppc-dev, linux-kernel, linux-pm Hi Stewart, On Wed, Oct 12, 2016 at 04:35:35PM +1100, Stewart Smith wrote: > > What if we just treat the 0xF state from firmware as special and set it > to DEFAULT_PSSCR_MASK in that case? That deals with old skiboot, new > kernel, and sets a pretty small special case that's easy to track into > the future as something we should watch out for. Yes, that will work. I will use this approach in the next version. > > Additionally, if we make skiboot set sane values in ~DEFAULT_PSSCR_MASK > for valid fields in PSSCR on boot/(also kexec?), then > we should end up in a situation where everything works with everything > (even if you don't get the best power saving). Specifically, new > skiboot, old kernel... but it looks like there's nothing currently > missing there No we're not missing much there. From the code of the old kernel, I see that if we pass the psscr_val instead of just the RL to power9_idle_stop(), we end up saving all the SPRs in power_enter_stop() even if the psscr_val didn't correspond to a deep idle state. But that should be ok. > > Should this patch also have Fixes: 3005c597ba4 and CC to stable? Yes, thanks for pointing it out. I shall mark the next version to stable. > > -- > Stewart Smith > OPAL Architect, IBM. -- Thanks and Regards gautham. ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 0/2] powernv: Implement lite variant of stop with ESL=EC=0
@ 2016-09-16 9:47 Gautham R. Shenoy
2016-09-16 9:47 ` [PATCH 1/2] powernv:idle: Add IDLE_STATE_ENTER_SEQ_NORET macro Gautham R. Shenoy
0 siblings, 1 reply; 9+ messages in thread
From: Gautham R. Shenoy @ 2016-09-16 9:47 UTC (permalink / raw)
To: linuxppc-dev, linux-kernel
Cc: Vaidyanathan Srinivasan, Michael Ellerman, Shreyas B. Prabhu,
Michael Neuling, Shilpasri G Bhat, Gautham R. Shenoy
From: "Gautham R. Shenoy" <ego@linux.vnet.ibm.com>
Hi,
The Power ISA v3.0 allows us to execute the "stop" instruction with
ESL and EC of the PSSCR set to 0. This will ensure no loss of state,
and the wakeup from the stop will happen at an instruction following
the executed stop instruction.
This patchset adds support to run stop with ESL=EC=0 based on
a flag set for the corresponding stop state in the device tree.
The first patch renames the IDLE_STATE_ENTER_SEQ macro to
IDLE_STATE_ENTER_SEQ_NORET since the current users of this
macro expect the wakeup from stop to happen at the
System Reset vector. It reuses the name IDLE_STATE_ENTER_SEQ to a
variant where the wakeup from stop happens at the next instruction.
The second patch creates adds a new function (i.e, a lite variant)
that will execute a stop instruction with ESL=EC=0 and handle wakeup
at the subsequent instruction. A particular stop state is wired to
this new function if the device tree entry for that stop state has
OPAL_PM_WAKEUP_AT_NEXT_INST [1] flag set.
[1] : The corresponding patch in skiboot that defines
OPAL_PM_WAKEUP_AT_NEXT_INST and enables it in the device tree
can be found here:
https://lists.ozlabs.org/pipermail/skiboot/2016-September/004805.html
Gautham R. Shenoy (2):
powernv:idle: Add IDLE_STATE_ENTER_SEQ_NORET macro
powernv:idle:Implement lite variant of power_enter_stop
arch/powerpc/include/asm/cpuidle.h | 5 ++++-
arch/powerpc/include/asm/opal-api.h | 1 +
arch/powerpc/include/asm/processor.h | 3 ++-
arch/powerpc/kernel/exceptions-64s.S | 6 +++---
arch/powerpc/kernel/idle_book3s.S | 38 +++++++++++++++++++++++++++--------
arch/powerpc/platforms/powernv/idle.c | 17 +++++++++++++---
arch/powerpc/platforms/powernv/smp.c | 2 +-
drivers/cpuidle/cpuidle-powernv.c | 24 ++++++++++++++++++++--
8 files changed, 77 insertions(+), 19 deletions(-)
--
1.9.4
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 1/2] powernv:idle: Add IDLE_STATE_ENTER_SEQ_NORET macro 2016-09-16 9:47 [PATCH 0/2] powernv: Implement lite variant of stop with ESL=EC=0 Gautham R. Shenoy @ 2016-09-16 9:47 ` Gautham R. Shenoy 0 siblings, 0 replies; 9+ messages in thread From: Gautham R. Shenoy @ 2016-09-16 9:47 UTC (permalink / raw) To: linuxppc-dev, linux-kernel Cc: Vaidyanathan Srinivasan, Michael Ellerman, Shreyas B. Prabhu, Michael Neuling, Shilpasri G Bhat, Gautham R. Shenoy From: "Gautham R. Shenoy" <ego@linux.vnet.ibm.com> Currently all the low-power idle states are expected to wake up at reset vector 0x100. Which is why the macro IDLE_STATE_ENTER_SEQ that puts the CPU to an idle state and never returns. On ISA_300, when the ESL and EC bits in the PSSCR are zero, the CPU is expected to wake up at the next instruction of the idle instruction. This patch adds a new macro named IDLE_STATE_ENTER_SEQ_NORET for the no-return variant and reuses the name IDLE_STATE_ENTER_SEQ for a variant that allows resuming operation at the instruction next to the idle-instruction. Signed-off-by: Gautham R. Shenoy <ego@linux.vnet.ibm.com> --- arch/powerpc/include/asm/cpuidle.h | 5 ++++- arch/powerpc/kernel/exceptions-64s.S | 6 +++--- arch/powerpc/kernel/idle_book3s.S | 10 +++++----- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/arch/powerpc/include/asm/cpuidle.h b/arch/powerpc/include/asm/cpuidle.h index 01b8a13..9fd23f6 100644 --- a/arch/powerpc/include/asm/cpuidle.h +++ b/arch/powerpc/include/asm/cpuidle.h @@ -21,7 +21,7 @@ extern u64 pnv_first_deep_stop_state; /* Idle state entry routines */ #ifdef CONFIG_PPC_P7_NAP -#define IDLE_STATE_ENTER_SEQ(IDLE_INST) \ +#define IDLE_STATE_ENTER_SEQ(IDLE_INST) \ /* Magic NAP/SLEEP/WINKLE mode enter sequence */ \ std r0,0(r1); \ ptesync; \ @@ -29,6 +29,9 @@ extern u64 pnv_first_deep_stop_state; 1: cmp cr0,r0,r0; \ bne 1b; \ IDLE_INST; \ + +#define IDLE_STATE_ENTER_SEQ_NORET(IDLE_INST) \ + IDLE_STATE_ENTER_SEQ(IDLE_INST) \ b . #endif /* CONFIG_PPC_P7_NAP */ diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index bffec73..238307d 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -1301,12 +1301,12 @@ machine_check_handle_early: lbz r3,PACA_THREAD_IDLE_STATE(r13) cmpwi r3,PNV_THREAD_NAP bgt 10f - IDLE_STATE_ENTER_SEQ(PPC_NAP) + IDLE_STATE_ENTER_SEQ_NORET(PPC_NAP) /* No return */ 10: cmpwi r3,PNV_THREAD_SLEEP bgt 2f - IDLE_STATE_ENTER_SEQ(PPC_SLEEP) + IDLE_STATE_ENTER_SEQ_NORET(PPC_SLEEP) /* No return */ 2: @@ -1320,7 +1320,7 @@ machine_check_handle_early: */ ori r13,r13,1 SET_PACA(r13) - IDLE_STATE_ENTER_SEQ(PPC_WINKLE) + IDLE_STATE_ENTER_SEQ_NORET(PPC_WINKLE) /* No return */ 4: #endif diff --git a/arch/powerpc/kernel/idle_book3s.S b/arch/powerpc/kernel/idle_book3s.S index bd739fe..32d666b 100644 --- a/arch/powerpc/kernel/idle_book3s.S +++ b/arch/powerpc/kernel/idle_book3s.S @@ -188,7 +188,7 @@ pnv_enter_arch207_idle_mode: stb r3,PACA_THREAD_IDLE_STATE(r13) cmpwi cr3,r3,PNV_THREAD_SLEEP bge cr3,2f - IDLE_STATE_ENTER_SEQ(PPC_NAP) + IDLE_STATE_ENTER_SEQ_NORET(PPC_NAP) /* No return */ 2: /* Sleep or winkle */ @@ -222,7 +222,7 @@ pnv_fastsleep_workaround_at_entry: common_enter: /* common code for all the threads entering sleep or winkle */ bgt cr3,enter_winkle - IDLE_STATE_ENTER_SEQ(PPC_SLEEP) + IDLE_STATE_ENTER_SEQ_NORET(PPC_SLEEP) fastsleep_workaround_at_entry: ori r15,r15,PNV_CORE_IDLE_LOCK_BIT @@ -244,7 +244,7 @@ fastsleep_workaround_at_entry: enter_winkle: bl save_sprs_to_stack - IDLE_STATE_ENTER_SEQ(PPC_WINKLE) + IDLE_STATE_ENTER_SEQ_NORET(PPC_WINKLE) /* * r3 - requested stop state @@ -257,7 +257,7 @@ power_enter_stop: ld r4,ADDROFF(pnv_first_deep_stop_state)(r5) cmpd r3,r4 bge 2f - IDLE_STATE_ENTER_SEQ(PPC_STOP) + IDLE_STATE_ENTER_SEQ_NORET(PPC_STOP) 2: /* * Entering deep idle state. @@ -279,7 +279,7 @@ lwarx_loop_stop: bl save_sprs_to_stack - IDLE_STATE_ENTER_SEQ(PPC_STOP) + IDLE_STATE_ENTER_SEQ_NORET(PPC_STOP) _GLOBAL(power7_idle) /* Now check if user or arch enabled NAP mode */ -- 1.9.4 ^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2016-10-13 11:24 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-09-29 7:05 [PATCH 0/2] powernv:stop: Use psscr_val,mask provided by firmware Gautham R. Shenoy 2016-09-29 7:05 ` [PATCH 1/2] powernv:idle: Add IDLE_STATE_ENTER_SEQ_NORET macro Gautham R. Shenoy 2016-09-29 7:05 ` [PATCH 2/2] powernv: Pass PSSCR value and mask to power9_idle_stop Gautham R. Shenoy 2016-10-04 10:32 ` Michael Ellerman 2016-10-04 11:33 ` Balbir Singh 2016-10-07 7:20 ` Gautham R Shenoy 2016-10-12 5:35 ` Stewart Smith 2016-10-13 11:23 ` Gautham R Shenoy -- strict thread matches above, loose matches on Subject: below -- 2016-09-16 9:47 [PATCH 0/2] powernv: Implement lite variant of stop with ESL=EC=0 Gautham R. Shenoy 2016-09-16 9:47 ` [PATCH 1/2] powernv:idle: Add IDLE_STATE_ENTER_SEQ_NORET macro Gautham R. Shenoy
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).