From patchwork Wed Jul 23 16:38:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Greear X-Patchwork-Id: 4612101 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BA1E4C0514 for ; Wed, 23 Jul 2014 16:38:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BF21A2017A for ; Wed, 23 Jul 2014 16:38:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CBDF820179 for ; Wed, 23 Jul 2014 16:38:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758290AbaGWQiT (ORCPT ); Wed, 23 Jul 2014 12:38:19 -0400 Received: from mail2.candelatech.com ([208.74.158.173]:39362 "EHLO mail2.candelatech.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756244AbaGWQiS (ORCPT ); Wed, 23 Jul 2014 12:38:18 -0400 Received: from ben-dt2.candelatech.com. (firewall.candelatech.com [70.89.124.249]) by mail2.candelatech.com (Postfix) with ESMTP id E000740A032; Wed, 23 Jul 2014 09:38:17 -0700 (PDT) From: greearb@candelatech.com To: linux-wireless@vger.kernel.org Cc: ath10k@lists.infradead.org, Ben Greear Subject: [PATCH v4 3/5] ath10k: save firmware stack upon firmware crash. Date: Wed, 23 Jul 2014 09:38:05 -0700 Message-Id: <1406133487-7541-3-git-send-email-greearb@candelatech.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1406133487-7541-1-git-send-email-greearb@candelatech.com> References: <1406133487-7541-1-git-send-email-greearb@candelatech.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ben Greear Should help debug firmware crashes, and give users a way to provide some useful debug reports to firmware developers. Signed-off-by: Ben Greear --- drivers/net/wireless/ath/ath10k/core.h | 3 +++ drivers/net/wireless/ath/ath10k/debug.c | 9 ++++++++ drivers/net/wireless/ath/ath10k/hw.h | 1 + drivers/net/wireless/ath/ath10k/pci.c | 41 +++++++++++++++++++++++++++++++++ 4 files changed, 54 insertions(+) diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h index 5c0c5bf..2f200f6 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -280,10 +280,12 @@ struct ath10k_vif_iter { * enum ath10k_fw_error_dump_type - types of data in the dump file * @ATH10K_FW_ERROR_DUMP_DBGLOG: Recent firmware debug log entries * @ATH10K_FW_ERROR_DUMP_REGDUMP: Register crash dump in binary format + * @ATH10K_FW_ERROR_DUMP_STACK: Stack memory contents. */ enum ath10k_fw_error_dump_type { ATH10K_FW_ERROR_DUMP_DBGLOG = 0, ATH10K_FW_ERROR_DUMP_REGDUMP = 1, + ATH10K_FW_ERROR_DUMP_STACK = 2, ATH10K_FW_ERROR_DUMP_MAX, }; @@ -364,6 +366,7 @@ struct ath10k_debug { bool crashed_since_read; struct ath10k_dbglog_entry_storage dbglog_entry_data; u32 reg_dump_values[REG_DUMP_COUNT_QCA988X]; + unsigned char stack_buf[ATH10K_FW_STACK_SIZE]; }; enum ath10k_state { diff --git a/drivers/net/wireless/ath/ath10k/debug.c b/drivers/net/wireless/ath/ath10k/debug.c index cc81a99..6fec433 100644 --- a/drivers/net/wireless/ath/ath10k/debug.c +++ b/drivers/net/wireless/ath/ath10k/debug.c @@ -620,6 +620,7 @@ static struct ath10k_dump_file_data *ath10k_build_dump_file(struct ath10k *ar) len = hdr_len; len += sizeof(*dump_tlv) + sizeof(ar->debug.reg_dump_values); len += sizeof(*dump_tlv) + sizeof(ar->debug.dbglog_entry_data); + len += sizeof(*dump_tlv) + sizeof(ar->debug.stack_buf); lockdep_assert_held(&ar->conf_mutex); @@ -686,8 +687,16 @@ static struct ath10k_dump_file_data *ath10k_build_dump_file(struct ath10k *ar) memcpy(dump_tlv->tlv_data, &ar->debug.reg_dump_values, dump_tlv->tlv_len); sofar += sizeof(*dump_tlv) + dump_tlv->tlv_len; + /* Gather firmware stack dump */ + dump_tlv = (struct ath10k_tlv_dump_data *)(buf + sofar); + dump_tlv->type = ATH10K_FW_ERROR_DUMP_STACK; + dump_tlv->tlv_len = sizeof(ar->debug.stack_buf); + memcpy(dump_tlv->tlv_data, &ar->debug.stack_buf, dump_tlv->tlv_len); + sofar += sizeof(*dump_tlv) + dump_tlv->tlv_len; + 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 d4df3f0..38a03e4 100644 --- a/drivers/net/wireless/ath/ath10k/hw.h +++ b/drivers/net/wireless/ath/ath10k/hw.h @@ -39,6 +39,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 24ddc22..b58f1a1 100644 --- a/drivers/net/wireless/ath/ath10k/pci.c +++ b/drivers/net/wireless/ath/ath10k/pci.c @@ -833,6 +833,40 @@ 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); } +static void ath10k_save_firmware_mem_helper(struct ath10k *ar, u32 sz, + unsigned char *to, u32 addr) +{ + u32 host_addr; + u32 reg_dump_area; + int ret; + + host_addr = host_interest_item_address(addr); + + ret = ath10k_pci_diag_read_mem(ar, host_addr, ®_dump_area, + sizeof(u32)); + if (ret != 0) { + ath10k_warn("failed to read FW addr: %d (addr %d)\n", + ret, addr); + return; + } + + ret = ath10k_pci_diag_read_mem(ar, reg_dump_area, to, sz); + if (ret != 0) + ath10k_err("failed to read FW memory: %d (addr %d sz %d)\n", + ret, reg_dump_area, sz); +} + +#ifdef CONFIG_ATH10K_DEBUGFS +/* Save the main firmware stack */ +static void ath10k_save_firmware_stack(struct ath10k *ar) +{ + BUILD_BUG_ON(ATH10K_FW_STACK_SIZE % 4); + ath10k_save_firmware_mem_helper(ar, ATH10K_FW_STACK_SIZE, + ar->debug.stack_buf, HI_ITEM(hi_stack)); +} +#endif + + static void ath10k_pci_hif_dump_area(struct ath10k *ar) { u32 reg_dump_area = 0; @@ -882,6 +916,13 @@ static void ath10k_pci_hif_dump_area(struct ath10k *ar) reg_dump_values[i + 3]); #ifdef CONFIG_ATH10K_DEBUGFS + spin_lock_bh(&ar->data_lock); + + if (!ar->debug.crashed_since_read) + ath10k_save_firmware_stack(ar); + + spin_unlock_bh(&ar->data_lock); + /* Dump the debug logs on the target */ host_addr = host_interest_item_address(HI_ITEM(hi_dbglog_hdr)); ret = ath10k_pci_diag_read_mem(ar, host_addr,