From patchwork Fri Jun 6 19:08:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Greear X-Patchwork-Id: 4313401 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0EE0A9F357 for ; Fri, 6 Jun 2014 19:08:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2C084202A1 for ; Fri, 6 Jun 2014 19:08:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4680220274 for ; Fri, 6 Jun 2014 19:08:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752251AbaFFTIv (ORCPT ); Fri, 6 Jun 2014 15:08:51 -0400 Received: from mail2.candelatech.com ([208.74.158.173]:45553 "EHLO mail2.candelatech.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752083AbaFFTIt (ORCPT ); Fri, 6 Jun 2014 15:08:49 -0400 Received: from ben-dt2.candelatech.com (firewall.candelatech.com [70.89.124.249]) by mail2.candelatech.com (Postfix) with ESMTP id C861340C02A; Fri, 6 Jun 2014 12:08:48 -0700 (PDT) From: greearb@candelatech.com To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Ben Greear Subject: [PATCH v2 4/4] ath10k: Dump exception stack contents on firmware crash. Date: Fri, 6 Jun 2014 12:08:43 -0700 Message-Id: <1402081723-30040-4-git-send-email-greearb@candelatech.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1402081723-30040-1-git-send-email-greearb@candelatech.com> References: <1402081723-30040-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=-7.5 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 Firmware developers can decode this and maybe figure out why the firmware crashed. Signed-off-by: Ben Greear --- drivers/net/wireless/ath/ath10k/core.h | 2 ++ drivers/net/wireless/ath/ath10k/debug.c | 8 ++++++++ drivers/net/wireless/ath/ath10k/pci.c | 11 ++++++++++- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h index ea91847..0cb0f2e 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -347,6 +347,7 @@ 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_EXC_STACK = 3, ATH10K_FW_ERROR_DUMP_MAX, }; @@ -560,6 +561,7 @@ struct ath10k { struct ath10k_dbglog_entry_storage dbglog_entry_data; u32 reg_dump_values[REG_DUMP_COUNT_QCA988X]; unsigned char stack_buf[ATH10K_FW_STACK_SIZE]; + unsigned char exc_stack_buf[ATH10K_FW_STACK_SIZE]; #ifdef CONFIG_ATH10K_DEBUGFS struct ath10k_debug debug; diff --git a/drivers/net/wireless/ath/ath10k/debug.c b/drivers/net/wireless/ath/ath10k/debug.c index 837ca17..3f4a024 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 += sizeof(*dump_tlv) + sizeof(ar->reg_dump_values); len += sizeof(*dump_tlv) + sizeof(ar->dbglog_entry_data); len += sizeof(*dump_tlv) + sizeof(ar->stack_buf); + len += sizeof(*dump_tlv) + sizeof(ar->exc_stack_buf); lockdep_assert_held(&ar->conf_mutex); @@ -693,6 +694,13 @@ static struct ath10k_dump_file_data *ath10k_build_dump_file(struct ath10k *ar) memcpy(dump_tlv->tlv_data, &ar->stack_buf, dump_tlv->tlv_len); sofar += sizeof(*dump_tlv) + dump_tlv->tlv_len; + /* Gather firmware exception (irq) stack dump */ + dump_tlv = (struct ath10k_tlv_dump_data *)(buf + sofar); + dump_tlv->type = ATH10K_FW_ERROR_DUMP_EXC_STACK; + dump_tlv->tlv_len = sizeof(ar->exc_stack_buf); + memcpy(dump_tlv->tlv_data, &ar->exc_stack_buf, dump_tlv->tlv_len); + sofar += sizeof(*dump_tlv) + dump_tlv->tlv_len; + spin_unlock_irqrestore(&ar->crash_data_lock, flags); WARN_ON(sofar != len); diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c index e26f1f8..2089844 100644 --- a/drivers/net/wireless/ath/ath10k/pci.c +++ b/drivers/net/wireless/ath/ath10k/pci.c @@ -865,6 +865,13 @@ static void ath10k_save_firmware_stack(struct ath10k *ar) ar->stack_buf, HI_ITEM(hi_stack)); } +/* Save the firmware exception stack */ +static void ath10k_save_firmware_exc_stack(struct ath10k *ar) +{ + ath10k_save_firmware_mem_helper(ar, ATH10K_FW_STACK_SIZE, + ar->exc_stack_buf, + HI_ITEM(hi_err_stack)); +} static void ath10k_pci_hif_dump_area(struct ath10k *ar) { @@ -915,8 +922,10 @@ static void ath10k_pci_hif_dump_area(struct ath10k *ar) spin_lock_irqsave(&ar->crash_data_lock, flags); - if (!ar->crashed_since_read) + if (!ar->crashed_since_read) { ath10k_save_firmware_stack(ar); + ath10k_save_firmware_exc_stack(ar); + } spin_unlock_irqrestore(&ar->crash_data_lock, flags);