| Message ID | 1455757974-4315-1-git-send-email-andrew.donnellan@au1.ibm.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Thu, 2016-18-02 at 01:12:54 UTC, Andrew Donnellan wrote: > When initialising OPAL interfaces, there is a possibility that > opal_msglog_init() may fail to initialise the msglog/memory console. > > Fix opal_msglog_sysfs_init() so it doesn't try to create sysfs entry for > the msglog if this occurs. > > Suggested-by: Joel Stanley <joel@jms.id.au> > Fixes: 9b4fffa14906 ("powerpc/powernv: new function to access OPAL msglog") > Signed-off-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/88409d0c863b3ba7d9e3090fb4 cheers
diff --git a/arch/powerpc/platforms/powernv/opal-msglog.c b/arch/powerpc/platforms/powernv/opal-msglog.c index 59fa6e1..39d6ff9 100644 --- a/arch/powerpc/platforms/powernv/opal-msglog.c +++ b/arch/powerpc/platforms/powernv/opal-msglog.c @@ -128,6 +128,11 @@ void __init opal_msglog_init(void) void __init opal_msglog_sysfs_init(void) { + if (!opal_memcons) { + pr_warn("OPAL: message log initialisation failed, not creating sysfs entry\n"); + return; + } + if (sysfs_create_bin_file(opal_kobj, &opal_msglog_attr) != 0) pr_warn("OPAL: sysfs file creation failed\n"); }
When initialising OPAL interfaces, there is a possibility that opal_msglog_init() may fail to initialise the msglog/memory console. Fix opal_msglog_sysfs_init() so it doesn't try to create sysfs entry for the msglog if this occurs. Suggested-by: Joel Stanley <joel@jms.id.au> Fixes: 9b4fffa14906 ("powerpc/powernv: new function to access OPAL msglog") Signed-off-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> --- arch/powerpc/platforms/powernv/opal-msglog.c | 5 +++++ 1 file changed, 5 insertions(+)