From: Kalle Valo <kvalo@qca.qualcomm.com> To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org Subject: [PATCH v7 4/8] ath10k: save firmware stack upon firmware crash Date: Tue, 19 Aug 2014 11:23:07 +0300 [thread overview] Message-ID: <20140819082307.16842.21519.stgit@potku.adurom.net> (raw) In-Reply-To: <20140819082038.16842.46876.stgit@potku.adurom.net> From: Ben Greear <greearb@candelatech.com> Should help debug firmware crashes, and give users a way to provide some useful debug reports to firmware developers. Signed-off-by: Ben Greear <greearb@candelatech.com> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com> --- drivers/net/wireless/ath/ath10k/core.h | 1 + drivers/net/wireless/ath/ath10k/debug.c | 12 ++++++++++++ drivers/net/wireless/ath/ath10k/hw.h | 1 + drivers/net/wireless/ath/ath10k/pci.c | 13 +++++++++++++ 4 files changed, 27 insertions(+) diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h index 09c0a109368a..c397b064b72d 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -301,6 +301,7 @@ struct ath10k_fw_crash_data { struct timespec timestamp; struct ath10k_dbglog_entry_storage dbglog_entry_data; u32 reg_dump_values[REG_DUMP_COUNT_QCA988X]; + u8 stack_buf[ATH10K_FW_STACK_SIZE]; }; struct ath10k_debug { diff --git a/drivers/net/wireless/ath/ath10k/debug.c b/drivers/net/wireless/ath/ath10k/debug.c index 8c3f9acd6492..faf3d36dbdeb 100644 --- a/drivers/net/wireless/ath/ath10k/debug.c +++ b/drivers/net/wireless/ath/ath10k/debug.c @@ -33,10 +33,12 @@ * enum ath10k_fw_crash_dump_type - types of data in the dump file * @ATH10K_FW_CRASH_DUMP_DBGLOG: Recent firmware debug log entries * @ATH10K_FW_CRASH_DUMP_REGDUMP: Register crash dump in binary format + * @ATH10K_FW_CRASH_DUMP_STACK: Stack memory contents. */ enum ath10k_fw_crash_dump_type { ATH10K_FW_CRASH_DUMP_DBGLOG = 0, ATH10K_FW_CRASH_DUMP_REGDUMP = 1, + ATH10K_FW_CRASH_DUMP_STACK = 2, ATH10K_FW_CRASH_DUMP_MAX, }; @@ -721,6 +723,7 @@ static struct ath10k_dump_file_data *ath10k_build_dump_file(struct ath10k *ar) len = hdr_len; len += sizeof(*dump_tlv) + sizeof(crash_data->reg_dump_values); len += sizeof(*dump_tlv) + sizeof(crash_data->dbglog_entry_data); + len += sizeof(*dump_tlv) + sizeof(crash_data->stack_buf); sofar += hdr_len; @@ -787,10 +790,19 @@ static struct ath10k_dump_file_data *ath10k_build_dump_file(struct ath10k *ar) sizeof(crash_data->reg_dump_values)); sofar += sizeof(*dump_tlv) + sizeof(crash_data->reg_dump_values); + /* Gather firmware stack dump */ + dump_tlv = (struct ath10k_tlv_dump_data *)(buf + sofar); + dump_tlv->type = cpu_to_le32(ATH10K_FW_CRASH_DUMP_STACK); + dump_tlv->tlv_len = cpu_to_le32(sizeof(crash_data->stack_buf)); + memcpy(dump_tlv->tlv_data, crash_data->stack_buf, + sizeof(crash_data->stack_buf)); + sofar += sizeof(*dump_tlv) + sizeof(crash_data->stack_buf); + ar->debug.fw_crash_data->crashed_since_read = false; spin_unlock_bh(&ar->data_lock); + WARN_ON(sofar != len); return dump_data; } diff --git a/drivers/net/wireless/ath/ath10k/hw.h b/drivers/net/wireless/ath/ath10k/hw.h index c931cce17063..db52a55e5bd1 100644 --- a/drivers/net/wireless/ath/ath10k/hw.h +++ b/drivers/net/wireless/ath/ath10k/hw.h @@ -40,6 +40,7 @@ #define ATH10K_FIRMWARE_MAGIC "QCA-ATH10K" #define REG_DUMP_COUNT_QCA988X 60 +#define ATH10K_FW_STACK_SIZE 4096 struct ath10k_fw_ie { __le32 id; diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c index 41ff620e1af2..81897b2db49f 100644 --- a/drivers/net/wireless/ath/ath10k/pci.c +++ b/drivers/net/wireless/ath/ath10k/pci.c @@ -832,6 +832,18 @@ static u16 ath10k_pci_hif_get_free_queue_number(struct ath10k *ar, u8 pipe) return ath10k_ce_num_free_src_entries(ar_pci->pipe_info[pipe].ce_hdl); } +/* Save the main firmware stack */ +static void ath10k_pci_dump_stack(struct ath10k *ar, + struct ath10k_fw_crash_data *crash_data) +{ + lockdep_assert_held(&ar->data_lock); + + BUILD_BUG_ON(ATH10K_FW_STACK_SIZE % 4); + + ath10k_pci_diag_read_hi(ar, crash_data->stack_buf, + hi_stack, ATH10K_FW_STACK_SIZE); +} + static void ath10k_pci_dump_dbglog(struct ath10k *ar, struct ath10k_fw_crash_data *crash_data) { @@ -975,6 +987,7 @@ static void ath10k_pci_hif_dump_area(struct ath10k *ar) if (!crash_data) goto exit; + ath10k_pci_dump_stack(ar, crash_data); ath10k_pci_dump_registers(ar, crash_data); ath10k_pci_dump_dbglog(ar, crash_data);
WARNING: multiple messages have this Message-ID (diff)
From: Kalle Valo <kvalo@qca.qualcomm.com> To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org Subject: [PATCH v7 4/8] ath10k: save firmware stack upon firmware crash Date: Tue, 19 Aug 2014 11:23:07 +0300 [thread overview] Message-ID: <20140819082307.16842.21519.stgit@potku.adurom.net> (raw) In-Reply-To: <20140819082038.16842.46876.stgit@potku.adurom.net> From: Ben Greear <greearb@candelatech.com> Should help debug firmware crashes, and give users a way to provide some useful debug reports to firmware developers. Signed-off-by: Ben Greear <greearb@candelatech.com> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com> --- drivers/net/wireless/ath/ath10k/core.h | 1 + drivers/net/wireless/ath/ath10k/debug.c | 12 ++++++++++++ drivers/net/wireless/ath/ath10k/hw.h | 1 + drivers/net/wireless/ath/ath10k/pci.c | 13 +++++++++++++ 4 files changed, 27 insertions(+) diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h index 09c0a109368a..c397b064b72d 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -301,6 +301,7 @@ struct ath10k_fw_crash_data { struct timespec timestamp; struct ath10k_dbglog_entry_storage dbglog_entry_data; u32 reg_dump_values[REG_DUMP_COUNT_QCA988X]; + u8 stack_buf[ATH10K_FW_STACK_SIZE]; }; struct ath10k_debug { diff --git a/drivers/net/wireless/ath/ath10k/debug.c b/drivers/net/wireless/ath/ath10k/debug.c index 8c3f9acd6492..faf3d36dbdeb 100644 --- a/drivers/net/wireless/ath/ath10k/debug.c +++ b/drivers/net/wireless/ath/ath10k/debug.c @@ -33,10 +33,12 @@ * enum ath10k_fw_crash_dump_type - types of data in the dump file * @ATH10K_FW_CRASH_DUMP_DBGLOG: Recent firmware debug log entries * @ATH10K_FW_CRASH_DUMP_REGDUMP: Register crash dump in binary format + * @ATH10K_FW_CRASH_DUMP_STACK: Stack memory contents. */ enum ath10k_fw_crash_dump_type { ATH10K_FW_CRASH_DUMP_DBGLOG = 0, ATH10K_FW_CRASH_DUMP_REGDUMP = 1, + ATH10K_FW_CRASH_DUMP_STACK = 2, ATH10K_FW_CRASH_DUMP_MAX, }; @@ -721,6 +723,7 @@ static struct ath10k_dump_file_data *ath10k_build_dump_file(struct ath10k *ar) len = hdr_len; len += sizeof(*dump_tlv) + sizeof(crash_data->reg_dump_values); len += sizeof(*dump_tlv) + sizeof(crash_data->dbglog_entry_data); + len += sizeof(*dump_tlv) + sizeof(crash_data->stack_buf); sofar += hdr_len; @@ -787,10 +790,19 @@ static struct ath10k_dump_file_data *ath10k_build_dump_file(struct ath10k *ar) sizeof(crash_data->reg_dump_values)); sofar += sizeof(*dump_tlv) + sizeof(crash_data->reg_dump_values); + /* Gather firmware stack dump */ + dump_tlv = (struct ath10k_tlv_dump_data *)(buf + sofar); + dump_tlv->type = cpu_to_le32(ATH10K_FW_CRASH_DUMP_STACK); + dump_tlv->tlv_len = cpu_to_le32(sizeof(crash_data->stack_buf)); + memcpy(dump_tlv->tlv_data, crash_data->stack_buf, + sizeof(crash_data->stack_buf)); + sofar += sizeof(*dump_tlv) + sizeof(crash_data->stack_buf); + ar->debug.fw_crash_data->crashed_since_read = false; spin_unlock_bh(&ar->data_lock); + WARN_ON(sofar != len); return dump_data; } diff --git a/drivers/net/wireless/ath/ath10k/hw.h b/drivers/net/wireless/ath/ath10k/hw.h index c931cce17063..db52a55e5bd1 100644 --- a/drivers/net/wireless/ath/ath10k/hw.h +++ b/drivers/net/wireless/ath/ath10k/hw.h @@ -40,6 +40,7 @@ #define ATH10K_FIRMWARE_MAGIC "QCA-ATH10K" #define REG_DUMP_COUNT_QCA988X 60 +#define ATH10K_FW_STACK_SIZE 4096 struct ath10k_fw_ie { __le32 id; diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c index 41ff620e1af2..81897b2db49f 100644 --- a/drivers/net/wireless/ath/ath10k/pci.c +++ b/drivers/net/wireless/ath/ath10k/pci.c @@ -832,6 +832,18 @@ static u16 ath10k_pci_hif_get_free_queue_number(struct ath10k *ar, u8 pipe) return ath10k_ce_num_free_src_entries(ar_pci->pipe_info[pipe].ce_hdl); } +/* Save the main firmware stack */ +static void ath10k_pci_dump_stack(struct ath10k *ar, + struct ath10k_fw_crash_data *crash_data) +{ + lockdep_assert_held(&ar->data_lock); + + BUILD_BUG_ON(ATH10K_FW_STACK_SIZE % 4); + + ath10k_pci_diag_read_hi(ar, crash_data->stack_buf, + hi_stack, ATH10K_FW_STACK_SIZE); +} + static void ath10k_pci_dump_dbglog(struct ath10k *ar, struct ath10k_fw_crash_data *crash_data) { @@ -975,6 +987,7 @@ static void ath10k_pci_hif_dump_area(struct ath10k *ar) if (!crash_data) goto exit; + ath10k_pci_dump_stack(ar, crash_data); ath10k_pci_dump_registers(ar, crash_data); ath10k_pci_dump_dbglog(ar, crash_data); _______________________________________________ ath10k mailing list ath10k@lists.infradead.org http://lists.infradead.org/mailman/listinfo/ath10k
next prev parent reply other threads:[~2014-08-19 8:23 UTC|newest] Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-08-19 8:22 [PATCH v7 0/8] ath10k: firmware crash dump Kalle Valo 2014-08-19 8:22 ` Kalle Valo 2014-08-19 8:22 ` [PATCH v7 1/8] ath10k: add ath10k_pci_diag_* helpers Kalle Valo 2014-08-19 8:22 ` Kalle Valo 2014-08-19 8:22 ` [PATCH v7 2/8] ath10k: provide firmware crash info via debugfs Kalle Valo 2014-08-19 8:22 ` Kalle Valo 2014-08-19 9:33 ` Michal Kazior 2014-08-19 9:33 ` Michal Kazior 2014-08-19 15:25 ` Ben Greear 2014-08-19 15:25 ` Ben Greear 2014-08-19 16:05 ` Ben Greear 2014-08-19 16:05 ` Ben Greear 2014-08-20 7:36 ` Kalle Valo 2014-08-20 7:36 ` Kalle Valo 2014-08-20 6:28 ` Michal Kazior 2014-08-20 6:28 ` Michal Kazior 2014-08-20 6:48 ` Kalle Valo 2014-08-20 6:48 ` Kalle Valo 2014-08-20 6:56 ` Kalle Valo 2014-08-20 6:56 ` Kalle Valo 2014-08-20 13:13 ` Ben Greear 2014-08-20 13:13 ` Ben Greear 2014-08-20 7:29 ` Kalle Valo 2014-08-20 7:29 ` Kalle Valo 2014-08-20 13:08 ` Ben Greear 2014-08-20 13:08 ` Ben Greear 2014-08-20 14:19 ` Kalle Valo 2014-08-20 14:19 ` Kalle Valo 2014-08-20 14:52 ` Ben Greear 2014-08-20 14:52 ` Ben Greear 2014-08-19 8:23 ` [PATCH v7 3/8] ath10k: save firmware debug log messages Kalle Valo 2014-08-19 8:23 ` Kalle Valo 2014-08-19 9:39 ` Michal Kazior 2014-08-19 9:39 ` Michal Kazior 2014-08-19 9:44 ` Michal Kazior 2014-08-19 9:44 ` Michal Kazior 2014-08-19 15:16 ` Ben Greear 2014-08-19 15:16 ` Ben Greear 2014-08-19 8:23 ` Kalle Valo [this message] 2014-08-19 8:23 ` [PATCH v7 4/8] ath10k: save firmware stack upon firmware crash Kalle Valo 2014-08-19 9:37 ` Michal Kazior 2014-08-19 9:37 ` Michal Kazior 2014-08-19 8:23 ` [PATCH v7 5/8] ath10k: dump exception stack contents on " Kalle Valo 2014-08-19 8:23 ` Kalle Valo 2014-08-19 9:38 ` Michal Kazior 2014-08-19 9:38 ` Michal Kazior 2014-08-19 8:23 ` [PATCH v7 6/8] ath10k: save firmware RAM and ROM BSS sections on crash Kalle Valo 2014-08-19 8:23 ` Kalle Valo 2014-08-19 9:39 ` Michal Kazior 2014-08-19 9:39 ` Michal Kazior 2014-08-19 8:23 ` [PATCH v7 7/8] ath10k: rename ath10k_pci_hif_dump_area() to ath10k_pci_fw_crashed_dump() Kalle Valo 2014-08-19 8:23 ` Kalle Valo 2014-08-19 8:23 ` [PATCH v7 8/8] ath10k: print more driver info when firmware crashes Kalle Valo 2014-08-19 8:23 ` Kalle Valo
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20140819082307.16842.21519.stgit@potku.adurom.net \ --to=kvalo@qca.qualcomm.com \ --cc=ath10k@lists.infradead.org \ --cc=linux-wireless@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.