lkml.org 
[lkml]   [2020]   [Jul]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 3/3] powerpc/powernv/idle: Rename pnv_first_spr_loss_level variable
    Date
    Replace the variable name from using "pnv_first_spr_loss_level" to
    "pnv_first_fullstate_loss_level".

    As pnv_first_spr_loss_level is supposed to be the earliest state that
    has OPAL_PM_LOSE_FULL_CONTEXT set, however as shallow states too loose
    SPR values, render an incorrect terminology.

    Signed-off-by: Pratik Rajesh Sampat <psampat@linux.ibm.com>
    ---
    arch/powerpc/platforms/powernv/idle.c | 18 +++++++++---------
    1 file changed, 9 insertions(+), 9 deletions(-)

    diff --git a/arch/powerpc/platforms/powernv/idle.c b/arch/powerpc/platforms/powernv/idle.c
    index f2e2a6a4c274..d54e7ef234e3 100644
    --- a/arch/powerpc/platforms/powernv/idle.c
    +++ b/arch/powerpc/platforms/powernv/idle.c
    @@ -48,7 +48,7 @@ static bool default_stop_found;
    * First stop state levels when SPR and TB loss can occur.
    */
    static u64 pnv_first_tb_loss_level = MAX_STOP_STATE + 1;
    -static u64 pnv_first_spr_loss_level = MAX_STOP_STATE + 1;
    +static u64 pnv_first_fullstate_loss_level = MAX_STOP_STATE + 1;

    /*
    * psscr value and mask of the deepest stop idle state.
    @@ -659,7 +659,7 @@ static unsigned long power9_idle_stop(unsigned long psscr, bool mmu_on)
    */
    mmcr0 = mfspr(SPRN_MMCR0);
    }
    - if ((psscr & PSSCR_RL_MASK) >= pnv_first_spr_loss_level) {
    + if ((psscr & PSSCR_RL_MASK) >= pnv_first_fullstate_loss_level) {
    sprs.lpcr = mfspr(SPRN_LPCR);
    sprs.hfscr = mfspr(SPRN_HFSCR);
    sprs.fscr = mfspr(SPRN_FSCR);
    @@ -751,7 +751,7 @@ static unsigned long power9_idle_stop(unsigned long psscr, bool mmu_on)
    * just always test PSSCR for SPR/TB state loss.
    */
    pls = (psscr & PSSCR_PLS) >> PSSCR_PLS_SHIFT;
    - if (likely(pls < pnv_first_spr_loss_level)) {
    + if (likely(pls < pnv_first_fullstate_loss_level)) {
    if (sprs_saved)
    atomic_stop_thread_idle();
    goto out;
    @@ -1098,7 +1098,7 @@ static void __init pnv_power9_idle_init(void)
    * the deepest loss-less (OPAL_PM_STOP_INST_FAST) stop state.
    */
    pnv_first_tb_loss_level = MAX_STOP_STATE + 1;
    - pnv_first_spr_loss_level = MAX_STOP_STATE + 1;
    + pnv_first_fullstate_loss_level = MAX_STOP_STATE + 1;
    for (i = 0; i < nr_pnv_idle_states; i++) {
    int err;
    struct pnv_idle_states_t *state = &pnv_idle_states[i];
    @@ -1109,8 +1109,8 @@ static void __init pnv_power9_idle_init(void)
    pnv_first_tb_loss_level = psscr_rl;

    if ((state->flags & OPAL_PM_LOSE_FULL_CONTEXT) &&
    - (pnv_first_spr_loss_level > psscr_rl))
    - pnv_first_spr_loss_level = psscr_rl;
    + (pnv_first_fullstate_loss_level > psscr_rl))
    + pnv_first_fullstate_loss_level = psscr_rl;

    /*
    * The idle code does not deal with TB loss occurring
    @@ -1121,8 +1121,8 @@ static void __init pnv_power9_idle_init(void)
    * compatibility.
    */
    if ((state->flags & OPAL_PM_TIMEBASE_STOP) &&
    - (pnv_first_spr_loss_level > psscr_rl))
    - pnv_first_spr_loss_level = psscr_rl;
    + (pnv_first_fullstate_loss_level > psscr_rl))
    + pnv_first_fullstate_loss_level = psscr_rl;

    err = validate_psscr_val_mask(&state->psscr_val,
    &state->psscr_mask,
    @@ -1168,7 +1168,7 @@ static void __init pnv_power9_idle_init(void)
    }

    pr_info("cpuidle-powernv: First stop level that may lose SPRs = 0x%llx\n",
    - pnv_first_spr_loss_level);
    + pnv_first_fullstate_loss_level);

    pr_info("cpuidle-powernv: First stop level that may lose timebase = 0x%llx\n",
    pnv_first_tb_loss_level);
    --
    2.25.4
    \
     
     \ /
      Last update: 2020-07-10 07:29    [W:3.271 / U:0.156 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site