remoteproc: qcom: Add minidump id for sm8150 modem remoteproc
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v3 1/3 remoteproc: core: Add ops to enable custom coredump functionality
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.The priv_cleanup op cleans up the private resources used by the remoteproc.
--- drivers/remoteproc/remoteproc_core.c | 6 +++++- include/linux/remoteproc.h | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-)
drivers/remoteproc/remoteproc_core.c +5 -1
@@ -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 ;
include/linux/remoteproc.h +4 -0
@@ -375,6 +375,8 @@ 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 +* @priv_cleanup: cleans up the private resources used by the rproc */ struct rproc_ops {int (*prepare)(struct rproc *rproc);
@@ -393,6 +395,8 @@ 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); +void (*priv_cleanup)(struct rproc *rproc); };/**
Signature · 8 lines
Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v3 1/3 remoteproc: core: Add ops to enable custom coredump functionality
In reply to a message not in the archiveEach 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.The priv_cleanup op cleans up the private resources used by the remoteproc.
--- drivers/remoteproc/remoteproc_core.c | 6 +++++- include/linux/remoteproc.h | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-)
drivers/remoteproc/remoteproc_core.c +5 -1
@@ -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 ;
include/linux/remoteproc.h +4 -0
@@ -375,6 +375,8 @@ 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 +* @priv_cleanup: cleans up the private resources used by the rproc */ struct rproc_ops {int (*prepare)(struct rproc *rproc);
@@ -393,6 +395,8 @@ 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); +void (*priv_cleanup)(struct rproc *rproc); };/**
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v3 2/3 remoteproc: qcom: Add capability to collect minidumps
In reply to a message not in the archiveThis 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.
--- drivers/remoteproc/qcom_minidump.h | 64 +++++++++++++ drivers/remoteproc/qcom_q6v5_pas.c | 106 ++++++++++++++++++++- drivers/remoteproc/remoteproc_coredump.c | 138 ++++++++++++++++++++++++++++ drivers/remoteproc/remoteproc_elf_helpers.h | 27 ++++++ include/linux/remoteproc.h | 1 + 5 files changed, 334 insertions(+), 2 deletions(-) create mode 100644 drivers/remoteproc/qcom_minidump.h
drivers/remoteproc/qcom_minidump.h new file +64 -0
@@ -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) + +/** +* md_ss_region - Minidump region +* @name : Name of the region to be dumped +* @seq_num: : Use to differentiate regions with same name. +* @md_valid : This entry to be dumped (if set to 1) +* @region_base_address : Physical address of region to be dumped +* @region_size : Size of the region +*/ +struct md_ss_region { +char name[MAX_REGION_NAME_LENGTH ]; +u32 seq_num; +u32 md_valid; +u64 region_base_address; +u64 region_size; +}; + +/** +* md_ss_toc: Subsystem's SMEM Table of content +* @md_ss_toc_init : Subsystem toc init status +* @md_ss_enable_status : 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 md_ss_toc { +u32 md_ss_toc_init; +u32 md_ss_enable_status; +u32 encryption_status; +u32 encryption_required; +u32 ss_region_count; +u64 md_ss_smem_regions_baseptr; +}; + +/** +* md_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 md_global_toc { +u32 md_toc_init; +u32 md_revision; +u32 md_enable_status; +struct md_ss_toc md_ss_toc[MAX_NUM_OF_SS ]; +}; + +#endif
drivers/remoteproc/qcom_q6v5_pas.c +104 -2
147 lines not on this page · raw message
drivers/remoteproc/remoteproc_coredump.c +138 -0
153 lines not on this page · raw message
drivers/remoteproc/remoteproc_elf_helpers.h +27 -0
@@ -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 */
include/linux/remoteproc.h +1 -0
@@ -658,6 +658,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,
Signature · 8 lines
Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v3 2/3 remoteproc: qcom: Add capability to collect minidumps
In reply to a message not in the archiveThis 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.
--- drivers/remoteproc/qcom_minidump.h | 64 +++++++++++++ drivers/remoteproc/qcom_q6v5_pas.c | 106 ++++++++++++++++++++- drivers/remoteproc/remoteproc_coredump.c | 138 ++++++++++++++++++++++++++++ drivers/remoteproc/remoteproc_elf_helpers.h | 27 ++++++ include/linux/remoteproc.h | 1 + 5 files changed, 334 insertions(+), 2 deletions(-) create mode 100644 drivers/remoteproc/qcom_minidump.h
drivers/remoteproc/qcom_minidump.h new file +64 -0
@@ -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) + +/** +* md_ss_region - Minidump region +* @name : Name of the region to be dumped +* @seq_num: : Use to differentiate regions with same name. +* @md_valid : This entry to be dumped (if set to 1) +* @region_base_address : Physical address of region to be dumped +* @region_size : Size of the region +*/ +struct md_ss_region { +char name[MAX_REGION_NAME_LENGTH ]; +u32 seq_num; +u32 md_valid; +u64 region_base_address; +u64 region_size; +}; + +/** +* md_ss_toc: Subsystem's SMEM Table of content +* @md_ss_toc_init : Subsystem toc init status +* @md_ss_enable_status : 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 md_ss_toc { +u32 md_ss_toc_init; +u32 md_ss_enable_status; +u32 encryption_status; +u32 encryption_required; +u32 ss_region_count; +u64 md_ss_smem_regions_baseptr; +}; + +/** +* md_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 md_global_toc { +u32 md_toc_init; +u32 md_revision; +u32 md_enable_status; +struct md_ss_toc md_ss_toc[MAX_NUM_OF_SS ]; +}; + +#endif
drivers/remoteproc/qcom_q6v5_pas.c +104 -2
147 lines not on this page · raw message
drivers/remoteproc/remoteproc_coredump.c +138 -0
153 lines not on this page · raw message
drivers/remoteproc/remoteproc_elf_helpers.h +27 -0
@@ -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 */
include/linux/remoteproc.h +1 -0
@@ -658,6 +658,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,
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
kernel test robot
build botRe: [PATCH v3 2/3] remoteproc: qcom: Add capability to collect minidumps
Thank you for the patch! Perhaps something to improve:
Hi Siddharth,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on linus/master]
[also build test WARNING on v5.9-rc4 next-20200909]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Siddharth-Gupta/remoteproc-core-Add-ops-to-enable-custom-coredump-functionality/20200910-102707 base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git ab29a807a7ddaa7c84d2f4cb8d29e74e33759072 config: arm64-allyesconfig (attached as .config) compiler: aarch64-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=arm64
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
>> drivers/remoteproc/qcom_q6v5_pas.c:198:6: warning: no previous prototype for 'adsp_priv_cleanup' [-Wmissing-prototypes]
198 | void adsp_priv_cleanup(struct rproc *rproc)
| ^~~~~~~~~~~~~~~~~
# https://github.com/0day-ci/linux/commit/0803a568f57a06e12b9eca8c56cd27554c1d21f7
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Siddharth-Gupta/remoteproc-core-Add-ops-to-enable-custom-coredump-functionality/20200910-102707 git checkout 0803a568f57a06e12b9eca8c56cd27554c1d21f7
vim +/adsp_priv_cleanup +198 drivers/remoteproc/qcom_q6v5_pas.c
197
> 198 void adsp_priv_cleanup(struct rproc *rproc)
199 {
200 struct rproc_dump_segment *segment;
201
202 list_for_each_entry(segment, &rproc->dump_segments, node)
203 kfree(segment->priv);
204 }
205
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
PATCH v3 3/3 remoteproc: qcom: Add minidump id for sm8150 modem remoteproc
In reply to a message not in the archiveAdd minidump id for modem in sm8150 chipset.
--- drivers/remoteproc/qcom_q6v5_pas.c | 1 + 1 file changed, 1 insertion(+)
drivers/remoteproc/qcom_q6v5_pas.c +1 -0
@@ -709,6 +709,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 *[]){
Signature · 8 lines
Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v3 3/3 remoteproc: qcom: Add minidump id for sm8150 modem remoteproc
In reply to a message not in the archiveAdd minidump id for modem in sm8150 chipset.
--- drivers/remoteproc/qcom_q6v5_pas.c | 1 + 1 file changed, 1 insertion(+)
drivers/remoteproc/qcom_q6v5_pas.c +1 -0
@@ -709,6 +709,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 *[]){
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project