Commit 10c22884 authored by Kalle Valo's avatar Kalle Valo

ath10k: refactor ath10k_pci_dump_memory() in preparation for QCA9984 support

As QCA9984 needs two region types refactor the code to make it easier add the
new types. No functional changes.
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 606204bb
...@@ -1584,6 +1584,36 @@ static int ath10k_pci_set_ram_config(struct ath10k *ar, u32 config) ...@@ -1584,6 +1584,36 @@ static int ath10k_pci_set_ram_config(struct ath10k *ar, u32 config)
return 0; return 0;
} }
/* if an error happened returns < 0, otherwise the length */
static int ath10k_pci_dump_memory_generic(struct ath10k *ar,
const struct ath10k_mem_region *current_region,
u8 *buf)
{
int ret;
if (current_region->section_table.size > 0)
/* Copy each section individually. */
return ath10k_pci_dump_memory_section(ar,
current_region,
buf,
current_region->len);
/* No individiual memory sections defined so we can
* copy the entire memory region.
*/
ret = ath10k_pci_diag_read_mem(ar,
current_region->start,
buf,
current_region->len);
if (ret) {
ath10k_warn(ar, "failed to copy ramdump region %s: %d\n",
current_region->name, ret);
return ret;
}
return current_region->len;
}
static void ath10k_pci_dump_memory(struct ath10k *ar, static void ath10k_pci_dump_memory(struct ath10k *ar,
struct ath10k_fw_crash_data *crash_data) struct ath10k_fw_crash_data *crash_data)
{ {
...@@ -1642,27 +1672,14 @@ static void ath10k_pci_dump_memory(struct ath10k *ar, ...@@ -1642,27 +1672,14 @@ static void ath10k_pci_dump_memory(struct ath10k *ar,
buf += sizeof(*hdr); buf += sizeof(*hdr);
buf_len -= sizeof(*hdr); buf_len -= sizeof(*hdr);
if (current_region->section_table.size > 0) { switch (current_region->type) {
/* Copy each section individually. */ default:
count = ath10k_pci_dump_memory_section(ar, ret = ath10k_pci_dump_memory_generic(ar, current_region, buf);
current_region, if (ret < 0)
buf,
current_region->len);
} else {
/* No individiual memory sections defined so we can
* copy the entire memory region.
*/
ret = ath10k_pci_diag_read_mem(ar,
current_region->start,
buf,
current_region->len);
if (ret) {
ath10k_warn(ar, "failed to copy ramdump region %s: %d\n",
current_region->name, ret);
break; break;
}
count = current_region->len; count = ret;
break;
} }
hdr->region_type = cpu_to_le32(current_region->type); hdr->region_type = cpu_to_le32(current_region->type);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment