[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20210929033646.39630-2-nixiaoming@huawei.com>
Date: Wed, 29 Sep 2021 11:36:45 +0800
From: Xiaoming Ni <nixiaoming@...wei.com>
To: <oss@...error.net>, <mpe@...erman.id.au>,
<benh@...nel.crashing.org>, <paulus@...ba.org>,
<paul.gortmaker@...driver.com>, <chenhui.zhao@...escale.com>,
<Yuantian.Tang@...scale.com>, <linuxppc-dev@...ts.ozlabs.org>,
<linux-kernel@...r.kernel.org>, <stable@...r.kernel.org>,
<gregkh@...uxfoundation.org>
CC: <wangle6@...wei.com>, <liuwenliang@...wei.com>,
<chenjianguo3@...wei.com>, <nixiaoming@...wei.com>
Subject: [PATCH v2 1/2] 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@...r.kernel.org #v4.6
Signed-off-by: Xiaoming Ni <nixiaoming@...wei.com>
---
arch/powerpc/platforms/85xx/mpc85xx_pm_ops.c | 3 +--
1 file changed, 1 insertion(+), 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;
}
--
2.27.0
Powered by blists - more mailing lists