diff --git a/drivers/soc/qcom/minidump_log.c b/drivers/soc/qcom/minidump_log.c index 0182ee714247..4e9f024be4c8 100644 --- a/drivers/soc/qcom/minidump_log.c +++ b/drivers/soc/qcom/minidump_log.c @@ -577,7 +577,7 @@ static void register_irq_stack(void) for (i = 0; i < irq_stack_pages_count; i++) { scnprintf(irq_sp_entry.name, sizeof(irq_sp_entry.name), - "KISTACK%d_%d", cpu, i); + "KISTK%d_%d", cpu, i); register_stack_entry(&irq_sp_entry, sp, PAGE_SIZE); sp += PAGE_SIZE; @@ -585,7 +585,7 @@ static void register_irq_stack(void) } else { sp = irq_stack_base; scnprintf(irq_sp_entry.name, sizeof(irq_sp_entry.name), - "KISTACK%d", cpu); + "KISTK%d", cpu); register_stack_entry(&irq_sp_entry, sp, IRQ_STACK_SIZE); } } @@ -1213,9 +1213,9 @@ static void md_register_panic_data(void) md_debugfs_slabowner(minidump_dir); } #endif - md_register_memory_dump(md_dma_buf_info_size, "DMABUF_INFO"); + md_register_memory_dump(md_dma_buf_info_size, "DMA_INFO"); md_debugfs_dmabufinfo(minidump_dir); - md_register_memory_dump(md_dma_buf_procs_size, "DMABUF_PROCS"); + md_register_memory_dump(md_dma_buf_procs_size, "DMA_PROC"); md_debugfs_dmabufprocs(minidump_dir); } diff --git a/drivers/soc/qcom/minidump_memory.c b/drivers/soc/qcom/minidump_memory.c index becdd25b095a..62d47fb78563 100644 --- a/drivers/soc/qcom/minidump_memory.c +++ b/drivers/soc/qcom/minidump_memory.c @@ -274,9 +274,9 @@ bool md_register_memory_dump(int size, char *name) if (!strcmp(name, "SLABOWNER")) WRITE_ONCE(md_slabowner_dump_addr, buffer_start); #endif - if (!strcmp(name, "DMABUF_INFO")) + if (!strcmp(name, "DMA_INFO")) WRITE_ONCE(md_dma_buf_info_addr, buffer_start); - if (!strcmp(name, "DMABUF_PROCS")) + if (!strcmp(name, "DMA_PROC")) WRITE_ONCE(md_dma_buf_procs_addr, buffer_start); return true; } @@ -1180,7 +1180,7 @@ static ssize_t dma_buf_info_size_write(struct file *file, pr_err_ratelimited("Invalid format for size\n"); return -EINVAL; } - update_dump_size("DMABUF_INFO", size, + update_dump_size("DMA_INFO", size, &md_dma_buf_info_addr, &md_dma_buf_info_size); return count; } @@ -1318,7 +1318,7 @@ static ssize_t dma_buf_procs_size_write(struct file *file, pr_err_ratelimited("Invalid format for size\n"); return -EINVAL; } - update_dump_size("DMABUF_PROCS", size, + update_dump_size("DMA_PROC", size, &md_dma_buf_procs_addr, &md_dma_buf_procs_size); return count; } diff --git a/drivers/soc/qcom/msm_minidump.c b/drivers/soc/qcom/msm_minidump.c index 87cd038533b8..1f50acdaf874 100644 --- a/drivers/soc/qcom/msm_minidump.c +++ b/drivers/soc/qcom/msm_minidump.c @@ -852,14 +852,14 @@ static int msm_minidump_add_header(void) if (is_rm_minidump) { slot_num = gh_rm_minidump_register_range( virt_to_phys(minidump_elfheader.ehdr), elfh_size, - "KELF_HEADER", strlen("KELF_HEADER")); + "KELF_HDR", strlen("KELF_HDR")); if (slot_num < 0) { pr_err("Failed to register elf_header minidump entry\n"); return -EBUSY; } } else { mdreg = &minidump_table->md_regions[0]; - strscpy(mdreg->name, "KELF_HEADER", sizeof(mdreg->name)); + strscpy(mdreg->name, "KELF_HDR", sizeof(mdreg->name)); mdreg->region_base_address = virt_to_phys(minidump_elfheader.ehdr); mdreg->region_size = elfh_size; }