powerpc/fadump: introduce callbacks for platform specific operations
authorHari Bathini <hbathini@linux.ibm.com>
Wed, 11 Sep 2019 14:48:40 +0000 (20:18 +0530)
committerMichael Ellerman <mpe@ellerman.id.au>
Fri, 13 Sep 2019 14:04:42 +0000 (00:04 +1000)
Introduce callback functions for platform specific operations like
register, unregister, invalidate & such. Also, define place-holders
for the same on pSeries platform.

Signed-off-by: Hari Bathini <hbathini@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/156821330286.5656.15538934400074110770.stgit@hbathini.in.ibm.com
arch/powerpc/include/asm/fadump-internal.h
arch/powerpc/kernel/fadump.c
arch/powerpc/platforms/pseries/Makefile
arch/powerpc/platforms/pseries/rtas-fadump.c [new file with mode: 0644]

index f809751..8ecd234 100644 (file)
@@ -77,6 +77,9 @@ struct fad_crash_memory_ranges {
        unsigned long long      size;
 };
 
+/* Platform specific callback functions */
+struct fadump_ops;
+
 /* Firmware-assisted dump configuration details. */
 struct fw_dump {
        unsigned long   reserve_dump_area_start;
@@ -99,6 +102,20 @@ struct fw_dump {
        unsigned long   dump_active:1;
        unsigned long   dump_registered:1;
        unsigned long   nocma:1;
+
+       struct fadump_ops       *ops;
+};
+
+struct fadump_ops {
+       u64     (*fadump_init_mem_struct)(struct fw_dump *fadump_conf);
+       int     (*fadump_register)(struct fw_dump *fadump_conf);
+       int     (*fadump_unregister)(struct fw_dump *fadump_conf);
+       int     (*fadump_invalidate)(struct fw_dump *fadump_conf);
+       int     (*fadump_process)(struct fw_dump *fadump_conf);
+       void    (*fadump_region_show)(struct fw_dump *fadump_conf,
+                                     struct seq_file *m);
+       void    (*fadump_trigger)(struct fadump_crash_info_header *fdh,
+                                 const char *msg);
 };
 
 /* Helper functions */
@@ -109,4 +126,11 @@ void fadump_update_elfcore_header(char *bufp);
 bool is_fadump_boot_mem_contiguous(void);
 bool is_fadump_reserved_mem_contiguous(void);
 
+#ifdef CONFIG_PPC_PSERIES
+extern void rtas_fadump_dt_scan(struct fw_dump *fadump_conf, u64 node);
+#else
+static inline void
+rtas_fadump_dt_scan(struct fw_dump *fadump_conf, u64 node) { }
+#endif
+
 #endif /* _ASM_POWERPC_FADUMP_INTERNAL_H */
index 03f2708..aa342ee 100644 (file)
@@ -112,24 +112,10 @@ static int __init fadump_cma_init(void) { return 1; }
 int __init early_init_dt_scan_fw_dump(unsigned long node,
                        const char *uname, int depth, void *data)
 {
-       const __be32 *sections;
-       int i, num_sections;
-       int size;
-       const __be32 *token;
-
        if (depth != 1 || strcmp(uname, "rtas") != 0)
                return 0;
 
-       /*
-        * Check if Firmware Assisted dump is supported. if yes, check
-        * if dump has been initiated on last reboot.
-        */
-       token = of_get_flat_dt_prop(node, "ibm,configure-kernel-dump", NULL);
-       if (!token)
-               return 1;
-
-       fw_dump.fadump_supported = 1;
-       fw_dump.ibm_configure_kernel_dump = be32_to_cpu(*token);
+       rtas_fadump_dt_scan(&fw_dump, node);
 
        /*
         * The 'ibm,kernel-dump' rtas node is present only if there is
@@ -139,35 +125,6 @@ int __init early_init_dt_scan_fw_dump(unsigned long node,
        if (fdm_active)
                fw_dump.dump_active = 1;
 
-       /* Get the sizes required to store dump data for the firmware provided
-        * dump sections.
-        * For each dump section type supported, a 32bit cell which defines
-        * the ID of a supported section followed by two 32 bit cells which
-        * gives teh size of the section in bytes.
-        */
-       sections = of_get_flat_dt_prop(node, "ibm,configure-kernel-dump-sizes",
-                                       &size);
-
-       if (!sections)
-               return 1;
-
-       num_sections = size / (3 * sizeof(u32));
-
-       for (i = 0; i < num_sections; i++, sections += 3) {
-               u32 type = (u32)of_read_number(sections, 1);
-
-               switch (type) {
-               case RTAS_FADUMP_CPU_STATE_DATA:
-                       fw_dump.cpu_state_data_size =
-                                       of_read_ulong(&sections[1], 2);
-                       break;
-               case RTAS_FADUMP_HPTE_REGION:
-                       fw_dump.hpte_region_size =
-                                       of_read_ulong(&sections[1], 2);
-                       break;
-               }
-       }
-
        return 1;
 }
 
index a420ef4..a3c74a5 100644 (file)
@@ -27,6 +27,7 @@ obj-$(CONFIG_IBMEBUS)         += ibmebus.o
 obj-$(CONFIG_PAPR_SCM)         += papr_scm.o
 obj-$(CONFIG_PPC_SPLPAR)       += vphn.o
 obj-$(CONFIG_PPC_SVM)          += svm.o
+obj-$(CONFIG_FA_DUMP)          += rtas-fadump.o
 
 ifdef CONFIG_PPC_PSERIES
 obj-$(CONFIG_SUSPEND)          += suspend.o
diff --git a/arch/powerpc/platforms/pseries/rtas-fadump.c b/arch/powerpc/platforms/pseries/rtas-fadump.c
new file mode 100644 (file)
index 0000000..9efe7b1
--- /dev/null
@@ -0,0 +1,122 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Firmware-Assisted Dump support on POWERVM platform.
+ *
+ * Copyright 2011, Mahesh Salgaonkar, IBM Corporation.
+ * Copyright 2019, Hari Bathini, IBM Corporation.
+ */
+
+#define pr_fmt(fmt) "rtas fadump: " fmt
+
+#include <linux/string.h>
+#include <linux/memblock.h>
+#include <linux/delay.h>
+#include <linux/seq_file.h>
+#include <linux/crash_dump.h>
+
+#include <asm/page.h>
+#include <asm/prom.h>
+#include <asm/rtas.h>
+#include <asm/fadump.h>
+#include <asm/fadump-internal.h>
+
+#include "rtas-fadump.h"
+
+static u64 rtas_fadump_init_mem_struct(struct fw_dump *fadump_conf)
+{
+       return fadump_conf->reserve_dump_area_start;
+}
+
+static int rtas_fadump_register(struct fw_dump *fadump_conf)
+{
+       return -EIO;
+}
+
+static int rtas_fadump_unregister(struct fw_dump *fadump_conf)
+{
+       return -EIO;
+}
+
+static int rtas_fadump_invalidate(struct fw_dump *fadump_conf)
+{
+       return -EIO;
+}
+
+/*
+ * Validate and process the dump data stored by firmware before exporting
+ * it through '/proc/vmcore'.
+ */
+static int __init rtas_fadump_process(struct fw_dump *fadump_conf)
+{
+       return -EINVAL;
+}
+
+static void rtas_fadump_region_show(struct fw_dump *fadump_conf,
+                                   struct seq_file *m)
+{
+}
+
+static void rtas_fadump_trigger(struct fadump_crash_info_header *fdh,
+                               const char *msg)
+{
+       /* Call ibm,os-term rtas call to trigger firmware assisted dump */
+       rtas_os_term((char *)msg);
+}
+
+static struct fadump_ops rtas_fadump_ops = {
+       .fadump_init_mem_struct         = rtas_fadump_init_mem_struct,
+       .fadump_register                = rtas_fadump_register,
+       .fadump_unregister              = rtas_fadump_unregister,
+       .fadump_invalidate              = rtas_fadump_invalidate,
+       .fadump_process                 = rtas_fadump_process,
+       .fadump_region_show             = rtas_fadump_region_show,
+       .fadump_trigger                 = rtas_fadump_trigger,
+};
+
+void __init rtas_fadump_dt_scan(struct fw_dump *fadump_conf, u64 node)
+{
+       int i, size, num_sections;
+       const __be32 *sections;
+       const __be32 *token;
+
+       /*
+        * Check if Firmware Assisted dump is supported. if yes, check
+        * if dump has been initiated on last reboot.
+        */
+       token = of_get_flat_dt_prop(node, "ibm,configure-kernel-dump", NULL);
+       if (!token)
+               return;
+
+       fadump_conf->ibm_configure_kernel_dump = be32_to_cpu(*token);
+       fadump_conf->ops                = &rtas_fadump_ops;
+       fadump_conf->fadump_supported   = 1;
+
+       /* Get the sizes required to store dump data for the firmware provided
+        * dump sections.
+        * For each dump section type supported, a 32bit cell which defines
+        * the ID of a supported section followed by two 32 bit cells which
+        * gives the size of the section in bytes.
+        */
+       sections = of_get_flat_dt_prop(node, "ibm,configure-kernel-dump-sizes",
+                                       &size);
+
+       if (!sections)
+               return;
+
+       num_sections = size / (3 * sizeof(u32));
+
+       for (i = 0; i < num_sections; i++, sections += 3) {
+               u32 type = (u32)of_read_number(sections, 1);
+
+               switch (type) {
+               case RTAS_FADUMP_CPU_STATE_DATA:
+                       fadump_conf->cpu_state_data_size =
+                                       of_read_ulong(&sections[1], 2);
+                       break;
+               case RTAS_FADUMP_HPTE_REGION:
+                       fadump_conf->hpte_region_size =
+                                       of_read_ulong(&sections[1], 2);
+                       break;
+               }
+       }
+}