lkml.org 
[lkml]   [2016]   [May]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 10/10] powerpc/powernv: Use deepest stop state when cpu is offlined
    Date
    If hardware supports stop state, use the deepest stop state when
    the cpu is offlined.

    Reviewed-by: Gautham R. Shenoy <ego@linux.vnet.ibm.com>
    Signed-off-by: Shreyas B. Prabhu <shreyas@linux.vnet.ibm.com>
    ---
    - No changes since v1

    arch/powerpc/platforms/powernv/idle.c | 15 +++++++++++++--
    arch/powerpc/platforms/powernv/powernv.h | 1 +
    arch/powerpc/platforms/powernv/smp.c | 4 +++-
    3 files changed, 17 insertions(+), 3 deletions(-)

    diff --git a/arch/powerpc/platforms/powernv/idle.c b/arch/powerpc/platforms/powernv/idle.c
    index 8dc5936..d715235 100644
    --- a/arch/powerpc/platforms/powernv/idle.c
    +++ b/arch/powerpc/platforms/powernv/idle.c
    @@ -242,6 +242,11 @@ static DEVICE_ATTR(fastsleep_workaround_applyonce, 0600,
    */
    u64 pnv_first_deep_stop_state;

    +/*
    + * Deepest stop idle state. Used when a cpu is offlined
    + */
    +u64 pnv_deepest_stop_state;
    +
    static int __init pnv_init_idle_states(void)
    {
    struct device_node *power_mgt;
    @@ -290,8 +295,11 @@ static int __init pnv_init_idle_states(void)
    }

    /*
    - * Set pnv_first_deep_stop_state to the first stop level
    - * to cause hypervisor state loss
    + * Set pnv_first_deep_stop_state and pnv_deepest_stop_state.
    + * 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_first_deep_stop_state = MAX_POSSIBLE_STOP_STATE;
    for (i = 0; i < dt_idle_states; i++) {
    @@ -300,6 +308,9 @@ static int __init pnv_init_idle_states(void)
    if ((flags[i] & OPAL_PM_LOSE_FULL_CONTEXT) &&
    (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;
    }
    }

    diff --git a/arch/powerpc/platforms/powernv/powernv.h b/arch/powerpc/platforms/powernv/powernv.h
    index 6dbc0a1..da7c843 100644
    --- a/arch/powerpc/platforms/powernv/powernv.h
    +++ b/arch/powerpc/platforms/powernv/powernv.h
    @@ -18,6 +18,7 @@ static inline void pnv_pci_shutdown(void) { }
    #endif

    extern u32 pnv_get_supported_cpuidle_states(void);
    +extern u64 pnv_deepest_stop_state;

    extern void pnv_lpc_init(void);

    diff --git a/arch/powerpc/platforms/powernv/smp.c b/arch/powerpc/platforms/powernv/smp.c
    index ad7b1a3..f69ceb6 100644
    --- a/arch/powerpc/platforms/powernv/smp.c
    +++ b/arch/powerpc/platforms/powernv/smp.c
    @@ -182,7 +182,9 @@ static void pnv_smp_cpu_kill_self(void)

    ppc64_runlatch_off();

    - if (idle_states & OPAL_PM_WINKLE_ENABLED)
    + if (cpu_has_feature(CPU_FTR_ARCH_300))
    + srr1 = power_stop(pnv_deepest_stop_state);
    + 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))
    --
    2.4.11
    \
     
     \ /
      Last update: 2016-05-24 15:41    [W:4.495 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site