Skip to content

L
linux
Commit 0226e552 authored by Hari Bathini's avatar Hari Bathini Committed by Michael Ellerman
Browse files
Options

powerpc/fadump: move rtas specific definitions to platform code 

Currently, FADump is only supported on pSeries but that is going to
change soon with FADump support being added on PowerNV platform. So,
move rtas specific definitions to platform code to allow FADump
to have multiple platforms support.
Signed-off-by: default avatarHari Bathini <hbathini@linux.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/156821328494.5656.16219929140866195511.stgit@hbathini.in.ibm.com
parent 72aa6517
Show whitespace changes
Inline Side-by-side
Showing with 172 additions and 160 deletions
arch/powerpc/include/asm/fadump-internal.h
View file @ 0226e552
...@@ -43,7 +43,25 @@ ...@@ -43,7 +43,25 @@
#define FADUMP_UNREGISTER 2 #define FADUMP_UNREGISTER 2
#define FADUMP_INVALIDATE 3 #define FADUMP_INVALIDATE 3
#define FADUMP_CRASH_INFO_MAGIC str_to_u64("FADMPINF") /*
* Copy the ascii values for first 8 characters from a string into u64
* variable at their respective indexes.
* e.g.
* The string "FADMPINF" will be converted into 0x4641444d50494e46
*/
static inline u64 fadump_str_to_u64(const char *str)
{
u64 val = 0;
int i;
for (i = 0; i < sizeof(val); i++)
val = (*str) ? (val << 8) | *str++ : val << 8;
return val;
}
#define FADUMP_CPU_UNKNOWN (~((u32)0))
#define FADUMP_CRASH_INFO_MAGIC fadump_str_to_u64("FADMPINF")
/* fadump crash info structure */ /* fadump crash info structure */
struct fadump_crash_info_header { struct fadump_crash_info_header {
......
arch/powerpc/include/asm/fadump.h
View file @ 0226e552
...@@ -6,121 +6,13 @@ ...@@ -6,121 +6,13 @@
* Author: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com> * Author: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>
*/ */
#ifndef __PPC64_FA_DUMP_H__ #ifndef _ASM_POWERPC_FADUMP_H
#define __PPC64_FA_DUMP_H__ #define _ASM_POWERPC_FADUMP_H
#ifdef CONFIG_FA_DUMP #ifdef CONFIG_FA_DUMP
/* Firmware provided dump sections */
#define FADUMP_CPU_STATE_DATA 0x0001
#define FADUMP_HPTE_REGION 0x0002
#define FADUMP_REAL_MODE_REGION 0x0011
/* Dump request flag */
#define FADUMP_REQUEST_FLAG 0x00000001
/* Dump status flag */
#define FADUMP_ERROR_FLAG 0x2000
#define FADUMP_CPU_ID_MASK ((1UL << 32) - 1)
#define CPU_UNKNOWN (~((u32)0))
/* Utility macros */
#define SKIP_TO_NEXT_CPU(reg_entry) \
({ \
while (be64_to_cpu(reg_entry->reg_id) != REG_ID("CPUEND")) \
reg_entry++; \
reg_entry++; \
})
extern int crashing_cpu; extern int crashing_cpu;
/* Kernel Dump section info */
struct fadump_section {
__be32 request_flag;
__be16 source_data_type;
__be16 error_flags;
__be64 source_address;
__be64 source_len;
__be64 bytes_dumped;
__be64 destination_address;
};
/* ibm,configure-kernel-dump header. */
struct fadump_section_header {
__be32 dump_format_version;
__be16 dump_num_sections;
__be16 dump_status_flag;
__be32 offset_first_dump_section;
/* Fields for disk dump option. */
__be32 dd_block_size;
__be64 dd_block_offset;
__be64 dd_num_blocks;
__be32 dd_offset_disk_path;
/* Maximum time allowed to prevent an automatic dump-reboot. */
__be32 max_time_auto;
};
/*
* Firmware Assisted dump memory structure. This structure is required for
* registering future kernel dump with power firmware through rtas call.
*
* No disk dump option. Hence disk dump path string section is not included.
*/
struct fadump_mem_struct {
struct fadump_section_header header;
/* Kernel dump sections */
struct fadump_section cpu_state_data;
struct fadump_section hpte_region;
struct fadump_section rmr_region;
};
/*
* Copy the ascii values for first 8 characters from a string into u64
* variable at their respective indexes.
* e.g.
* The string "FADMPINF" will be converted into 0x4641444d50494e46
*/
static inline u64 str_to_u64(const char *str)
{
u64 val = 0;
int i;
for (i = 0; i < sizeof(val); i++)
val = (*str) ? (val << 8) | *str++ : val << 8;
return val;
}
#define STR_TO_HEX(x) str_to_u64(x)
#define REG_ID(x) str_to_u64(x)
#define REGSAVE_AREA_MAGIC STR_TO_HEX("REGSAVE")
/* The firmware-assisted dump format.
*
* The register save area is an area in the partition's memory used to preserve
* the register contents (CPU state data) for the active CPUs during a firmware
* assisted dump. The dump format contains register save area header followed
* by register entries. Each list of registers for a CPU starts with
* "CPUSTRT" and ends with "CPUEND".
*/
/* Register save area header. */
struct fadump_reg_save_area_header {
__be64 magic_number;
__be32 version;
__be32 num_cpu_offset;
};
/* Register entry. */
struct fadump_reg_entry {
__be64 reg_id;
__be64 reg_value;
};
extern int is_fadump_memory_area(u64 addr, ulong size); extern int is_fadump_memory_area(u64 addr, ulong size);
extern int early_init_dt_scan_fw_dump(unsigned long node, extern int early_init_dt_scan_fw_dump(unsigned long node,
const char *uname, int depth, void *data); const char *uname, int depth, void *data);
...@@ -136,5 +28,5 @@ static inline int is_fadump_active(void) { return 0; } ...@@ -136,5 +28,5 @@ static inline int is_fadump_active(void) { return 0; }
static inline int should_fadump_crash(void) { return 0; } static inline int should_fadump_crash(void) { return 0; }
static inline void crash_fadump(struct pt_regs *regs, const char *str) { } static inline void crash_fadump(struct pt_regs *regs, const char *str) { }
static inline void fadump_cleanup(void) { } static inline void fadump_cleanup(void) { }
#endif #endif /* !CONFIG_FA_DUMP */
#endif #endif /* _ASM_POWERPC_FADUMP_H */
arch/powerpc/kernel/fadump.c
View file @ 0226e552
...@@ -33,12 +33,11 @@ ...@@ -33,12 +33,11 @@
#include <asm/fadump-internal.h> #include <asm/fadump-internal.h>
#include <asm/setup.h> #include <asm/setup.h>
#include "../platforms/pseries/rtas-fadump.h"
static struct fw_dump fw_dump; static struct fw_dump fw_dump;
static struct fadump_mem_struct fdm; static struct rtas_fadump_mem_struct fdm;
static const struct fadump_mem_struct *fdm_active; static const struct rtas_fadump_mem_struct *fdm_active;
#ifdef CONFIG_CMA
static struct cma *fadump_cma;
#endif
static DEFINE_MUTEX(fadump_mutex); static DEFINE_MUTEX(fadump_mutex);
struct fad_crash_memory_ranges *crash_memory_ranges; struct fad_crash_memory_ranges *crash_memory_ranges;
...@@ -47,6 +46,8 @@ int crash_mem_ranges; ...@@ -47,6 +46,8 @@ int crash_mem_ranges;
int max_crash_mem_ranges; int max_crash_mem_ranges;
#ifdef CONFIG_CMA #ifdef CONFIG_CMA
static struct cma *fadump_cma;
/* /*
* fadump_cma_init() - Initialize CMA area from a fadump reserved memory * fadump_cma_init() - Initialize CMA area from a fadump reserved memory
* *
...@@ -156,11 +157,11 @@ int __init early_init_dt_scan_fw_dump(unsigned long node, ...@@ -156,11 +157,11 @@ int __init early_init_dt_scan_fw_dump(unsigned long node,
u32 type = (u32)of_read_number(sections, 1); u32 type = (u32)of_read_number(sections, 1);
switch (type) { switch (type) {
case FADUMP_CPU_STATE_DATA: case RTAS_FADUMP_CPU_STATE_DATA:
fw_dump.cpu_state_data_size = fw_dump.cpu_state_data_size =
of_read_ulong(&sections[1], 2); of_read_ulong(&sections[1], 2);
break; break;
case FADUMP_HPTE_REGION: case RTAS_FADUMP_HPTE_REGION:
fw_dump.hpte_region_size = fw_dump.hpte_region_size =
of_read_ulong(&sections[1], 2); of_read_ulong(&sections[1], 2);
break; break;
...@@ -271,20 +272,20 @@ static void fadump_show_config(void) ...@@ -271,20 +272,20 @@ static void fadump_show_config(void)
pr_debug("Boot memory size : %lx\n", fw_dump.boot_memory_size); pr_debug("Boot memory size : %lx\n", fw_dump.boot_memory_size);
} }
static unsigned long init_fadump_mem_struct(struct fadump_mem_struct *fdm, static unsigned long init_fadump_mem_struct(struct rtas_fadump_mem_struct *fdm,
unsigned long addr) unsigned long addr)
{ {
if (!fdm) if (!fdm)
return 0; return 0;
memset(fdm, 0, sizeof(struct fadump_mem_struct)); memset(fdm, 0, sizeof(struct rtas_fadump_mem_struct));
addr = addr & PAGE_MASK; addr = addr & PAGE_MASK;
fdm->header.dump_format_version = cpu_to_be32(0x00000001); fdm->header.dump_format_version = cpu_to_be32(0x00000001);
fdm->header.dump_num_sections = cpu_to_be16(3); fdm->header.dump_num_sections = cpu_to_be16(3);
fdm->header.dump_status_flag = 0; fdm->header.dump_status_flag = 0;
fdm->header.offset_first_dump_section = fdm->header.offset_first_dump_section =
cpu_to_be32((u32)offsetof(struct fadump_mem_struct, cpu_state_data)); cpu_to_be32((u32)offsetof(struct rtas_fadump_mem_struct, cpu_state_data));
/* /*
* Fields for disk dump option. * Fields for disk dump option.
...@@ -300,24 +301,24 @@ static unsigned long init_fadump_mem_struct(struct fadump_mem_struct *fdm, ...@@ -300,24 +301,24 @@ static unsigned long init_fadump_mem_struct(struct fadump_mem_struct *fdm,
/* Kernel dump sections */ /* Kernel dump sections */
/* cpu state data section. */ /* cpu state data section. */
fdm->cpu_state_data.request_flag = cpu_to_be32(FADUMP_REQUEST_FLAG); fdm->cpu_state_data.request_flag = cpu_to_be32(RTAS_FADUMP_REQUEST_FLAG);
fdm->cpu_state_data.source_data_type = cpu_to_be16(FADUMP_CPU_STATE_DATA); fdm->cpu_state_data.source_data_type = cpu_to_be16(RTAS_FADUMP_CPU_STATE_DATA);
fdm->cpu_state_data.source_address = 0; fdm->cpu_state_data.source_address = 0;
fdm->cpu_state_data.source_len = cpu_to_be64(fw_dump.cpu_state_data_size); fdm->cpu_state_data.source_len = cpu_to_be64(fw_dump.cpu_state_data_size);
fdm->cpu_state_data.destination_address = cpu_to_be64(addr); fdm->cpu_state_data.destination_address = cpu_to_be64(addr);
addr += fw_dump.cpu_state_data_size; addr += fw_dump.cpu_state_data_size;
/* hpte region section */ /* hpte region section */
fdm->hpte_region.request_flag = cpu_to_be32(FADUMP_REQUEST_FLAG); fdm->hpte_region.request_flag = cpu_to_be32(RTAS_FADUMP_REQUEST_FLAG);
fdm->hpte_region.source_data_type = cpu_to_be16(FADUMP_HPTE_REGION); fdm->hpte_region.source_data_type = cpu_to_be16(RTAS_FADUMP_HPTE_REGION);
fdm->hpte_region.source_address = 0; fdm->hpte_region.source_address = 0;
fdm->hpte_region.source_len = cpu_to_be64(fw_dump.hpte_region_size); fdm->hpte_region.source_len = cpu_to_be64(fw_dump.hpte_region_size);
fdm->hpte_region.destination_address = cpu_to_be64(addr); fdm->hpte_region.destination_address = cpu_to_be64(addr);
addr += fw_dump.hpte_region_size; addr += fw_dump.hpte_region_size;
/* RMA region section */ /* RMA region section */
fdm->rmr_region.request_flag = cpu_to_be32(FADUMP_REQUEST_FLAG); fdm->rmr_region.request_flag = cpu_to_be32(RTAS_FADUMP_REQUEST_FLAG);
fdm->rmr_region.source_data_type = cpu_to_be16(FADUMP_REAL_MODE_REGION); fdm->rmr_region.source_data_type = cpu_to_be16(RTAS_FADUMP_REAL_MODE_REGION);
fdm->rmr_region.source_address = cpu_to_be64(RMA_START); fdm->rmr_region.source_address = cpu_to_be64(RMA_START);
fdm->rmr_region.source_len = cpu_to_be64(fw_dump.boot_memory_size); fdm->rmr_region.source_len = cpu_to_be64(fw_dump.boot_memory_size);
fdm->rmr_region.destination_address = cpu_to_be64(addr); fdm->rmr_region.destination_address = cpu_to_be64(addr);
...@@ -588,7 +589,7 @@ static int __init early_fadump_reserve_mem(char *p) ...@@ -588,7 +589,7 @@ static int __init early_fadump_reserve_mem(char *p)
} }
early_param("fadump_reserve_mem", early_fadump_reserve_mem); early_param("fadump_reserve_mem", early_fadump_reserve_mem);
static int register_fw_dump(struct fadump_mem_struct *fdm) static int register_fw_dump(struct rtas_fadump_mem_struct *fdm)
{ {
int rc, err; int rc, err;
unsigned int wait_time; unsigned int wait_time;
...@@ -599,7 +600,7 @@ static int register_fw_dump(struct fadump_mem_struct *fdm) ...@@ -599,7 +600,7 @@ static int register_fw_dump(struct fadump_mem_struct *fdm)
do { do {
rc = rtas_call(fw_dump.ibm_configure_kernel_dump, 3, 1, NULL, rc = rtas_call(fw_dump.ibm_configure_kernel_dump, 3, 1, NULL,
FADUMP_REGISTER, fdm, FADUMP_REGISTER, fdm,
sizeof(struct fadump_mem_struct)); sizeof(struct rtas_fadump_mem_struct));
wait_time = rtas_busy_delay_time(rc); wait_time = rtas_busy_delay_time(rc);
if (wait_time) if (wait_time)
...@@ -695,7 +696,7 @@ static inline int fadump_gpr_index(u64 id) ...@@ -695,7 +696,7 @@ static inline int fadump_gpr_index(u64 id)
int i = -1; int i = -1;
char str[3]; char str[3];
if ((id & GPR_MASK) == REG_ID("GPR")) { if ((id & GPR_MASK) == fadump_str_to_u64("GPR")) {
/* get the digits at the end */ /* get the digits at the end */
id &= ~GPR_MASK; id &= ~GPR_MASK;
id >>= 24; id >>= 24;
...@@ -717,30 +718,30 @@ static inline void fadump_set_regval(struct pt_regs *regs, u64 reg_id, ...@@ -717,30 +718,30 @@ static inline void fadump_set_regval(struct pt_regs *regs, u64 reg_id,
i = fadump_gpr_index(reg_id); i = fadump_gpr_index(reg_id);
if (i >= 0) if (i >= 0)
regs->gpr[i] = (unsigned long)reg_val; regs->gpr[i] = (unsigned long)reg_val;
else if (reg_id == REG_ID("NIA")) else if (reg_id == fadump_str_to_u64("NIA"))
regs->nip = (unsigned long)reg_val; regs->nip = (unsigned long)reg_val;
else if (reg_id == REG_ID("MSR")) else if (reg_id == fadump_str_to_u64("MSR"))
regs->msr = (unsigned long)reg_val; regs->msr = (unsigned long)reg_val;
else if (reg_id == REG_ID("CTR")) else if (reg_id == fadump_str_to_u64("CTR"))
regs->ctr = (unsigned long)reg_val; regs->ctr = (unsigned long)reg_val;
else if (reg_id == REG_ID("LR")) else if (reg_id == fadump_str_to_u64("LR"))
regs->link = (unsigned long)reg_val; regs->link = (unsigned long)reg_val;
else if (reg_id == REG_ID("XER")) else if (reg_id == fadump_str_to_u64("XER"))
regs->xer = (unsigned long)reg_val; regs->xer = (unsigned long)reg_val;
else if (reg_id == REG_ID("CR")) else if (reg_id == fadump_str_to_u64("CR"))
regs->ccr = (unsigned long)reg_val; regs->ccr = (unsigned long)reg_val;
else if (reg_id == REG_ID("DAR")) else if (reg_id == fadump_str_to_u64("DAR"))
regs->dar = (unsigned long)reg_val; regs->dar = (unsigned long)reg_val;
else if (reg_id == REG_ID("DSISR")) else if (reg_id == fadump_str_to_u64("DSISR"))
regs->dsisr = (unsigned long)reg_val; regs->dsisr = (unsigned long)reg_val;
} }
static struct fadump_reg_entry* static struct rtas_fadump_reg_entry*
fadump_read_registers(struct fadump_reg_entry *reg_entry, struct pt_regs *regs) fadump_read_registers(struct rtas_fadump_reg_entry *reg_entry, struct pt_regs *regs)
{ {
memset(regs, 0, sizeof(struct pt_regs)); memset(regs, 0, sizeof(struct pt_regs));
while (be64_to_cpu(reg_entry->reg_id) != REG_ID("CPUEND")) { while (be64_to_cpu(reg_entry->reg_id) != fadump_str_to_u64("CPUEND")) {
fadump_set_regval(regs, be64_to_cpu(reg_entry->reg_id), fadump_set_regval(regs, be64_to_cpu(reg_entry->reg_id),
be64_to_cpu(reg_entry->reg_value)); be64_to_cpu(reg_entry->reg_value));
reg_entry++; reg_entry++;
...@@ -850,10 +851,10 @@ void fadump_free_cpu_notes_buf(void) ...@@ -850,10 +851,10 @@ void fadump_free_cpu_notes_buf(void)
* state from fadump crash info structure populated by first kernel at the * state from fadump crash info structure populated by first kernel at the
* time of crash. * time of crash.
*/ */
static int __init fadump_build_cpu_notes(const struct fadump_mem_struct *fdm) static int __init fadump_build_cpu_notes(const struct rtas_fadump_mem_struct *fdm)
{ {
struct fadump_reg_save_area_header *reg_header; struct rtas_fadump_reg_save_area_header *reg_header;
struct fadump_reg_entry *reg_entry; struct rtas_fadump_reg_entry *reg_entry;
struct fadump_crash_info_header *fdh = NULL; struct fadump_crash_info_header *fdh = NULL;
void *vaddr; void *vaddr;
unsigned long addr; unsigned long addr;
...@@ -868,7 +869,8 @@ static int __init fadump_build_cpu_notes(const struct fadump_mem_struct *fdm) ...@@ -868,7 +869,8 @@ static int __init fadump_build_cpu_notes(const struct fadump_mem_struct *fdm)
vaddr = __va(addr); vaddr = __va(addr);
reg_header = vaddr; reg_header = vaddr;
if (be64_to_cpu(reg_header->magic_number) != REGSAVE_AREA_MAGIC) { if (be64_to_cpu(reg_header->magic_number) !=
fadump_str_to_u64("REGSAVE")) {
printk(KERN_ERR "Unable to read register save area.\n"); printk(KERN_ERR "Unable to read register save area.\n");
return -ENOENT; return -ENOENT;
} }
...@@ -880,7 +882,7 @@ static int __init fadump_build_cpu_notes(const struct fadump_mem_struct *fdm) ...@@ -880,7 +882,7 @@ static int __init fadump_build_cpu_notes(const struct fadump_mem_struct *fdm)
num_cpus = be32_to_cpu(*((__be32 *)(vaddr))); num_cpus = be32_to_cpu(*((__be32 *)(vaddr)));
pr_debug("NumCpus : %u\n", num_cpus); pr_debug("NumCpus : %u\n", num_cpus);
vaddr += sizeof(u32); vaddr += sizeof(u32);
reg_entry = (struct fadump_reg_entry *)vaddr; reg_entry = (struct rtas_fadump_reg_entry *)vaddr;
rc = fadump_setup_cpu_notes_buf(num_cpus); rc = fadump_setup_cpu_notes_buf(num_cpus);
if (rc != 0) if (rc != 0)
...@@ -892,22 +894,22 @@ static int __init fadump_build_cpu_notes(const struct fadump_mem_struct *fdm) ...@@ -892,22 +894,22 @@ static int __init fadump_build_cpu_notes(const struct fadump_mem_struct *fdm)
fdh = __va(fw_dump.fadumphdr_addr); fdh = __va(fw_dump.fadumphdr_addr);
for (i = 0; i < num_cpus; i++) { for (i = 0; i < num_cpus; i++) {
if (be64_to_cpu(reg_entry->reg_id) != REG_ID("CPUSTRT")) { if (be64_to_cpu(reg_entry->reg_id) != fadump_str_to_u64("CPUSTRT")) {
printk(KERN_ERR "Unable to read CPU state data\n"); printk(KERN_ERR "Unable to read CPU state data\n");
rc = -ENOENT; rc = -ENOENT;
goto error_out; goto error_out;
} }
/* Lower 4 bytes of reg_value contains logical cpu id */ /* Lower 4 bytes of reg_value contains logical cpu id */
cpu = be64_to_cpu(reg_entry->reg_value) & FADUMP_CPU_ID_MASK; cpu = be64_to_cpu(reg_entry->reg_value) & RTAS_FADUMP_CPU_ID_MASK;
if (fdh && !cpumask_test_cpu(cpu, &fdh->online_mask)) { if (fdh && !cpumask_test_cpu(cpu, &fdh->online_mask)) {
SKIP_TO_NEXT_CPU(reg_entry); RTAS_FADUMP_SKIP_TO_NEXT_CPU(reg_entry);
continue; continue;
} }
pr_debug("Reading register data for cpu %d...\n", cpu); pr_debug("Reading register data for cpu %d...\n", cpu);
if (fdh && fdh->crashing_cpu == cpu) { if (fdh && fdh->crashing_cpu == cpu) {
regs = fdh->regs; regs = fdh->regs;
note_buf = fadump_regs_to_elf_notes(note_buf, &regs); note_buf = fadump_regs_to_elf_notes(note_buf, &regs);
SKIP_TO_NEXT_CPU(reg_entry); RTAS_FADUMP_SKIP_TO_NEXT_CPU(reg_entry);
} else { } else {
reg_entry++; reg_entry++;
reg_entry = fadump_read_registers(reg_entry, &regs); reg_entry = fadump_read_registers(reg_entry, &regs);
...@@ -933,7 +935,7 @@ static int __init fadump_build_cpu_notes(const struct fadump_mem_struct *fdm) ...@@ -933,7 +935,7 @@ static int __init fadump_build_cpu_notes(const struct fadump_mem_struct *fdm)
* Validate and process the dump data stored by firmware before exporting * Validate and process the dump data stored by firmware before exporting
* it through '/proc/vmcore'. * it through '/proc/vmcore'.
*/ */
static int __init process_fadump(const struct fadump_mem_struct *fdm_active) static int __init process_fadump(const struct rtas_fadump_mem_struct *fdm_active)
{ {
struct fadump_crash_info_header *fdh; struct fadump_crash_info_header *fdh;
int rc = 0; int rc = 0;
...@@ -942,7 +944,7 @@ static int __init process_fadump(const struct fadump_mem_struct *fdm_active) ...@@ -942,7 +944,7 @@ static int __init process_fadump(const struct fadump_mem_struct *fdm_active)
return -EINVAL; return -EINVAL;
/* Check if the dump data is valid. */ /* Check if the dump data is valid. */
if ((be16_to_cpu(fdm_active->header.dump_status_flag) == FADUMP_ERROR_FLAG) || if ((be16_to_cpu(fdm_active->header.dump_status_flag) == RTAS_FADUMP_ERROR_FLAG) ||
(fdm_active->cpu_state_data.error_flags != 0) || (fdm_active->cpu_state_data.error_flags != 0) ||
(fdm_active->rmr_region.error_flags != 0)) { (fdm_active->rmr_region.error_flags != 0)) {
printk(KERN_ERR "Dump taken by platform is not valid\n"); printk(KERN_ERR "Dump taken by platform is not valid\n");
...@@ -1273,7 +1275,7 @@ static unsigned long init_fadump_header(unsigned long addr) ...@@ -1273,7 +1275,7 @@ static unsigned long init_fadump_header(unsigned long addr)
fdh->magic_number = FADUMP_CRASH_INFO_MAGIC; fdh->magic_number = FADUMP_CRASH_INFO_MAGIC;
fdh->elfcorehdr_addr = addr; fdh->elfcorehdr_addr = addr;
/* We will set the crashing cpu id in crash_fadump() during crash. */ /* We will set the crashing cpu id in crash_fadump() during crash. */
fdh->crashing_cpu = CPU_UNKNOWN; fdh->crashing_cpu = FADUMP_CPU_UNKNOWN;
return addr; return addr;
} }
...@@ -1307,7 +1309,7 @@ static int register_fadump(void) ...@@ -1307,7 +1309,7 @@ static int register_fadump(void)
return register_fw_dump(&fdm); return register_fw_dump(&fdm);
} }
static int fadump_unregister_dump(struct fadump_mem_struct *fdm) static int fadump_unregister_dump(struct rtas_fadump_mem_struct *fdm)
{ {
int rc = 0; int rc = 0;
unsigned int wait_time; unsigned int wait_time;
...@@ -1318,7 +1320,7 @@ static int fadump_unregister_dump(struct fadump_mem_struct *fdm) ...@@ -1318,7 +1320,7 @@ static int fadump_unregister_dump(struct fadump_mem_struct *fdm)
do { do {
rc = rtas_call(fw_dump.ibm_configure_kernel_dump, 3, 1, NULL, rc = rtas_call(fw_dump.ibm_configure_kernel_dump, 3, 1, NULL,
FADUMP_UNREGISTER, fdm, FADUMP_UNREGISTER, fdm,
sizeof(struct fadump_mem_struct)); sizeof(struct rtas_fadump_mem_struct));
wait_time = rtas_busy_delay_time(rc); wait_time = rtas_busy_delay_time(rc);
if (wait_time) if (wait_time)
...@@ -1334,7 +1336,7 @@ static int fadump_unregister_dump(struct fadump_mem_struct *fdm) ...@@ -1334,7 +1336,7 @@ static int fadump_unregister_dump(struct fadump_mem_struct *fdm)
return 0; return 0;
} }
static int fadump_invalidate_dump(const struct fadump_mem_struct *fdm) static int fadump_invalidate_dump(const struct rtas_fadump_mem_struct *fdm)
{ {
int rc = 0; int rc = 0;
unsigned int wait_time; unsigned int wait_time;
...@@ -1345,7 +1347,7 @@ static int fadump_invalidate_dump(const struct fadump_mem_struct *fdm) ...@@ -1345,7 +1347,7 @@ static int fadump_invalidate_dump(const struct fadump_mem_struct *fdm)
do { do {
rc = rtas_call(fw_dump.ibm_configure_kernel_dump, 3, 1, NULL, rc = rtas_call(fw_dump.ibm_configure_kernel_dump, 3, 1, NULL,
FADUMP_INVALIDATE, fdm, FADUMP_INVALIDATE, fdm,
sizeof(struct fadump_mem_struct)); sizeof(struct rtas_fadump_mem_struct));
wait_time = rtas_busy_delay_time(rc); wait_time = rtas_busy_delay_time(rc);
if (wait_time) if (wait_time)
...@@ -1561,7 +1563,7 @@ static ssize_t fadump_register_store(struct kobject *kobj, ...@@ -1561,7 +1563,7 @@ static ssize_t fadump_register_store(struct kobject *kobj,
static int fadump_region_show(struct seq_file *m, void *private) static int fadump_region_show(struct seq_file *m, void *private)
{ {
const struct fadump_mem_struct *fdm_ptr; const struct rtas_fadump_mem_struct *fdm_ptr;
if (!fw_dump.fadump_enabled) if (!fw_dump.fadump_enabled)
return 0; return 0;
......
arch/powerpc/platforms/pseries/rtas-fadump.h 0 → 100644
View file @ 0226e552
/* 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.
*/
#ifndef _PSERIES_RTAS_FADUMP_H
#define _PSERIES_RTAS_FADUMP_H
/* Firmware provided dump sections */
#define RTAS_FADUMP_CPU_STATE_DATA 0x0001
#define RTAS_FADUMP_HPTE_REGION 0x0002
#define RTAS_FADUMP_REAL_MODE_REGION 0x0011
/* Dump request flag */
#define RTAS_FADUMP_REQUEST_FLAG 0x00000001
/* Dump status flag */
#define RTAS_FADUMP_ERROR_FLAG 0x2000
/* Kernel Dump section info */
struct rtas_fadump_section {
__be32 request_flag;
__be16 source_data_type;
__be16 error_flags;
__be64 source_address;
__be64 source_len;
__be64 bytes_dumped;
__be64 destination_address;
};
/* ibm,configure-kernel-dump header. */
struct rtas_fadump_section_header {
__be32 dump_format_version;
__be16 dump_num_sections;
__be16 dump_status_flag;
__be32 offset_first_dump_section;
/* Fields for disk dump option. */
__be32 dd_block_size;
__be64 dd_block_offset;
__be64 dd_num_blocks;
__be32 dd_offset_disk_path;
/* Maximum time allowed to prevent an automatic dump-reboot. */
__be32 max_time_auto;
};
/*
* Firmware Assisted dump memory structure. This structure is required for
* registering future kernel dump with power firmware through rtas call.
*
* No disk dump option. Hence disk dump path string section is not included.
*/
struct rtas_fadump_mem_struct {
struct rtas_fadump_section_header header;
/* Kernel dump sections */
struct rtas_fadump_section cpu_state_data;
struct rtas_fadump_section hpte_region;
struct rtas_fadump_section rmr_region;
};
/*
* The firmware-assisted dump format.
*
* The register save area is an area in the partition's memory used to preserve
* the register contents (CPU state data) for the active CPUs during a firmware
* assisted dump. The dump format contains register save area header followed
* by register entries. Each list of registers for a CPU starts with "CPUSTRT"
* and ends with "CPUEND".
*/
/* Register save area header. */
struct rtas_fadump_reg_save_area_header {
__be64 magic_number;
__be32 version;
__be32 num_cpu_offset;
};
/* Register entry. */
struct rtas_fadump_reg_entry {
__be64 reg_id;
__be64 reg_value;
};
/* Utility macros */
#define RTAS_FADUMP_SKIP_TO_NEXT_CPU(reg_entry) \
({ \
while (be64_to_cpu(reg_entry->reg_id) != \
fadump_str_to_u64("CPUEND")) \
reg_entry++; \
reg_entry++; \
})
#define RTAS_FADUMP_CPU_ID_MASK ((1UL << 32) - 1)
#endif /* _PSERIES_RTAS_FADUMP_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7