mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2025-12-10 07:44:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "board: qca: crashdump: add condition check for size"

Browse source
This commit is contained in:
Linux Build Service Account 2024-03-22 11:40:07 -07:00 • committed by Gerrit - the friendly Code Review server
commit a6a13af5f4
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
board/qca/arm/common/crashdump.c
View file

@ -168,7 +168,7 @@ static struct crashdump_flash_emmc_cxt crashdump_emmc_cnxt;
static struct qca_wdt_crashdump_data g_crashdump_data;
struct qca_wdt_scm_tlv_msg tlv_msg ;
static ulong dump2mem_addr_curr = 0, dump2mem_addr = 0;
static ulong dump2mem_addr_curr = 0, dump2mem_addr = 0, dump2mem_addr_limit =0;
static uint32_t dumplist_entrymax = DEFAULT_MINIDUMP_LIST_ENTRY_MAX;
static struct memdump_hdr dump2mem_hdr;
static struct dump2nvmem_config dump2nvmem_info;
@ -277,6 +277,11 @@ static int dump_to_dst (int is_aligned_access, uint32_t memaddr, uint32_t size,
snprintf(runcmd, sizeof(runcmd), "cp.l 0x%x 0x%lx 0x%x",
memaddr, dump2mem_addr_curr, size);
if (roundup(dump2mem_addr_curr + size, ARCH_DMA_MINALIGN) > dump2mem_addr_limit) {
printf("Error: Not enough memory in rsvd mem to save dumps\n");
return CMD_RET_FAILURE;
}
printf("Dumping %s @ 0x%lX \n", dumps_list[idx].name, dump2mem_addr_curr);
dump2mem_addr_curr = roundup(dump2mem_addr_curr + size, ARCH_DMA_MINALIGN);
@ -624,6 +629,7 @@ static int do_dumpqca_data(unsigned int dump_level)
dump2mem_hdr.total_dump_sz = 0;
dump2mem_hdr.dumps_list_info_offset = 0;
dumps_list = malloc(dumplist_entrymax * sizeof(struct memdumps_list_info));
dump2mem_addr_limit = dump2mem_addr + dump2mem_sz;
dump2mem_addr_curr = roundup(dump2mem_addr_curr +
sizeof(struct memdump_hdr), ARCH_DMA_MINALIGN);
@ -900,6 +906,13 @@ stop_dump:
dump2mem_hdr.total_dump_sz = dump2mem_addr_curr +
(dump2mem_hdr.nos_dumps * sizeof(struct memdumps_list_info)) - dump2mem_addr;
dump2mem_hdr.dumps_list_info_offset = dump2mem_addr_curr - dump2mem_addr;
if ((dump2mem_addr + dump2mem_hdr.total_dump_sz)
> dump2mem_addr_limit) {
printf("Error: Not enough memory in rsvd mem to save dumps\n");
return CMD_RET_FAILURE;
}
snprintf(runcmd, sizeof(runcmd), "cp.l 0x%x 0x%lx 0x%x",
(unsigned int)&dump2mem_hdr, dump2mem_addr, sizeof(struct memdump_hdr));
if (run_command(runcmd, 0) != CMD_RET_SUCCESS) {