remoteproc: Change default dump configuration to "disabled"

Currently "default" configuration option means coredumps are
enabled. To avoid confusion rename the "default" configuration
option to "enabled" and disable collection of dumps by default
as doing so makes sense for production devices.

Signed-off-by: Rishabh Bhatnagar <rishabhb@codeaurora.org>
Link: https://lore.kernel.org/r/1601662144-5964-2-git-send-email-rishabhb@codeaurora.org
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/drivers/remoteproc/remoteproc_coredump.c b/drivers/remoteproc/remoteproc_coredump.c
index bb15a29038e832325f1fa026448d713a481e819b..34530dc20cb403834841721dd6a415c0e1f9611e 100644 (file)
--- a/drivers/remoteproc/remoteproc_coredump.c
+++ b/drivers/remoteproc/remoteproc_coredump.c
@@ -257,7 +257,7 @@ void rproc_coredump(struct rproc *rproc)
                 * directly read from device memory.
                 */
                data_size += elf_size_of_phdr(class);
-               if (dump_conf == RPROC_COREDUMP_DEFAULT)
+               if (dump_conf == RPROC_COREDUMP_ENABLED)
                        data_size += segment->size;
 
                phnum++;
@@ -297,14 +297,14 @@ void rproc_coredump(struct rproc *rproc)
                elf_phdr_set_p_flags(class, phdr, PF_R | PF_W | PF_X);
                elf_phdr_set_p_align(class, phdr, 0);
 
-               if (dump_conf == RPROC_COREDUMP_DEFAULT)
+               if (dump_conf == RPROC_COREDUMP_ENABLED)
                        rproc_copy_segment(rproc, data + offset, segment, 0,
                                           segment->size);
 
                offset += elf_phdr_get_p_filesz(class, phdr);
                phdr += elf_size_of_phdr(class);
        }
-       if (dump_conf == RPROC_COREDUMP_DEFAULT) {
+       if (dump_conf == RPROC_COREDUMP_ENABLED) {
                dev_coredumpv(&rproc->dev, data, data_size, GFP_KERNEL);
                return;
        }

diff --git a/drivers/remoteproc/remoteproc_debugfs.c b/drivers/remoteproc/remoteproc_debugfs.c
index 7ca823f6aa638f6280683222ae497d6f5d44b694..7e5845376e9faebbe726393bfd7eb14d0567c50f 100644 (file)
--- a/drivers/remoteproc/remoteproc_debugfs.c
+++ b/drivers/remoteproc/remoteproc_debugfs.c
@@ -33,9 +33,9 @@ static struct dentry *rproc_dbg;
  * enum rproc_coredump_mechanism
  */
 static const char * const rproc_coredump_str[] = {
-       [RPROC_COREDUMP_DEFAULT]        = "default",
-       [RPROC_COREDUMP_INLINE]         = "inline",
        [RPROC_COREDUMP_DISABLED]       = "disabled",
+       [RPROC_COREDUMP_ENABLED]        = "enabled",
+       [RPROC_COREDUMP_INLINE]         = "inline",
 };
 
 /* Expose the current coredump configuration via debugfs */
@@ -54,20 +54,19 @@ static ssize_t rproc_coredump_read(struct file *filp, char __user *userbuf,
 
 /*
  * By writing to the 'coredump' debugfs entry, we control the behavior of the
- * coredump mechanism dynamically. The default value of this entry is "default".
+ * coredump mechanism dynamically. The default value of this entry is "disabled".
  *
  * The 'coredump' debugfs entry supports these commands:
  *
- * default:    This is the default coredump mechanism. When the remoteproc
- *             crashes the entire coredump will be copied to a separate buffer
- *             and exposed to userspace.
+ * disabled:   By default coredump collection is disabled. Recovery will
+ *             proceed without collecting any dump.
+ *
+ * enabled:    When the remoteproc crashes the entire coredump will be copied
+ *             to a separate buffer and exposed to userspace.
  *
  * inline:     The coredump will not be copied to a separate buffer and the
  *             recovery process will have to wait until data is read by
  *             userspace. But this avoid usage of extra memory.
- *
- * disabled:   This will disable coredump. Recovery will proceed without
- *             collecting any dump.
  */
 static ssize_t rproc_coredump_write(struct file *filp,
                                    const char __user *user_buf, size_t count,
@@ -96,10 +95,10 @@ static ssize_t rproc_coredump_write(struct file *filp,
 
        if (!strncmp(buf, "disabled", count)) {
                rproc->dump_conf = RPROC_COREDUMP_DISABLED;
+       } else if (!strncmp(buf, "enabled", count)) {
+               rproc->dump_conf = RPROC_COREDUMP_ENABLED;
        } else if (!strncmp(buf, "inline", count)) {
                rproc->dump_conf = RPROC_COREDUMP_INLINE;
-       } else if (!strncmp(buf, "default", count)) {
-               rproc->dump_conf = RPROC_COREDUMP_DEFAULT;
        } else {
                dev_err(&rproc->dev, "Invalid coredump configuration\n");
                err = -EINVAL;

diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h
index 2fa68bf5aa4f4141aa802e17af2376fc5e688d63..3fa3ba6498e877c9a033cef898a160051fc3643d 100644 (file)
--- a/include/linux/remoteproc.h
+++ b/include/linux/remoteproc.h
@@ -442,16 +442,16 @@ enum rproc_crash_type {
 
 /**
  * enum rproc_dump_mechanism - Coredump options for core
- * @RPROC_COREDUMP_DEFAULT:    Copy dump to separate buffer and carry on with
+ * @RPROC_COREDUMP_DISABLED:   Don't perform any dump
+ * @RPROC_COREDUMP_ENABLED:    Copy dump to separate buffer and carry on with
                                recovery
  * @RPROC_COREDUMP_INLINE:     Read segments directly from device memory. Stall
                                recovery until all segments are read
- * @RPROC_COREDUMP_DISABLED:   Don't perform any dump
  */
 enum rproc_dump_mechanism {
-       RPROC_COREDUMP_DEFAULT,
-       RPROC_COREDUMP_INLINE,
        RPROC_COREDUMP_DISABLED,
+       RPROC_COREDUMP_ENABLED,
+       RPROC_COREDUMP_INLINE,
 };
 
 /**