lkml.org 
[lkml]   [2021]   [Nov]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 067/323] powerpc/85xx: Fix oops when mpc85xx_smp_guts_ids node cannot be found
    Date
    From: Xiaoming Ni <nixiaoming@huawei.com>

    commit 3c2172c1c47b4079c29f0e6637d764a99355ebcd upstream.

    When the field described in mpc85xx_smp_guts_ids[] is not configured in
    dtb, the mpc85xx_setup_pmc() does not assign a value to the "guts"
    variable. As a result, the oops is triggered when
    mpc85xx_freeze_time_base() is executed.

    Fixes: 56f1ba280719 ("powerpc/mpc85xx: refactor the PM operations")
    Cc: stable@vger.kernel.org # v4.6+
    Signed-off-by: Xiaoming Ni <nixiaoming@huawei.com>
    Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
    Link: https://lore.kernel.org/r/20210929033646.39630-2-nixiaoming@huawei.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    arch/powerpc/platforms/85xx/mpc85xx_pm_ops.c | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    --- a/arch/powerpc/platforms/85xx/mpc85xx_pm_ops.c
    +++ b/arch/powerpc/platforms/85xx/mpc85xx_pm_ops.c
    @@ -98,9 +98,8 @@ int __init mpc85xx_setup_pmc(void)
    pr_err("Could not map guts node address\n");
    return -ENOMEM;
    }
    + qoriq_pm_ops = &mpc85xx_pm_ops;
    }

    - qoriq_pm_ops = &mpc85xx_pm_ops;
    -
    return 0;
    }

    \
     
     \ /
      Last update: 2021-11-24 13:57    [W:8.652 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site