diff options
| author |   Xiaoming Ni <nixiaoming@huawei.com> | 2021-09-29 11:36:45 +0800 |
|---|---|---|
| committer |   Michael Ellerman <mpe@ellerman.id.au> | 2021-10-09 00:15:58 +1100 |
| commit | 3c2172c1c47b4079c29f0e6637d764a99355ebcd (patch) | |
| tree | 3b1416eeab692997bfc7f5d62d67433c25c013f6 /arch | |
| parent | powerps/pseries/dma: Add support for 2M IOMMU page size (diff) | |
| download | linux-dev-3c2172c1c47b4079c29f0e6637d764a99355ebcd.tar.xz linux-dev-3c2172c1c47b4079c29f0e6637d764a99355ebcd.zip | |
powerpc/85xx: Fix oops when mpc85xx_smp_guts_ids node cannot be found
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/platforms/85xx/mpc85xx_pm_ops.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_pm_ops.c b/arch/powerpc/platforms/85xx/mpc85xx_pm_ops.c index 7c0133f558d0..ffa8a7a6a2db 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_pm_ops.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_pm_ops.c @@ -94,9 +94,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; } |