Merge tag 'mac80211-next-for-john-2014-11-04' of git://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / arch / powerpc / platforms / powernv / opal-dump.c

diff --git a/arch/powerpc/platforms/powernv/opal-dump.c b/arch/powerpc/platforms/powernv/opal-dump.c
index 85bb8ff..23260f7 100644 (file)
--- a/arch/powerpc/platforms/powernv/opal-dump.c
+++ b/arch/powerpc/platforms/powernv/opal-dump.c
@@ -112,7 +112,7 @@ static ssize_t init_dump_show(struct dump_obj *dump_obj,
                              struct dump_attribute *attr,
                              char *buf)
 {
-       return sprintf(buf, "1 - initiate dump\n");
+       return sprintf(buf, "1 - initiate Service Processor(FSP) dump\n");
 }
 
 static int64_t dump_fips_init(uint8_t type)
@@ -121,7 +121,7 @@ static int64_t dump_fips_init(uint8_t type)
 
        rc = opal_dump_init(type);
        if (rc)
-               pr_warn("%s: Failed to initiate FipS dump (%d)\n",
+               pr_warn("%s: Failed to initiate FSP dump (%d)\n",
                        __func__, rc);
        return rc;
 }
@@ -131,8 +131,12 @@ static ssize_t init_dump_store(struct dump_obj *dump_obj,
                               const char *buf,
                               size_t count)
 {
-       dump_fips_init(DUMP_TYPE_FSP);
-       pr_info("%s: Initiated FSP dump\n", __func__);
+       int rc;
+
+       rc = dump_fips_init(DUMP_TYPE_FSP);
+       if (rc == OPAL_SUCCESS)
+               pr_info("%s: Initiated FSP dump\n", __func__);
+
        return count;
 }
 
@@ -297,7 +301,7 @@ static ssize_t dump_attr_read(struct file *filep, struct kobject *kobj,
                         * and rely on userspace to ask us to try
                         * again.
                         */
-                       pr_info("%s: Platform dump partially read.ID = 0x%x\n",
+                       pr_info("%s: Platform dump partially read. ID = 0x%x\n",
                                __func__, dump->id);
                        return -EIO;
                }
@@ -423,6 +427,10 @@ void __init opal_platform_dump_init(void)
 {
        int rc;
 
+       /* ELOG not supported by firmware */
+       if (!opal_check_token(OPAL_DUMP_READ))
+               return;
+
        dump_kset = kset_create_and_add("dump", NULL, opal_kobj);
        if (!dump_kset) {
                pr_warn("%s: Failed to create dump kset\n", __func__);