github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-31 03:27:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge "soc:qcom: Add extra byte for tailing NUL"

Browse Source
This commit is contained in:
qctecmdr 2022-11-30 13:10:18 -08:00 committed by Gerrit - the friendly Code Review server
commit 5f06a98905
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/soc/qcom/minidump_log.c
View File

@ -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);
}

8
drivers/soc/qcom/minidump_memory.c
View File

@ -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;
}

4
drivers/soc/qcom/msm_minidump.c
View File

@ -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;
}

4
include/soc/qcom/minidump.h
View File

@ -32,7 +32,7 @@ enum minidump_entry_cmd {
* it should be 4 byte aligned.
*/
struct md_region {
char name[MAX_NAME_LENGTH];
char name[MAX_NAME_LENGTH + 1];
u32 id;
u64 virt_addr;
u64 phys_addr;
@ -45,7 +45,7 @@ struct md_pending_region {
};
struct md_rm_region {
char name[MAX_NAME_LENGTH];
char name[MAX_NAME_LENGTH + 1];
u32 slot_num;
};