* [PATCH v6 0/4] Introduce mini-dump support for remoteproc @ 2020-10-03 2:05 Siddharth Gupta 2020-10-03 2:05 ` [PATCH v6 1/4] remoteproc: core: Add ops to enable custom coredump functionality Siddharth Gupta ` (3 more replies) 0 siblings, 4 replies; 8+ messages in thread From: Siddharth Gupta @ 2020-10-03 2:05 UTC (permalink / raw) To: agross, bjorn.andersson, ohad, linux-remoteproc Cc: tsoni, linux-doc, linux-arm-msm, linux-kernel, rishabhb, Siddharth Gupta, psodagud, linux-arm-kernel Sometimes firmware sizes can be in tens of MB's and reading all the memory during coredump can consume lot of time and memory. Introducing support for mini-dumps. Mini-dump contains smallest amount of useful information, that could help to debug subsystem crashes. During bootup memory is allocated in SMEM (Shared memory) in the form of a table that contains the physical addresses and sizes of the regions that are supposed to be collected during coredump. This memory is shared amongst all processors in a Qualcomm platform, so all remoteprocs fill in their entry in the global table once they are out of reset. This patch series adds support for parsing the global minidump table and uses the current coredump frameork to expose this memory to userspace during remoteproc's recovery. This patch series also integrates the patch: https://patchwork.kernel.org/patch/11695541/ sent by Siddharth. Changelog: v5 -> v6: - Removed priv_cleanup operation from rproc_ops. The dump_segments list is updated and cleaned up each time minidump is invoked. - Split patch #2 into 2 parts - one that adds the rproc_minidump function, and the other that uses the new function in the qcom_q6v5_pas driver. - Updated structs in qcom_minidump to explicitly indicate the endianness of the data stored in SMEM, also updated member names. - Read the global table of contents in SMEM each time adsp_minidump is invoked. v4 -> v5: - Fixed adsp_add_minidump_segments to read IO memory using appropriate functions. v3 -> v4: - Made adsp_priv_cleanup a static function. v2 -> v3: - Refactored code to remove dependency on Qualcomm configs. - Renamed do_rproc_minidump to rproc_minidump and marked as exported symbol. v1 -> v2: - 3 kernel test robot warnings have been resolved. - Introduced priv_cleanup op in order to making the cleaning of private elements used by the remoteproc more readable. - Removed rproc_cleanup_priv as it is no longer needed. - Switched to if/else format for rproc_alloc in order to keep the static const decalaration of adsp_minidump_ops. Siddharth Gupta (4): remoteproc: core: Add ops to enable custom coredump functionality remoteproc: coredump: Add minidump functionality remoteproc: qcom: Add capability to collect minidumps remoteproc: qcom: Add minidump id for sm8150 modem drivers/remoteproc/qcom_minidump.h | 64 ++++++++++++++ drivers/remoteproc/qcom_q6v5_pas.c | 105 +++++++++++++++++++++- drivers/remoteproc/remoteproc_core.c | 6 +- drivers/remoteproc/remoteproc_coredump.c | 132 ++++++++++++++++++++++++++++ drivers/remoteproc/remoteproc_elf_helpers.h | 27 ++++++ include/linux/remoteproc.h | 3 + 6 files changed, 334 insertions(+), 3 deletions(-) create mode 100644 drivers/remoteproc/qcom_minidump.h -- Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v6 1/4] remoteproc: core: Add ops to enable custom coredump functionality 2020-10-03 2:05 [PATCH v6 0/4] Introduce mini-dump support for remoteproc Siddharth Gupta @ 2020-10-03 2:05 ` Siddharth Gupta 2020-10-03 2:05 ` [PATCH v6 2/4] remoteproc: coredump: Add minidump functionality Siddharth Gupta ` (2 subsequent siblings) 3 siblings, 0 replies; 8+ messages in thread From: Siddharth Gupta @ 2020-10-03 2:05 UTC (permalink / raw) To: agross, bjorn.andersson, ohad, linux-remoteproc Cc: tsoni, linux-doc, linux-arm-msm, linux-kernel, rishabhb, Siddharth Gupta, psodagud, linux-arm-kernel Each remoteproc might have different requirements for coredumps and might want to choose the type of dumps it wants to collect. This change allows remoteproc drivers to specify their own custom dump function to be executed in place of rproc_coredump. If the coredump op is not specified by the remoteproc driver it will be set to rproc_coredump by default. Signed-off-by: Siddharth Gupta <sidgup@codeaurora.org> --- drivers/remoteproc/remoteproc_core.c | 6 +++++- include/linux/remoteproc.h | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 7f90eee..dcc1341 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -1681,7 +1681,7 @@ int rproc_trigger_recovery(struct rproc *rproc) goto unlock_mutex; /* generate coredump */ - rproc_coredump(rproc); + rproc->ops->coredump(rproc); /* load firmware */ ret = request_firmware(&firmware_p, rproc->firmware, dev); @@ -2103,6 +2103,10 @@ static int rproc_alloc_ops(struct rproc *rproc, const struct rproc_ops *ops) if (!rproc->ops) return -ENOMEM; + /* Default to rproc_coredump if no coredump function is specified */ + if (!rproc->ops->coredump) + rproc->ops->coredump = rproc_coredump; + if (rproc->ops->load) return 0; diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h index 2fa68bf..a66e2cb 100644 --- a/include/linux/remoteproc.h +++ b/include/linux/remoteproc.h @@ -375,6 +375,7 @@ enum rsc_handling_status { * @get_boot_addr: get boot address to entry point specified in firmware * @panic: optional callback to react to system panic, core will delay * panic at least the returned number of milliseconds + * @coredump: collect firmware dump after the subsystem is shutdown */ struct rproc_ops { int (*prepare)(struct rproc *rproc); @@ -393,6 +394,7 @@ struct rproc_ops { int (*sanity_check)(struct rproc *rproc, const struct firmware *fw); u64 (*get_boot_addr)(struct rproc *rproc, const struct firmware *fw); unsigned long (*panic)(struct rproc *rproc); + void (*coredump)(struct rproc *rproc); }; /** -- Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v6 2/4] remoteproc: coredump: Add minidump functionality 2020-10-03 2:05 [PATCH v6 0/4] Introduce mini-dump support for remoteproc Siddharth Gupta 2020-10-03 2:05 ` [PATCH v6 1/4] remoteproc: core: Add ops to enable custom coredump functionality Siddharth Gupta @ 2020-10-03 2:05 ` Siddharth Gupta 2020-10-26 21:09 ` Bjorn Andersson 2020-10-03 2:05 ` [PATCH v6 3/4] remoteproc: qcom: Add capability to collect minidumps Siddharth Gupta 2020-10-03 2:05 ` [PATCH v6 4/4] remoteproc: qcom: Add minidump id for sm8150 modem Siddharth Gupta 3 siblings, 1 reply; 8+ messages in thread From: Siddharth Gupta @ 2020-10-03 2:05 UTC (permalink / raw) To: agross, bjorn.andersson, ohad, linux-remoteproc Cc: tsoni, linux-doc, linux-arm-msm, linux-kernel, rishabhb, Siddharth Gupta, psodagud, linux-arm-kernel This change adds a new kind of core dump mechanism which instead of dumping entire program segments of the firmware, dumps sections of the remoteproc memory which are sufficient to allow debugging the firmware. This function thus uses section headers instead of program headers during creation of the core dump elf. Signed-off-by: Rishabh Bhatnagar <rishabhb@codeaurora.org> Signed-off-by: Siddharth Gupta <sidgup@codeaurora.org> --- drivers/remoteproc/remoteproc_coredump.c | 132 ++++++++++++++++++++++++++++ drivers/remoteproc/remoteproc_elf_helpers.h | 27 ++++++ include/linux/remoteproc.h | 1 + 3 files changed, 160 insertions(+) diff --git a/drivers/remoteproc/remoteproc_coredump.c b/drivers/remoteproc/remoteproc_coredump.c index bb15a29..e7d1394 100644 --- a/drivers/remoteproc/remoteproc_coredump.c +++ b/drivers/remoteproc/remoteproc_coredump.c @@ -13,6 +13,8 @@ #include "remoteproc_internal.h" #include "remoteproc_elf_helpers.h" +#define MAX_STRTBL_SIZE 512 + struct rproc_coredump_state { struct rproc *rproc; void *header; @@ -323,3 +325,133 @@ void rproc_coredump(struct rproc *rproc) */ wait_for_completion(&dump_state.dump_done); } + +/** + * rproc_minidump() - perform minidump + * @rproc: rproc handle + * + * This function will generate an ELF header for the registered sections of + * segments and create a devcoredump device associated with rproc. Based on + * the coredump configuration this function will directly copy the segments + * from device memory to userspace or copy segments from device memory to + * a separate buffer, which can then be read by userspace. + * The first approach avoids using extra vmalloc memory. But it will stall + * recovery flow until dump is read by userspace. + */ +void rproc_minidump(struct rproc *rproc) +{ + struct rproc_dump_segment *segment; + void *shdr; + void *ehdr; + size_t data_size; + size_t offset; + void *data; + u8 class = rproc->elf_class; + int shnum; + struct rproc_coredump_state dump_state; + unsigned int dump_conf = rproc->dump_conf; + char *str_tbl = "STR_TBL"; + + if (list_empty(&rproc->dump_segments) || + dump_conf == RPROC_COREDUMP_DISABLED) + return; + + if (class == ELFCLASSNONE) { + dev_err(&rproc->dev, "Elf class is not set\n"); + return; + } + + /* + * We allocate two extra section headers. The first one is null. + * Second section header is for the string table. Also space is + * allocated for string table. + */ + data_size = elf_size_of_hdr(class) + 2 * elf_size_of_shdr(class) + + MAX_STRTBL_SIZE; + shnum = 2; + + list_for_each_entry(segment, &rproc->dump_segments, node) { + data_size += elf_size_of_shdr(class); + if (dump_conf == RPROC_COREDUMP_DEFAULT) + data_size += segment->size; + shnum++; + } + + data = vmalloc(data_size); + if (!data) + return; + + ehdr = data; + memset(ehdr, 0, elf_size_of_hdr(class)); + /* e_ident field is common for both elf32 and elf64 */ + elf_hdr_init_ident(ehdr, class); + + elf_hdr_set_e_type(class, ehdr, ET_CORE); + elf_hdr_set_e_machine(class, ehdr, rproc->elf_machine); + elf_hdr_set_e_version(class, ehdr, EV_CURRENT); + elf_hdr_set_e_entry(class, ehdr, rproc->bootaddr); + elf_hdr_set_e_shoff(class, ehdr, elf_size_of_hdr(class)); + elf_hdr_set_e_ehsize(class, ehdr, elf_size_of_hdr(class)); + elf_hdr_set_e_shentsize(class, ehdr, elf_size_of_shdr(class)); + elf_hdr_set_e_shnum(class, ehdr, shnum); + elf_hdr_set_e_shstrndx(class, ehdr, 1); + + /* Set the first section header as null and move to the next one. */ + shdr = data + elf_hdr_get_e_shoff(class, ehdr); + memset(shdr, 0, elf_size_of_shdr(class)); + shdr += elf_size_of_shdr(class); + + /* Initialize the string table. */ + offset = elf_hdr_get_e_shoff(class, ehdr) + + elf_size_of_shdr(class) * elf_hdr_get_e_shnum(class, ehdr); + memset(data + offset, 0, MAX_STRTBL_SIZE); + + /* Fill in the string table section header. */ + memset(shdr, 0, elf_size_of_shdr(class)); + elf_shdr_set_sh_type(class, shdr, SHT_STRTAB); + elf_shdr_set_sh_offset(class, shdr, offset); + elf_shdr_set_sh_size(class, shdr, MAX_STRTBL_SIZE); + elf_shdr_set_sh_entsize(class, shdr, 0); + elf_shdr_set_sh_flags(class, shdr, 0); + elf_shdr_set_sh_name(class, shdr, set_section_name(str_tbl, ehdr, class)); + offset += elf_shdr_get_sh_size(class, shdr); + shdr += elf_size_of_shdr(class); + + list_for_each_entry(segment, &rproc->dump_segments, node) { + memset(shdr, 0, elf_size_of_shdr(class)); + elf_shdr_set_sh_type(class, shdr, SHT_PROGBITS); + elf_shdr_set_sh_offset(class, shdr, offset); + elf_shdr_set_sh_addr(class, shdr, segment->da); + elf_shdr_set_sh_size(class, shdr, segment->size); + elf_shdr_set_sh_entsize(class, shdr, 0); + elf_shdr_set_sh_flags(class, shdr, SHF_WRITE); + elf_shdr_set_sh_name(class, shdr, + set_section_name(segment->priv, ehdr, class)); + + /* No need to copy segments for inline dumps */ + if (dump_conf == RPROC_COREDUMP_DEFAULT) + rproc_copy_segment(rproc, data + offset, segment, 0, + segment->size); + offset += elf_shdr_get_sh_size(class, shdr); + shdr += elf_size_of_shdr(class); + } + + if (dump_conf == RPROC_COREDUMP_DEFAULT) { + dev_coredumpv(&rproc->dev, data, data_size, GFP_KERNEL); + return; + } + + /* Initialize the dump state struct to be used by rproc_coredump_read */ + dump_state.rproc = rproc; + dump_state.header = data; + init_completion(&dump_state.dump_done); + + dev_coredumpm(&rproc->dev, NULL, &dump_state, data_size, GFP_KERNEL, + rproc_coredump_read, rproc_coredump_free); + + /* Wait until the dump is read and free is called. Data is freed + * by devcoredump framework automatically after 5 minutes. + */ + wait_for_completion(&dump_state.dump_done); +} +EXPORT_SYMBOL(rproc_minidump); diff --git a/drivers/remoteproc/remoteproc_elf_helpers.h b/drivers/remoteproc/remoteproc_elf_helpers.h index 4b6be7b..d83ebca 100644 --- a/drivers/remoteproc/remoteproc_elf_helpers.h +++ b/drivers/remoteproc/remoteproc_elf_helpers.h @@ -11,6 +11,7 @@ #include <linux/elf.h> #include <linux/types.h> +#define MAX_NAME_LENGTH 16 /** * fw_elf_get_class - Get elf class * @fw: the ELF firmware image @@ -65,6 +66,7 @@ ELF_GEN_FIELD_GET_SET(hdr, e_type, u16) ELF_GEN_FIELD_GET_SET(hdr, e_version, u32) ELF_GEN_FIELD_GET_SET(hdr, e_ehsize, u32) ELF_GEN_FIELD_GET_SET(hdr, e_phentsize, u16) +ELF_GEN_FIELD_GET_SET(hdr, e_shentsize, u16) ELF_GEN_FIELD_GET_SET(phdr, p_paddr, u64) ELF_GEN_FIELD_GET_SET(phdr, p_vaddr, u64) @@ -74,6 +76,9 @@ ELF_GEN_FIELD_GET_SET(phdr, p_type, u32) ELF_GEN_FIELD_GET_SET(phdr, p_offset, u64) ELF_GEN_FIELD_GET_SET(phdr, p_flags, u32) ELF_GEN_FIELD_GET_SET(phdr, p_align, u64) +ELF_GEN_FIELD_GET_SET(shdr, sh_type, u32) +ELF_GEN_FIELD_GET_SET(shdr, sh_flags, u32) +ELF_GEN_FIELD_GET_SET(shdr, sh_entsize, u16) ELF_GEN_FIELD_GET_SET(shdr, sh_size, u64) ELF_GEN_FIELD_GET_SET(shdr, sh_offset, u64) @@ -93,4 +98,26 @@ ELF_STRUCT_SIZE(shdr) ELF_STRUCT_SIZE(phdr) ELF_STRUCT_SIZE(hdr) +static inline unsigned int set_section_name(const char *name, void *ehdr, + u8 class) +{ + u16 shstrndx = elf_hdr_get_e_shstrndx(class, ehdr); + void *shdr; + char *strtab; + static int strtable_idx = 1; + int idx, ret = 0; + + shdr = ehdr + elf_size_of_hdr(class) + shstrndx * elf_size_of_shdr(class); + strtab = ehdr + elf_shdr_get_sh_offset(class, shdr); + idx = strtable_idx; + if (!strtab || !name) + return 0; + + ret = idx; + idx += strlcpy((strtab + idx), name, MAX_NAME_LENGTH); + strtable_idx = idx + 1; + + return ret; +} + #endif /* REMOTEPROC_ELF_LOADER_H */ diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h index a66e2cb..0864ece 100644 --- a/include/linux/remoteproc.h +++ b/include/linux/remoteproc.h @@ -656,6 +656,7 @@ rproc_of_resm_mem_entry_init(struct device *dev, u32 of_resm_idx, size_t len, int rproc_boot(struct rproc *rproc); void rproc_shutdown(struct rproc *rproc); void rproc_report_crash(struct rproc *rproc, enum rproc_crash_type type); +void rproc_minidump(struct rproc *rproc); int rproc_coredump_add_segment(struct rproc *rproc, dma_addr_t da, size_t size); int rproc_coredump_add_custom_segment(struct rproc *rproc, dma_addr_t da, size_t size, -- Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v6 2/4] remoteproc: coredump: Add minidump functionality 2020-10-03 2:05 ` [PATCH v6 2/4] remoteproc: coredump: Add minidump functionality Siddharth Gupta @ 2020-10-26 21:09 ` Bjorn Andersson 2020-10-29 23:54 ` Siddharth Gupta 0 siblings, 1 reply; 8+ messages in thread From: Bjorn Andersson @ 2020-10-26 21:09 UTC (permalink / raw) To: Siddharth Gupta Cc: ohad, tsoni, linux-doc, linux-arm-msm, linux-remoteproc, linux-kernel, agross, rishabhb, psodagud, linux-arm-kernel On Fri 02 Oct 21:05 CDT 2020, Siddharth Gupta wrote: > This change adds a new kind of core dump mechanism which instead of dumping > entire program segments of the firmware, dumps sections of the remoteproc > memory which are sufficient to allow debugging the firmware. This function > thus uses section headers instead of program headers during creation of the > core dump elf. > > Signed-off-by: Rishabh Bhatnagar <rishabhb@codeaurora.org> > Signed-off-by: Siddharth Gupta <sidgup@codeaurora.org> > --- > drivers/remoteproc/remoteproc_coredump.c | 132 ++++++++++++++++++++++++++++ > drivers/remoteproc/remoteproc_elf_helpers.h | 27 ++++++ > include/linux/remoteproc.h | 1 + > 3 files changed, 160 insertions(+) > > diff --git a/drivers/remoteproc/remoteproc_coredump.c b/drivers/remoteproc/remoteproc_coredump.c > index bb15a29..e7d1394 100644 > --- a/drivers/remoteproc/remoteproc_coredump.c > +++ b/drivers/remoteproc/remoteproc_coredump.c > @@ -13,6 +13,8 @@ > #include "remoteproc_internal.h" > #include "remoteproc_elf_helpers.h" > > +#define MAX_STRTBL_SIZE 512 > + > struct rproc_coredump_state { > struct rproc *rproc; > void *header; > @@ -323,3 +325,133 @@ void rproc_coredump(struct rproc *rproc) > */ > wait_for_completion(&dump_state.dump_done); > } > + > +/** > + * rproc_minidump() - perform minidump > + * @rproc: rproc handle > + * > + * This function will generate an ELF header for the registered sections of > + * segments and create a devcoredump device associated with rproc. Based on > + * the coredump configuration this function will directly copy the segments > + * from device memory to userspace or copy segments from device memory to > + * a separate buffer, which can then be read by userspace. > + * The first approach avoids using extra vmalloc memory. But it will stall > + * recovery flow until dump is read by userspace. > + */ > +void rproc_minidump(struct rproc *rproc) Just to confirm, this does the same thing as rproc_coredump() with the difference that instead of storing the segments in program headers, you reference them using section headers? > +{ > + struct rproc_dump_segment *segment; > + void *shdr; > + void *ehdr; > + size_t data_size; > + size_t offset; > + void *data; > + u8 class = rproc->elf_class; > + int shnum; > + struct rproc_coredump_state dump_state; > + unsigned int dump_conf = rproc->dump_conf; > + char *str_tbl = "STR_TBL"; > + > + if (list_empty(&rproc->dump_segments) || > + dump_conf == RPROC_COREDUMP_DISABLED) > + return; > + > + if (class == ELFCLASSNONE) { > + dev_err(&rproc->dev, "Elf class is not set\n"); > + return; > + } > + > + /* > + * We allocate two extra section headers. The first one is null. > + * Second section header is for the string table. Also space is > + * allocated for string table. > + */ > + data_size = elf_size_of_hdr(class) + 2 * elf_size_of_shdr(class) + > + MAX_STRTBL_SIZE; Once you start populating the string table there's no checks that this isn't overrun. But really > + shnum = 2; > + > + list_for_each_entry(segment, &rproc->dump_segments, node) { > + data_size += elf_size_of_shdr(class); > + if (dump_conf == RPROC_COREDUMP_DEFAULT) > + data_size += segment->size; > + shnum++; > + } > + > + data = vmalloc(data_size); > + if (!data) > + return; > + > + ehdr = data; > + memset(ehdr, 0, elf_size_of_hdr(class)); > + /* e_ident field is common for both elf32 and elf64 */ > + elf_hdr_init_ident(ehdr, class); > + > + elf_hdr_set_e_type(class, ehdr, ET_CORE); > + elf_hdr_set_e_machine(class, ehdr, rproc->elf_machine); > + elf_hdr_set_e_version(class, ehdr, EV_CURRENT); > + elf_hdr_set_e_entry(class, ehdr, rproc->bootaddr); > + elf_hdr_set_e_shoff(class, ehdr, elf_size_of_hdr(class)); > + elf_hdr_set_e_ehsize(class, ehdr, elf_size_of_hdr(class)); > + elf_hdr_set_e_shentsize(class, ehdr, elf_size_of_shdr(class)); > + elf_hdr_set_e_shnum(class, ehdr, shnum); > + elf_hdr_set_e_shstrndx(class, ehdr, 1); > + > + /* Set the first section header as null and move to the next one. */ > + shdr = data + elf_hdr_get_e_shoff(class, ehdr); > + memset(shdr, 0, elf_size_of_shdr(class)); > + shdr += elf_size_of_shdr(class); > + > + /* Initialize the string table. */ > + offset = elf_hdr_get_e_shoff(class, ehdr) + > + elf_size_of_shdr(class) * elf_hdr_get_e_shnum(class, ehdr); > + memset(data + offset, 0, MAX_STRTBL_SIZE); > + > + /* Fill in the string table section header. */ > + memset(shdr, 0, elf_size_of_shdr(class)); > + elf_shdr_set_sh_type(class, shdr, SHT_STRTAB); > + elf_shdr_set_sh_offset(class, shdr, offset); > + elf_shdr_set_sh_size(class, shdr, MAX_STRTBL_SIZE); > + elf_shdr_set_sh_entsize(class, shdr, 0); > + elf_shdr_set_sh_flags(class, shdr, 0); > + elf_shdr_set_sh_name(class, shdr, set_section_name(str_tbl, ehdr, class)); > + offset += elf_shdr_get_sh_size(class, shdr); > + shdr += elf_size_of_shdr(class); I assume this last part creates the null entry? How about mentioning that in a comment - and perhaps why there needs to be a null entry. > + > + list_for_each_entry(segment, &rproc->dump_segments, node) { > + memset(shdr, 0, elf_size_of_shdr(class)); > + elf_shdr_set_sh_type(class, shdr, SHT_PROGBITS); > + elf_shdr_set_sh_offset(class, shdr, offset); > + elf_shdr_set_sh_addr(class, shdr, segment->da); > + elf_shdr_set_sh_size(class, shdr, segment->size); > + elf_shdr_set_sh_entsize(class, shdr, 0); > + elf_shdr_set_sh_flags(class, shdr, SHF_WRITE); > + elf_shdr_set_sh_name(class, shdr, > + set_section_name(segment->priv, ehdr, class)); > + > + /* No need to copy segments for inline dumps */ > + if (dump_conf == RPROC_COREDUMP_DEFAULT) > + rproc_copy_segment(rproc, data + offset, segment, 0, > + segment->size); > + offset += elf_shdr_get_sh_size(class, shdr); > + shdr += elf_size_of_shdr(class); > + } > + > + if (dump_conf == RPROC_COREDUMP_DEFAULT) { > + dev_coredumpv(&rproc->dev, data, data_size, GFP_KERNEL); > + return; > + } > + > + /* Initialize the dump state struct to be used by rproc_coredump_read */ > + dump_state.rproc = rproc; > + dump_state.header = data; > + init_completion(&dump_state.dump_done); > + > + dev_coredumpm(&rproc->dev, NULL, &dump_state, data_size, GFP_KERNEL, > + rproc_coredump_read, rproc_coredump_free); > + > + /* Wait until the dump is read and free is called. Data is freed > + * by devcoredump framework automatically after 5 minutes. > + */ > + wait_for_completion(&dump_state.dump_done); > +} > +EXPORT_SYMBOL(rproc_minidump); > diff --git a/drivers/remoteproc/remoteproc_elf_helpers.h b/drivers/remoteproc/remoteproc_elf_helpers.h > index 4b6be7b..d83ebca 100644 > --- a/drivers/remoteproc/remoteproc_elf_helpers.h > +++ b/drivers/remoteproc/remoteproc_elf_helpers.h > @@ -11,6 +11,7 @@ > #include <linux/elf.h> > #include <linux/types.h> > > +#define MAX_NAME_LENGTH 16 This name is too generic. Why is it 16? > +static inline unsigned int set_section_name(const char *name, void *ehdr, > + u8 class) > +{ > + u16 shstrndx = elf_hdr_get_e_shstrndx(class, ehdr); > + void *shdr; > + char *strtab; > + static int strtable_idx = 1; This can't be static as this will only start at 1 on the first invocation of rproc_minidump(). I think it would be perfectly fine if you simply scan the string list to find the next available slot. > + int idx, ret = 0; No need to initialize ret as the first usage is an assignment. Regards, Bjorn _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v6 2/4] remoteproc: coredump: Add minidump functionality 2020-10-26 21:09 ` Bjorn Andersson @ 2020-10-29 23:54 ` Siddharth Gupta 2020-11-02 17:47 ` Bjorn Andersson 0 siblings, 1 reply; 8+ messages in thread From: Siddharth Gupta @ 2020-10-29 23:54 UTC (permalink / raw) To: Bjorn Andersson Cc: ohad, tsoni, linux-doc, linux-arm-msm, linux-remoteproc, linux-kernel, agross, rishabhb, psodagud, linux-arm-kernel On 10/26/2020 2:09 PM, Bjorn Andersson wrote: > On Fri 02 Oct 21:05 CDT 2020, Siddharth Gupta wrote: > >> This change adds a new kind of core dump mechanism which instead of dumping >> entire program segments of the firmware, dumps sections of the remoteproc >> memory which are sufficient to allow debugging the firmware. This function >> thus uses section headers instead of program headers during creation of the >> core dump elf. >> >> Signed-off-by: Rishabh Bhatnagar <rishabhb@codeaurora.org> >> Signed-off-by: Siddharth Gupta <sidgup@codeaurora.org> >> --- >> drivers/remoteproc/remoteproc_coredump.c | 132 ++++++++++++++++++++++++++++ >> drivers/remoteproc/remoteproc_elf_helpers.h | 27 ++++++ >> include/linux/remoteproc.h | 1 + >> 3 files changed, 160 insertions(+) >> >> diff --git a/drivers/remoteproc/remoteproc_coredump.c b/drivers/remoteproc/remoteproc_coredump.c >> index bb15a29..e7d1394 100644 >> --- a/drivers/remoteproc/remoteproc_coredump.c >> +++ b/drivers/remoteproc/remoteproc_coredump.c >> @@ -13,6 +13,8 @@ >> #include "remoteproc_internal.h" >> #include "remoteproc_elf_helpers.h" >> >> +#define MAX_STRTBL_SIZE 512 >> + >> struct rproc_coredump_state { >> struct rproc *rproc; >> void *header; >> @@ -323,3 +325,133 @@ void rproc_coredump(struct rproc *rproc) >> */ >> wait_for_completion(&dump_state.dump_done); >> } >> + >> +/** >> + * rproc_minidump() - perform minidump >> + * @rproc: rproc handle >> + * >> + * This function will generate an ELF header for the registered sections of >> + * segments and create a devcoredump device associated with rproc. Based on >> + * the coredump configuration this function will directly copy the segments >> + * from device memory to userspace or copy segments from device memory to >> + * a separate buffer, which can then be read by userspace. >> + * The first approach avoids using extra vmalloc memory. But it will stall >> + * recovery flow until dump is read by userspace. >> + */ >> +void rproc_minidump(struct rproc *rproc) > Just to confirm, this does the same thing as rproc_coredump() with the > difference that instead of storing the segments in program headers, you > reference them using section headers? Yes, that is correct. > >> +{ >> + struct rproc_dump_segment *segment; >> + void *shdr; >> + void *ehdr; >> + size_t data_size; >> + size_t offset; >> + void *data; >> + u8 class = rproc->elf_class; >> + int shnum; >> + struct rproc_coredump_state dump_state; >> + unsigned int dump_conf = rproc->dump_conf; >> + char *str_tbl = "STR_TBL"; >> + >> + if (list_empty(&rproc->dump_segments) || >> + dump_conf == RPROC_COREDUMP_DISABLED) >> + return; >> + >> + if (class == ELFCLASSNONE) { >> + dev_err(&rproc->dev, "Elf class is not set\n"); >> + return; >> + } >> + >> + /* >> + * We allocate two extra section headers. The first one is null. >> + * Second section header is for the string table. Also space is >> + * allocated for string table. >> + */ >> + data_size = elf_size_of_hdr(class) + 2 * elf_size_of_shdr(class) + >> + MAX_STRTBL_SIZE; > Once you start populating the string table there's no checks that this > isn't overrun. I will update the code to dynamically allocate space for the STRTBL. > > But really > >> + shnum = 2; >> + >> + list_for_each_entry(segment, &rproc->dump_segments, node) { >> + data_size += elf_size_of_shdr(class); >> + if (dump_conf == RPROC_COREDUMP_DEFAULT) >> + data_size += segment->size; >> + shnum++; >> + } >> + >> + data = vmalloc(data_size); >> + if (!data) >> + return; >> + >> + ehdr = data; >> + memset(ehdr, 0, elf_size_of_hdr(class)); >> + /* e_ident field is common for both elf32 and elf64 */ >> + elf_hdr_init_ident(ehdr, class); >> + >> + elf_hdr_set_e_type(class, ehdr, ET_CORE); >> + elf_hdr_set_e_machine(class, ehdr, rproc->elf_machine); >> + elf_hdr_set_e_version(class, ehdr, EV_CURRENT); >> + elf_hdr_set_e_entry(class, ehdr, rproc->bootaddr); >> + elf_hdr_set_e_shoff(class, ehdr, elf_size_of_hdr(class)); >> + elf_hdr_set_e_ehsize(class, ehdr, elf_size_of_hdr(class)); >> + elf_hdr_set_e_shentsize(class, ehdr, elf_size_of_shdr(class)); >> + elf_hdr_set_e_shnum(class, ehdr, shnum); >> + elf_hdr_set_e_shstrndx(class, ehdr, 1); >> + >> + /* Set the first section header as null and move to the next one. */ >> + shdr = data + elf_hdr_get_e_shoff(class, ehdr); >> + memset(shdr, 0, elf_size_of_shdr(class)); >> + shdr += elf_size_of_shdr(class); >> + >> + /* Initialize the string table. */ >> + offset = elf_hdr_get_e_shoff(class, ehdr) + >> + elf_size_of_shdr(class) * elf_hdr_get_e_shnum(class, ehdr); >> + memset(data + offset, 0, MAX_STRTBL_SIZE); >> + >> + /* Fill in the string table section header. */ >> + memset(shdr, 0, elf_size_of_shdr(class)); >> + elf_shdr_set_sh_type(class, shdr, SHT_STRTAB); >> + elf_shdr_set_sh_offset(class, shdr, offset); >> + elf_shdr_set_sh_size(class, shdr, MAX_STRTBL_SIZE); >> + elf_shdr_set_sh_entsize(class, shdr, 0); >> + elf_shdr_set_sh_flags(class, shdr, 0); >> + elf_shdr_set_sh_name(class, shdr, set_section_name(str_tbl, ehdr, class)); >> + offset += elf_shdr_get_sh_size(class, shdr); >> + shdr += elf_size_of_shdr(class); > I assume this last part creates the null entry? How about mentioning > that in a comment - and perhaps why there needs to be a null entry. Okay sure. I will add that comment. > >> + >> + list_for_each_entry(segment, &rproc->dump_segments, node) { >> + memset(shdr, 0, elf_size_of_shdr(class)); >> + elf_shdr_set_sh_type(class, shdr, SHT_PROGBITS); >> + elf_shdr_set_sh_offset(class, shdr, offset); >> + elf_shdr_set_sh_addr(class, shdr, segment->da); >> + elf_shdr_set_sh_size(class, shdr, segment->size); >> + elf_shdr_set_sh_entsize(class, shdr, 0); >> + elf_shdr_set_sh_flags(class, shdr, SHF_WRITE); >> + elf_shdr_set_sh_name(class, shdr, >> + set_section_name(segment->priv, ehdr, class)); >> + >> + /* No need to copy segments for inline dumps */ >> + if (dump_conf == RPROC_COREDUMP_DEFAULT) >> + rproc_copy_segment(rproc, data + offset, segment, 0, >> + segment->size); >> + offset += elf_shdr_get_sh_size(class, shdr); >> + shdr += elf_size_of_shdr(class); >> + } >> + >> + if (dump_conf == RPROC_COREDUMP_DEFAULT) { >> + dev_coredumpv(&rproc->dev, data, data_size, GFP_KERNEL); >> + return; >> + } >> + >> + /* Initialize the dump state struct to be used by rproc_coredump_read */ >> + dump_state.rproc = rproc; >> + dump_state.header = data; >> + init_completion(&dump_state.dump_done); >> + >> + dev_coredumpm(&rproc->dev, NULL, &dump_state, data_size, GFP_KERNEL, >> + rproc_coredump_read, rproc_coredump_free); >> + >> + /* Wait until the dump is read and free is called. Data is freed >> + * by devcoredump framework automatically after 5 minutes. >> + */ >> + wait_for_completion(&dump_state.dump_done); >> +} >> +EXPORT_SYMBOL(rproc_minidump); >> diff --git a/drivers/remoteproc/remoteproc_elf_helpers.h b/drivers/remoteproc/remoteproc_elf_helpers.h >> index 4b6be7b..d83ebca 100644 >> --- a/drivers/remoteproc/remoteproc_elf_helpers.h >> +++ b/drivers/remoteproc/remoteproc_elf_helpers.h >> @@ -11,6 +11,7 @@ >> #include <linux/elf.h> >> #include <linux/types.h> >> >> +#define MAX_NAME_LENGTH 16 > This name is too generic. Why is it 16? I will update the name to MAX_SHDR_NAME_LEN. In our usecase we didn't expect a length of the section name to exceed 16 characters (MAX_REGION_NAME_LENGTH defined in qcom_minidump.h in patch 03/04). It might change later if users want to increase the size. What would you prefer the max name length for the section header to be? > >> +static inline unsigned int set_section_name(const char *name, void *ehdr, >> + u8 class) >> +{ >> + u16 shstrndx = elf_hdr_get_e_shstrndx(class, ehdr); >> + void *shdr; >> + char *strtab; >> + static int strtable_idx = 1; > This can't be static as this will only start at 1 on the first > invocation of rproc_minidump(). > > I think it would be perfectly fine if you simply scan the string list to > find the next available slot. Right. I will update this as well. > >> + int idx, ret = 0; > No need to initialize ret as the first usage is an assignment. > > Regards, > Bjorn I will make this change as well. Thanks, Siddharth _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v6 2/4] remoteproc: coredump: Add minidump functionality 2020-10-29 23:54 ` Siddharth Gupta @ 2020-11-02 17:47 ` Bjorn Andersson 0 siblings, 0 replies; 8+ messages in thread From: Bjorn Andersson @ 2020-11-02 17:47 UTC (permalink / raw) To: Siddharth Gupta Cc: ohad, tsoni, linux-doc, linux-arm-msm, linux-remoteproc, linux-kernel, agross, rishabhb, psodagud, linux-arm-kernel On Thu 29 Oct 18:54 CDT 2020, Siddharth Gupta wrote: > > On 10/26/2020 2:09 PM, Bjorn Andersson wrote: > > On Fri 02 Oct 21:05 CDT 2020, Siddharth Gupta wrote: [..] > > > diff --git a/drivers/remoteproc/remoteproc_elf_helpers.h b/drivers/remoteproc/remoteproc_elf_helpers.h > > > index 4b6be7b..d83ebca 100644 > > > --- a/drivers/remoteproc/remoteproc_elf_helpers.h > > > +++ b/drivers/remoteproc/remoteproc_elf_helpers.h > > > @@ -11,6 +11,7 @@ > > > #include <linux/elf.h> > > > #include <linux/types.h> > > > +#define MAX_NAME_LENGTH 16 > > This name is too generic. Why is it 16? > > I will update the name to MAX_SHDR_NAME_LEN. In our usecase we didn't > expect a length of the section name to exceed > 16 characters (MAX_REGION_NAME_LENGTH defined in qcom_minidump.h in patch > 03/04). It might change later if users > want to increase the size. What would you prefer the max name length for the > section header to be? > If you calculate the size of the region based on the strings I don't see why you need to limit it here - and you shouldn't use a bounded version of strcpy in this case either. I don't think this part of the code should truncate the strings, if we need to sanitize the strings make sure to do that when you populate the list. Thanks, Bjorn _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v6 3/4] remoteproc: qcom: Add capability to collect minidumps 2020-10-03 2:05 [PATCH v6 0/4] Introduce mini-dump support for remoteproc Siddharth Gupta 2020-10-03 2:05 ` [PATCH v6 1/4] remoteproc: core: Add ops to enable custom coredump functionality Siddharth Gupta 2020-10-03 2:05 ` [PATCH v6 2/4] remoteproc: coredump: Add minidump functionality Siddharth Gupta @ 2020-10-03 2:05 ` Siddharth Gupta 2020-10-03 2:05 ` [PATCH v6 4/4] remoteproc: qcom: Add minidump id for sm8150 modem Siddharth Gupta 3 siblings, 0 replies; 8+ messages in thread From: Siddharth Gupta @ 2020-10-03 2:05 UTC (permalink / raw) To: agross, bjorn.andersson, ohad, linux-remoteproc Cc: tsoni, linux-doc, linux-arm-msm, Gurbir Arora, linux-kernel, rishabhb, Siddharth Gupta, psodagud, linux-arm-kernel This patch adds support for collecting minidump in the event of remoteproc crash. Parse the minidump table based on remoteproc's unique minidump-id, read all memory regions from the remoteproc's minidump table entry and expose the memory to userspace. The remoteproc platform driver can choose to collect a full/mini dump by specifying the coredump op. Co-developed-by: Rishabh Bhatnagar <rishabhb@codeaurora.org> Signed-off-by: Rishabh Bhatnagar <rishabhb@codeaurora.org> Co-developed-by: Gurbir Arora <gurbaror@codeaurora.org> Signed-off-by: Gurbir Arora <gurbaror@codeaurora.org> Signed-off-by: Siddharth Gupta <sidgup@codeaurora.org> --- drivers/remoteproc/qcom_minidump.h | 64 +++++++++++++++++++++++ drivers/remoteproc/qcom_q6v5_pas.c | 104 ++++++++++++++++++++++++++++++++++++- 2 files changed, 166 insertions(+), 2 deletions(-) create mode 100644 drivers/remoteproc/qcom_minidump.h diff --git a/drivers/remoteproc/qcom_minidump.h b/drivers/remoteproc/qcom_minidump.h new file mode 100644 index 0000000..5857d06 --- /dev/null +++ b/drivers/remoteproc/qcom_minidump.h @@ -0,0 +1,64 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (c) 2020, The Linux Foundation. All rights reserved. + */ + +#ifndef __QCOM_MINIDUMP_H +#define __QCOM_MINIDUMP_H + +#define MAX_NUM_OF_SS 10 +#define MAX_REGION_NAME_LENGTH 16 +#define SBL_MINIDUMP_SMEM_ID 602 +#define MD_REGION_VALID ('V' << 24 | 'A' << 16 | 'L' << 8 | 'I' << 0) +#define MD_SS_ENCR_DONE ('D' << 24 | 'O' << 16 | 'N' << 8 | 'E' << 0) +#define MD_SS_ENABLED ('E' << 24 | 'N' << 16 | 'B' << 8 | 'L' << 0) + +/** + * struct minidump_region - Minidump region + * @name : Name of the region to be dumped + * @seq_num: : Use to differentiate regions with same name. + * @valid : This entry to be dumped (if set to 1) + * @address : Physical address of region to be dumped + * @size : Size of the region + */ +struct minidump_region { + char name[MAX_REGION_NAME_LENGTH]; + __le32 seq_num; + __le32 valid; + __le64 address; + __le64 size; +}; + +/** + * struct minidump_subsystem_toc: Subsystem's SMEM Table of content + * @status : Subsystem toc init status + * @enabled : if set to 1, this region would be copied during coredump + * @encryption_status: Encryption status for this subsystem + * @encryption_required : Decides to encrypt the subsystem regions or not + * @ss_region_count : Number of regions added in this subsystem toc + * @md_ss_smem_regions_baseptr : regions base pointer of the subsystem + */ +struct minidump_subsystem_toc { + __le32 status; + __le32 enabled; + __le32 encryption_status; + __le32 encryption_required; + __le32 ss_region_count; + __le64 md_ss_smem_regions_baseptr; +}; + +/** + * struct minidump_global_toc: Global Table of Content + * @md_toc_init : Global Minidump init status + * @md_revision : Minidump revision + * @md_enable_status : Minidump enable status + * @md_ss_toc : Array of subsystems toc + */ +struct minidump_global_toc { + __le32 status; + __le32 md_revision; + __le32 enabled; + struct minidump_subsystem_toc md_ss_toc[MAX_NUM_OF_SS]; +}; + +#endif diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c index 3837f23..349f725 100644 --- a/drivers/remoteproc/qcom_q6v5_pas.c +++ b/drivers/remoteproc/qcom_q6v5_pas.c @@ -28,11 +28,13 @@ #include "qcom_pil_info.h" #include "qcom_q6v5.h" #include "remoteproc_internal.h" +#include "qcom_minidump.h" struct adsp_data { int crash_reason_smem; const char *firmware_name; int pas_id; + unsigned int minidump_id; bool has_aggre2_clk; bool auto_boot; @@ -63,6 +65,7 @@ struct qcom_adsp { int proxy_pd_count; int pas_id; + unsigned int minidump_id; int crash_reason_smem; bool has_aggre2_clk; const char *info_name; @@ -116,6 +119,88 @@ static void adsp_pds_disable(struct qcom_adsp *adsp, struct device **pds, } } +static void adsp_minidump_cleanup(struct rproc *rproc) +{ + struct rproc_dump_segment *entry, *tmp; + + list_for_each_entry_safe(entry, tmp, &rproc->dump_segments, node) { + list_del(&entry->node); + kfree(entry->priv); + kfree(entry); + } +} + +static void adsp_add_minidump_segments(struct rproc *rproc, + struct minidump_subsystem_toc *minidump_ss) +{ + struct minidump_region __iomem *ptr; + struct minidump_region region; + int seg_cnt, i; + dma_addr_t da; + size_t size; + char *name; + + if (!list_empty(&rproc->dump_segments)) { + dev_err(&rproc->dev, "dump segment list already populated\n"); + return; + } + + seg_cnt = le32_to_cpu(minidump_ss->ss_region_count); + ptr = ioremap((unsigned long)le64_to_cpu(minidump_ss->md_ss_smem_regions_baseptr), + seg_cnt * sizeof(struct minidump_region)); + + if (!ptr) + return; + + for (i = 0; i < seg_cnt; i++) { + memcpy_fromio(®ion, ptr + i, sizeof(region)); + if (region.valid == MD_REGION_VALID) { + name = kmalloc(MAX_REGION_NAME_LENGTH, GFP_KERNEL); + strlcpy(name, region.name, MAX_REGION_NAME_LENGTH); + da = le64_to_cpu(region.address); + size = le32_to_cpu(region.size); + rproc_coredump_add_custom_segment(rproc, da, size, NULL, name); + } + } + + iounmap(ptr); +} + +static void adsp_dump(struct rproc *rproc) +{ + struct qcom_adsp *adsp = rproc->priv; + struct minidump_subsystem_toc *minidump_ss; + struct minidump_global_toc *minidump_toc; + + /* Get Global minidump ToC*/ + minidump_toc = qcom_smem_get(QCOM_SMEM_HOST_ANY, SBL_MINIDUMP_SMEM_ID, NULL); + + /* check if global table pointer exists and init is set */ + if (IS_ERR(minidump_toc) || !minidump_toc->status) { + dev_err(&rproc->dev, "SMEM is not initialized.\n"); + return; + } + + /* Get subsystem table of contents using the minidump id */ + minidump_ss = &minidump_toc->md_ss_toc[adsp->minidump_id]; + + /** + * Collect minidump if SS ToC is valid and segment table + * is initialized in memory and encryption status is set. + */ + if (minidump_ss->md_ss_smem_regions_baseptr == 0 || + le32_to_cpu(minidump_ss->status) != 1 || + le32_to_cpu(minidump_ss->enabled) != MD_SS_ENABLED || + le32_to_cpu(minidump_ss->encryption_status) != MD_SS_ENCR_DONE) { + dev_err(&rproc->dev, "Minidump not ready!! Aborting\n"); + return; + } + + adsp_add_minidump_segments(rproc, minidump_ss); + rproc_minidump(rproc); + adsp_minidump_cleanup(rproc); +} + static int adsp_load(struct rproc *rproc, const struct firmware *fw) { struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv; @@ -258,6 +343,15 @@ static const struct rproc_ops adsp_ops = { .panic = adsp_panic, }; +static const struct rproc_ops adsp_minidump_ops = { + .start = adsp_start, + .stop = adsp_stop, + .da_to_va = adsp_da_to_va, + .load = adsp_load, + .panic = adsp_panic, + .coredump = adsp_dump, +}; + static int adsp_init_clock(struct qcom_adsp *adsp) { int ret; @@ -398,8 +492,13 @@ static int adsp_probe(struct platform_device *pdev) if (ret < 0 && ret != -EINVAL) return ret; - rproc = rproc_alloc(&pdev->dev, pdev->name, &adsp_ops, - fw_name, sizeof(*adsp)); + if (desc->minidump_id) + rproc = rproc_alloc(&pdev->dev, pdev->name, &adsp_minidump_ops, fw_name, + sizeof(*adsp)); + else + rproc = rproc_alloc(&pdev->dev, pdev->name, &adsp_ops, fw_name, + sizeof(*adsp)); + if (!rproc) { dev_err(&pdev->dev, "unable to allocate remoteproc\n"); return -ENOMEM; @@ -411,6 +510,7 @@ static int adsp_probe(struct platform_device *pdev) adsp = (struct qcom_adsp *)rproc->priv; adsp->dev = &pdev->dev; adsp->rproc = rproc; + adsp->minidump_id = desc->minidump_id; adsp->pas_id = desc->pas_id; adsp->has_aggre2_clk = desc->has_aggre2_clk; adsp->info_name = desc->sysmon_name; -- Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v6 4/4] remoteproc: qcom: Add minidump id for sm8150 modem 2020-10-03 2:05 [PATCH v6 0/4] Introduce mini-dump support for remoteproc Siddharth Gupta ` (2 preceding siblings ...) 2020-10-03 2:05 ` [PATCH v6 3/4] remoteproc: qcom: Add capability to collect minidumps Siddharth Gupta @ 2020-10-03 2:05 ` Siddharth Gupta 3 siblings, 0 replies; 8+ messages in thread From: Siddharth Gupta @ 2020-10-03 2:05 UTC (permalink / raw) To: agross, bjorn.andersson, ohad, linux-remoteproc Cc: tsoni, linux-doc, linux-arm-msm, linux-kernel, rishabhb, Siddharth Gupta, psodagud, linux-arm-kernel Add minidump id for modem in sm8150 chipset so that the regions to be included in the coredump generated upon a crash is based on the minidump tables in SMEM instead of those in the ELF header. Signed-off-by: Siddharth Gupta <sidgup@codeaurora.org> --- drivers/remoteproc/qcom_q6v5_pas.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c index 349f725..23f4532 100644 --- a/drivers/remoteproc/qcom_q6v5_pas.c +++ b/drivers/remoteproc/qcom_q6v5_pas.c @@ -707,6 +707,7 @@ static const struct adsp_data mpss_resource_init = { .crash_reason_smem = 421, .firmware_name = "modem.mdt", .pas_id = 4, + .minidump_id = 3, .has_aggre2_clk = false, .auto_boot = false, .active_pd_names = (char*[]){ -- Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-11-02 17:49 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-10-03 2:05 [PATCH v6 0/4] Introduce mini-dump support for remoteproc Siddharth Gupta 2020-10-03 2:05 ` [PATCH v6 1/4] remoteproc: core: Add ops to enable custom coredump functionality Siddharth Gupta 2020-10-03 2:05 ` [PATCH v6 2/4] remoteproc: coredump: Add minidump functionality Siddharth Gupta 2020-10-26 21:09 ` Bjorn Andersson 2020-10-29 23:54 ` Siddharth Gupta 2020-11-02 17:47 ` Bjorn Andersson 2020-10-03 2:05 ` [PATCH v6 3/4] remoteproc: qcom: Add capability to collect minidumps Siddharth Gupta 2020-10-03 2:05 ` [PATCH v6 4/4] remoteproc: qcom: Add minidump id for sm8150 modem Siddharth Gupta
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).