From: greearb@candelatech.com To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Ben Greear <greearb@candelatech.com> Subject: [PATCH 05/21] ath10k: save firmware debug log messages. Date: Mon, 9 May 2016 16:10:59 -0700 [thread overview] Message-ID: <1462835475-11079-6-git-send-email-greearb@candelatech.com> (raw) In-Reply-To: <1462835475-11079-1-git-send-email-greearb@candelatech.com> From: Ben Greear <greearb@candelatech.com> They may be dumped through the firmware dump debugfs file. Signed-off-by: Ben Greear <greearb@candelatech.com> --- drivers/net/wireless/ath/ath10k/core.h | 18 ++++++ drivers/net/wireless/ath/ath10k/debug.c | 97 +++++++++++++++++++++++++++++++- drivers/net/wireless/ath/ath10k/debug.h | 6 ++ drivers/net/wireless/ath/ath10k/hw.h | 21 +++++++ drivers/net/wireless/ath/ath10k/pci.c | 99 +++++++++++++++++++++++++++++++++ drivers/net/wireless/ath/ath10k/wmi.c | 13 +++++ drivers/net/wireless/ath/ath10k/wmi.h | 6 ++ 7 files changed, 258 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h index 1379054..7f9f460 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -404,6 +404,22 @@ struct ath10k_vif_iter { struct ath10k_vif *arvif; }; +/* This will store at least the last 128 entries. Each dbglog message + * is a max of 7 32-bit integers in length, but the length can be less + * than that as well. + */ +#define ATH10K_DBGLOG_DATA_LEN (128 * 7) +struct ath10k_dbglog_entry_storage { + u32 head_idx; /* Where to write next chunk of data */ + u32 tail_idx; /* Index of first msg */ + __le32 data[ATH10K_DBGLOG_DATA_LEN]; +}; + +/* Just enough info to decode firmware debug-log argument length */ +#define DBGLOG_NUM_ARGS_OFFSET 26 +#define DBGLOG_NUM_ARGS_MASK 0xFC000000 /* Bit 26-31 */ +#define DBGLOG_NUM_ARGS_MAX 5 /* firmware tool chain limit */ + /* used for crash-dump storage, protected by data-lock */ struct ath10k_fw_crash_data { bool crashed_since_read; @@ -437,6 +453,8 @@ struct ath10k_debug { u32 reg_addr; u32 nf_cal_period; + struct ath10k_dbglog_entry_storage dbglog_entry_data; + struct ath10k_fw_crash_data *fw_crash_data; }; diff --git a/drivers/net/wireless/ath/ath10k/debug.c b/drivers/net/wireless/ath/ath10k/debug.c index a689bf1..38b3541 100644 --- a/drivers/net/wireless/ath/ath10k/debug.c +++ b/drivers/net/wireless/ath/ath10k/debug.c @@ -35,10 +35,11 @@ /** * enum ath10k_fw_crash_dump_type - types of data in the dump file * @ATH10K_FW_CRASH_DUMP_REGDUMP: Register crash dump in binary format + * @ATH10K_FW_ERROR_DUMP_DBGLOG: Recent firmware debug log entries */ enum ath10k_fw_crash_dump_type { ATH10K_FW_CRASH_DUMP_REGISTERS = 0, - + ATH10K_FW_CRASH_DUMP_DBGLOG = 1, ATH10K_FW_CRASH_DUMP_MAX, }; @@ -109,6 +110,12 @@ struct ath10k_dump_file_data { u8 data[0]; } __packed; +struct ath10k_dbglog_entry_storage_user { + __le32 head_idx; /* Where to write next chunk of data */ + __le32 tail_idx; /* Index of first msg */ + __le32 data[ATH10K_DBGLOG_DATA_LEN]; +} __packed; + void ath10k_info(struct ath10k *ar, const char *fmt, ...) { struct va_format vaf = { @@ -702,7 +709,6 @@ ath10k_debug_get_new_fw_crash_data(struct ath10k *ar) lockdep_assert_held(&ar->data_lock); - crash_data->crashed_since_read = true; uuid_le_gen(&crash_data->uuid); getnstimeofday(&crash_data->timestamp); @@ -710,17 +716,87 @@ ath10k_debug_get_new_fw_crash_data(struct ath10k *ar) } EXPORT_SYMBOL(ath10k_debug_get_new_fw_crash_data); +static void ath10k_dbg_drop_dbg_buffer(struct ath10k *ar) +{ + /* Find next message boundary */ + u32 lg_hdr; + int acnt; + int tail_idx = ar->debug.dbglog_entry_data.tail_idx; + int h_idx = (tail_idx + 1) % ATH10K_DBGLOG_DATA_LEN; + + lockdep_assert_held(&ar->data_lock); + + /* Log header is second 32-bit word */ + lg_hdr = le32_to_cpu(ar->debug.dbglog_entry_data.data[h_idx]); + + acnt = (lg_hdr & DBGLOG_NUM_ARGS_MASK) >> DBGLOG_NUM_ARGS_OFFSET; + + if (acnt > DBGLOG_NUM_ARGS_MAX) { + /* Some sort of corruption it seems, recover as best we can. */ + ath10k_err(ar, "invalid dbglog arg-count: %i %i %i\n", + acnt, ar->debug.dbglog_entry_data.tail_idx, + ar->debug.dbglog_entry_data.head_idx); + ar->debug.dbglog_entry_data.tail_idx = + ar->debug.dbglog_entry_data.head_idx; + return; + } + + /* Move forward over the args and the two header fields */ + ar->debug.dbglog_entry_data.tail_idx = + (tail_idx + acnt + 2) % ATH10K_DBGLOG_DATA_LEN; +} + +void ath10k_dbg_save_fw_dbg_buffer(struct ath10k *ar, __le32 *buffer, int len) +{ + int i; + int z; + + lockdep_assert_held(&ar->data_lock); + + z = ar->debug.dbglog_entry_data.head_idx; + + /* Don't save any new logs until user-space reads this. */ + if (ar->debug.fw_crash_data && + ar->debug.fw_crash_data->crashed_since_read) { + ath10k_warn(ar, "dropping dbg buffer due to crash since read\n"); + return; + } + + for (i = 0; i < len; i++) { + ar->debug.dbglog_entry_data.data[z] = buffer[i]; + z++; + if (z >= ATH10K_DBGLOG_DATA_LEN) + z = 0; + + /* If we are about to over-write an old message, move the + * tail_idx to the next message. If idx's are same, we + * are empty. + */ + if (z == ar->debug.dbglog_entry_data.tail_idx) + ath10k_dbg_drop_dbg_buffer(ar); + + ar->debug.dbglog_entry_data.head_idx = z; + } +} +EXPORT_SYMBOL(ath10k_dbg_save_fw_dbg_buffer); + static struct ath10k_dump_file_data *ath10k_build_dump_file(struct ath10k *ar) { struct ath10k_fw_crash_data *crash_data = ar->debug.fw_crash_data; struct ath10k_dump_file_data *dump_data; struct ath10k_tlv_dump_data *dump_tlv; + struct ath10k_dbglog_entry_storage_user *dbglog_storage; int hdr_len = sizeof(*dump_data); unsigned int len, sofar = 0; unsigned char *buf; + int tmp; + + BUILD_BUG_ON(sizeof(struct ath10k_dbglog_entry_storage) != + sizeof(struct ath10k_dbglog_entry_storage_user)); len = hdr_len; len += sizeof(*dump_tlv) + sizeof(crash_data->registers); + len += sizeof(*dump_tlv) + sizeof(ar->debug.dbglog_entry_data); sofar += hdr_len; @@ -779,8 +855,25 @@ static struct ath10k_dump_file_data *ath10k_build_dump_file(struct ath10k *ar) sizeof(crash_data->registers)); sofar += sizeof(*dump_tlv) + sizeof(crash_data->registers); + /* Gather dbg-log */ + tmp = sizeof(ar->debug.dbglog_entry_data); + dump_tlv = (struct ath10k_tlv_dump_data *)(buf + sofar); + dump_tlv->type = cpu_to_le32(ATH10K_FW_CRASH_DUMP_DBGLOG); + dump_tlv->tlv_len = cpu_to_le32(tmp); + dbglog_storage = + (struct ath10k_dbglog_entry_storage_user *)(dump_tlv->tlv_data); + memcpy(dbglog_storage->data, ar->debug.dbglog_entry_data.data, + sizeof(dbglog_storage->data)); + dbglog_storage->head_idx = + cpu_to_le32(ar->debug.dbglog_entry_data.head_idx); + dbglog_storage->tail_idx = + cpu_to_le32(ar->debug.dbglog_entry_data.tail_idx); + + sofar += sizeof(*dump_tlv) + tmp; + ar->debug.fw_crash_data->crashed_since_read = false; + WARN_ON(sofar != len); spin_unlock_bh(&ar->data_lock); return dump_data; diff --git a/drivers/net/wireless/ath/ath10k/debug.h b/drivers/net/wireless/ath/ath10k/debug.h index a5c9aae..613ad7e 100644 --- a/drivers/net/wireless/ath/ath10k/debug.h +++ b/drivers/net/wireless/ath/ath10k/debug.h @@ -95,7 +95,13 @@ int ath10k_debug_get_et_sset_count(struct ieee80211_hw *hw, void ath10k_debug_get_et_stats(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ethtool_stats *stats, u64 *data); + +void ath10k_dbg_save_fw_dbg_buffer(struct ath10k *ar, __le32 *buffer, int len); #else +static inline void ath10k_dbg_save_fw_dbg_buffer(struct ath10k *ar, + __le32 *buffer, int len) +{ +} static inline int ath10k_debug_start(struct ath10k *ar) { return 0; diff --git a/drivers/net/wireless/ath/ath10k/hw.h b/drivers/net/wireless/ath/ath10k/hw.h index aedd898..5bbef4b 100644 --- a/drivers/net/wireless/ath/ath10k/hw.h +++ b/drivers/net/wireless/ath/ath10k/hw.h @@ -681,4 +681,25 @@ enum ath10k_hw_4addr_pad { #define RTC_STATE_V_GET(x) (((x) & RTC_STATE_V_MASK) >> RTC_STATE_V_LSB) +/* Target debug log related defines and structs */ + +/* Target is 32-bit CPU, so we just use u32 for + * the pointers. The memory space is relative to the + * target, not the host. Values are converted to host + * byte order when reading from firmware. + */ +struct ath10k_fw_dbglog_buf { + __le32 next; /* pointer to ath10k_fw_dbglog_buf. */ + __le32 buffer; /* pointer to u8 buffer */ + __le32 bufsize; + __le32 length; + __le32 count; + __le32 free; +} __packed; + +struct ath10k_fw_dbglog_hdr { + __le32 dbuf; /* pointer to ath10k_fw_dbglog_buf */ + __le32 dropped; +} __packed; + #endif /* _HW_H_ */ diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c index 8133d7b..16e32d0 100644 --- a/drivers/net/wireless/ath/ath10k/pci.c +++ b/drivers/net/wireless/ath/ath10k/pci.c @@ -1439,6 +1439,102 @@ static void ath10k_pci_dump_registers(struct ath10k *ar, crash_data->registers[i] = reg_dump_values[i]; } +/** + * Read any not-yet-delivered debug-log buffers on the target + * and save them to storage in the host driver. Typically + * only done on crash, as firmware will normally deliver + * logs periodically on its own if it is functioning + * properly. + */ +static void ath10k_pci_dump_dbglog(struct ath10k *ar) +{ + struct ath10k_fw_dbglog_hdr dbg_hdr; + u32 dbufp; /* pointer in target memory space */ + struct ath10k_fw_dbglog_buf dbuf; + u8 *buffer; + int ret; + int i; + int len; + + ret = ath10k_pci_diag_read_hi(ar, &dbg_hdr, hi_dbglog_hdr, + sizeof(dbg_hdr)); + if (ret != 0) { + ath10k_err(ar, "failed to dump debug log area: %d\n", ret); + return; + } + + ath10k_dbg(ar, ATH10K_DBG_PCI, + "debug log header, dbuf: 0x%x dropped: %i\n", + le32_to_cpu(dbg_hdr.dbuf), le32_to_cpu(dbg_hdr.dropped)); + dbufp = le32_to_cpu(dbg_hdr.dbuf); + + /* i is for logging purposes and sanity check in case firmware buffers + * are corrupted and will not properly terminate the list. + * In standard firmware, it appears there are no more than 2 + * buffers, so 10 should be safe upper limit even if firmware + * changes quite a bit. + */ + i = 0; + while (dbufp && i < 10) { + ret = ath10k_pci_diag_read_mem(ar, dbufp, &dbuf, sizeof(dbuf)); + if (ret != 0) { + ath10k_err(ar, "failed to read debug log area: %d (addr 0x%x)\n", + ret, dbufp); + return; + } + + len = le32_to_cpu(dbuf.length); + + ath10k_dbg(ar, ATH10K_DBG_PCI, + "[%i] next: 0x%x buf: 0x%x sz: %i len: %i count: %i free: %i\n", + i, le32_to_cpu(dbuf.next), le32_to_cpu(dbuf.buffer), + le32_to_cpu(dbuf.bufsize), len, + le32_to_cpu(dbuf.count), le32_to_cpu(dbuf.free)); + if (dbuf.buffer == 0 || len == 0) + goto next; + + /* Pick arbitrary upper bound in case firmware is corrupted for + * whatever reason. + */ + if (len > 4096) { + ath10k_err(ar, + "debuglog buf length is out of bounds: %d\n", + len); + /* Do not trust the next pointer either... */ + return; + } + + buffer = kmalloc(len, GFP_ATOMIC); + + if (!buffer) + goto next; + + ret = ath10k_pci_diag_read_mem(ar, le32_to_cpu(dbuf.buffer), + buffer, len); + if (ret != 0) { + ath10k_err(ar, "failed to read debug log buffer: %d (addr 0x%x)\n", + ret, le32_to_cpu(dbuf.buffer)); + kfree(buffer); + return; + } + + WARN_ON(len & 0x3); + + ath10k_dbg_save_fw_dbg_buffer(ar, (__le32 *)(buffer), len >> 2); + kfree(buffer); + +next: + dbufp = le32_to_cpu(dbuf.next); + if (dbufp == le32_to_cpu(dbg_hdr.dbuf)) { + /* It is a circular buffer it seems, bail if next + * is head + */ + break; + } + i++; + } /* While we have a debug buffer to read */ +} + static void ath10k_pci_fw_crashed_dump(struct ath10k *ar) { struct ath10k_fw_crash_data *crash_data; @@ -1458,6 +1554,9 @@ static void ath10k_pci_fw_crashed_dump(struct ath10k *ar) ath10k_err(ar, "firmware crashed! (uuid %s)\n", uuid); ath10k_print_driver_info(ar); ath10k_pci_dump_registers(ar, crash_data); + ath10k_pci_dump_dbglog(ar); + if (crash_data) + crash_data->crashed_since_read = true; spin_unlock_bh(&ar->data_lock); diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c index 621019f..1758b4a 100644 --- a/drivers/net/wireless/ath/ath10k/wmi.c +++ b/drivers/net/wireless/ath/ath10k/wmi.c @@ -2492,10 +2492,23 @@ void ath10k_wmi_event_echo(struct ath10k *ar, struct sk_buff *skb) int ath10k_wmi_event_debug_mesg(struct ath10k *ar, struct sk_buff *skb) { + struct ath10k_fw_dbglog_report *ev; + ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi event debug mesg len %d\n", skb->len); trace_ath10k_wmi_dbglog(ar, skb->data, skb->len); + ev = (struct ath10k_fw_dbglog_report *)skb->data; + + spin_lock_bh(&ar->data_lock); + /* First 4 bytes are a messages-dropped-due-to-overflow counter, + * and should not be recorded in the dbglog buffer, so we skip + * them. + */ + WARN_ON(skb->len & 0x3); + ath10k_dbg_save_fw_dbg_buffer(ar, ev->messages, + (skb->len - 4)/sizeof(__le32)); + spin_unlock_bh(&ar->data_lock); return 0; } diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/ath/ath10k/wmi.h index db25535..8d9b5b3 100644 --- a/drivers/net/wireless/ath/ath10k/wmi.h +++ b/drivers/net/wireless/ath/ath10k/wmi.h @@ -6262,6 +6262,12 @@ struct wmi_svc_rdy_ev_arg { const struct wlan_host_mem_req *mem_reqs[WMI_MAX_MEM_REQS]; }; +struct ath10k_fw_dbglog_report { + __le32 dropped_count; + __le32 messages[]; +} __packed; + + struct wmi_rdy_ev_arg { __le32 sw_version; __le32 abi_version; -- 2.4.3
WARNING: multiple messages have this Message-ID (diff)
From: greearb@candelatech.com To: ath10k@lists.infradead.org Cc: Ben Greear <greearb@candelatech.com>, linux-wireless@vger.kernel.org Subject: [PATCH 05/21] ath10k: save firmware debug log messages. Date: Mon, 9 May 2016 16:10:59 -0700 [thread overview] Message-ID: <1462835475-11079-6-git-send-email-greearb@candelatech.com> (raw) In-Reply-To: <1462835475-11079-1-git-send-email-greearb@candelatech.com> From: Ben Greear <greearb@candelatech.com> They may be dumped through the firmware dump debugfs file. Signed-off-by: Ben Greear <greearb@candelatech.com> --- drivers/net/wireless/ath/ath10k/core.h | 18 ++++++ drivers/net/wireless/ath/ath10k/debug.c | 97 +++++++++++++++++++++++++++++++- drivers/net/wireless/ath/ath10k/debug.h | 6 ++ drivers/net/wireless/ath/ath10k/hw.h | 21 +++++++ drivers/net/wireless/ath/ath10k/pci.c | 99 +++++++++++++++++++++++++++++++++ drivers/net/wireless/ath/ath10k/wmi.c | 13 +++++ drivers/net/wireless/ath/ath10k/wmi.h | 6 ++ 7 files changed, 258 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h index 1379054..7f9f460 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -404,6 +404,22 @@ struct ath10k_vif_iter { struct ath10k_vif *arvif; }; +/* This will store at least the last 128 entries. Each dbglog message + * is a max of 7 32-bit integers in length, but the length can be less + * than that as well. + */ +#define ATH10K_DBGLOG_DATA_LEN (128 * 7) +struct ath10k_dbglog_entry_storage { + u32 head_idx; /* Where to write next chunk of data */ + u32 tail_idx; /* Index of first msg */ + __le32 data[ATH10K_DBGLOG_DATA_LEN]; +}; + +/* Just enough info to decode firmware debug-log argument length */ +#define DBGLOG_NUM_ARGS_OFFSET 26 +#define DBGLOG_NUM_ARGS_MASK 0xFC000000 /* Bit 26-31 */ +#define DBGLOG_NUM_ARGS_MAX 5 /* firmware tool chain limit */ + /* used for crash-dump storage, protected by data-lock */ struct ath10k_fw_crash_data { bool crashed_since_read; @@ -437,6 +453,8 @@ struct ath10k_debug { u32 reg_addr; u32 nf_cal_period; + struct ath10k_dbglog_entry_storage dbglog_entry_data; + struct ath10k_fw_crash_data *fw_crash_data; }; diff --git a/drivers/net/wireless/ath/ath10k/debug.c b/drivers/net/wireless/ath/ath10k/debug.c index a689bf1..38b3541 100644 --- a/drivers/net/wireless/ath/ath10k/debug.c +++ b/drivers/net/wireless/ath/ath10k/debug.c @@ -35,10 +35,11 @@ /** * enum ath10k_fw_crash_dump_type - types of data in the dump file * @ATH10K_FW_CRASH_DUMP_REGDUMP: Register crash dump in binary format + * @ATH10K_FW_ERROR_DUMP_DBGLOG: Recent firmware debug log entries */ enum ath10k_fw_crash_dump_type { ATH10K_FW_CRASH_DUMP_REGISTERS = 0, - + ATH10K_FW_CRASH_DUMP_DBGLOG = 1, ATH10K_FW_CRASH_DUMP_MAX, }; @@ -109,6 +110,12 @@ struct ath10k_dump_file_data { u8 data[0]; } __packed; +struct ath10k_dbglog_entry_storage_user { + __le32 head_idx; /* Where to write next chunk of data */ + __le32 tail_idx; /* Index of first msg */ + __le32 data[ATH10K_DBGLOG_DATA_LEN]; +} __packed; + void ath10k_info(struct ath10k *ar, const char *fmt, ...) { struct va_format vaf = { @@ -702,7 +709,6 @@ ath10k_debug_get_new_fw_crash_data(struct ath10k *ar) lockdep_assert_held(&ar->data_lock); - crash_data->crashed_since_read = true; uuid_le_gen(&crash_data->uuid); getnstimeofday(&crash_data->timestamp); @@ -710,17 +716,87 @@ ath10k_debug_get_new_fw_crash_data(struct ath10k *ar) } EXPORT_SYMBOL(ath10k_debug_get_new_fw_crash_data); +static void ath10k_dbg_drop_dbg_buffer(struct ath10k *ar) +{ + /* Find next message boundary */ + u32 lg_hdr; + int acnt; + int tail_idx = ar->debug.dbglog_entry_data.tail_idx; + int h_idx = (tail_idx + 1) % ATH10K_DBGLOG_DATA_LEN; + + lockdep_assert_held(&ar->data_lock); + + /* Log header is second 32-bit word */ + lg_hdr = le32_to_cpu(ar->debug.dbglog_entry_data.data[h_idx]); + + acnt = (lg_hdr & DBGLOG_NUM_ARGS_MASK) >> DBGLOG_NUM_ARGS_OFFSET; + + if (acnt > DBGLOG_NUM_ARGS_MAX) { + /* Some sort of corruption it seems, recover as best we can. */ + ath10k_err(ar, "invalid dbglog arg-count: %i %i %i\n", + acnt, ar->debug.dbglog_entry_data.tail_idx, + ar->debug.dbglog_entry_data.head_idx); + ar->debug.dbglog_entry_data.tail_idx = + ar->debug.dbglog_entry_data.head_idx; + return; + } + + /* Move forward over the args and the two header fields */ + ar->debug.dbglog_entry_data.tail_idx = + (tail_idx + acnt + 2) % ATH10K_DBGLOG_DATA_LEN; +} + +void ath10k_dbg_save_fw_dbg_buffer(struct ath10k *ar, __le32 *buffer, int len) +{ + int i; + int z; + + lockdep_assert_held(&ar->data_lock); + + z = ar->debug.dbglog_entry_data.head_idx; + + /* Don't save any new logs until user-space reads this. */ + if (ar->debug.fw_crash_data && + ar->debug.fw_crash_data->crashed_since_read) { + ath10k_warn(ar, "dropping dbg buffer due to crash since read\n"); + return; + } + + for (i = 0; i < len; i++) { + ar->debug.dbglog_entry_data.data[z] = buffer[i]; + z++; + if (z >= ATH10K_DBGLOG_DATA_LEN) + z = 0; + + /* If we are about to over-write an old message, move the + * tail_idx to the next message. If idx's are same, we + * are empty. + */ + if (z == ar->debug.dbglog_entry_data.tail_idx) + ath10k_dbg_drop_dbg_buffer(ar); + + ar->debug.dbglog_entry_data.head_idx = z; + } +} +EXPORT_SYMBOL(ath10k_dbg_save_fw_dbg_buffer); + static struct ath10k_dump_file_data *ath10k_build_dump_file(struct ath10k *ar) { struct ath10k_fw_crash_data *crash_data = ar->debug.fw_crash_data; struct ath10k_dump_file_data *dump_data; struct ath10k_tlv_dump_data *dump_tlv; + struct ath10k_dbglog_entry_storage_user *dbglog_storage; int hdr_len = sizeof(*dump_data); unsigned int len, sofar = 0; unsigned char *buf; + int tmp; + + BUILD_BUG_ON(sizeof(struct ath10k_dbglog_entry_storage) != + sizeof(struct ath10k_dbglog_entry_storage_user)); len = hdr_len; len += sizeof(*dump_tlv) + sizeof(crash_data->registers); + len += sizeof(*dump_tlv) + sizeof(ar->debug.dbglog_entry_data); sofar += hdr_len; @@ -779,8 +855,25 @@ static struct ath10k_dump_file_data *ath10k_build_dump_file(struct ath10k *ar) sizeof(crash_data->registers)); sofar += sizeof(*dump_tlv) + sizeof(crash_data->registers); + /* Gather dbg-log */ + tmp = sizeof(ar->debug.dbglog_entry_data); + dump_tlv = (struct ath10k_tlv_dump_data *)(buf + sofar); + dump_tlv->type = cpu_to_le32(ATH10K_FW_CRASH_DUMP_DBGLOG); + dump_tlv->tlv_len = cpu_to_le32(tmp); + dbglog_storage = + (struct ath10k_dbglog_entry_storage_user *)(dump_tlv->tlv_data); + memcpy(dbglog_storage->data, ar->debug.dbglog_entry_data.data, + sizeof(dbglog_storage->data)); + dbglog_storage->head_idx = + cpu_to_le32(ar->debug.dbglog_entry_data.head_idx); + dbglog_storage->tail_idx = + cpu_to_le32(ar->debug.dbglog_entry_data.tail_idx); + + sofar += sizeof(*dump_tlv) + tmp; + ar->debug.fw_crash_data->crashed_since_read = false; + WARN_ON(sofar != len); spin_unlock_bh(&ar->data_lock); return dump_data; diff --git a/drivers/net/wireless/ath/ath10k/debug.h b/drivers/net/wireless/ath/ath10k/debug.h index a5c9aae..613ad7e 100644 --- a/drivers/net/wireless/ath/ath10k/debug.h +++ b/drivers/net/wireless/ath/ath10k/debug.h @@ -95,7 +95,13 @@ int ath10k_debug_get_et_sset_count(struct ieee80211_hw *hw, void ath10k_debug_get_et_stats(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ethtool_stats *stats, u64 *data); + +void ath10k_dbg_save_fw_dbg_buffer(struct ath10k *ar, __le32 *buffer, int len); #else +static inline void ath10k_dbg_save_fw_dbg_buffer(struct ath10k *ar, + __le32 *buffer, int len) +{ +} static inline int ath10k_debug_start(struct ath10k *ar) { return 0; diff --git a/drivers/net/wireless/ath/ath10k/hw.h b/drivers/net/wireless/ath/ath10k/hw.h index aedd898..5bbef4b 100644 --- a/drivers/net/wireless/ath/ath10k/hw.h +++ b/drivers/net/wireless/ath/ath10k/hw.h @@ -681,4 +681,25 @@ enum ath10k_hw_4addr_pad { #define RTC_STATE_V_GET(x) (((x) & RTC_STATE_V_MASK) >> RTC_STATE_V_LSB) +/* Target debug log related defines and structs */ + +/* Target is 32-bit CPU, so we just use u32 for + * the pointers. The memory space is relative to the + * target, not the host. Values are converted to host + * byte order when reading from firmware. + */ +struct ath10k_fw_dbglog_buf { + __le32 next; /* pointer to ath10k_fw_dbglog_buf. */ + __le32 buffer; /* pointer to u8 buffer */ + __le32 bufsize; + __le32 length; + __le32 count; + __le32 free; +} __packed; + +struct ath10k_fw_dbglog_hdr { + __le32 dbuf; /* pointer to ath10k_fw_dbglog_buf */ + __le32 dropped; +} __packed; + #endif /* _HW_H_ */ diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c index 8133d7b..16e32d0 100644 --- a/drivers/net/wireless/ath/ath10k/pci.c +++ b/drivers/net/wireless/ath/ath10k/pci.c @@ -1439,6 +1439,102 @@ static void ath10k_pci_dump_registers(struct ath10k *ar, crash_data->registers[i] = reg_dump_values[i]; } +/** + * Read any not-yet-delivered debug-log buffers on the target + * and save them to storage in the host driver. Typically + * only done on crash, as firmware will normally deliver + * logs periodically on its own if it is functioning + * properly. + */ +static void ath10k_pci_dump_dbglog(struct ath10k *ar) +{ + struct ath10k_fw_dbglog_hdr dbg_hdr; + u32 dbufp; /* pointer in target memory space */ + struct ath10k_fw_dbglog_buf dbuf; + u8 *buffer; + int ret; + int i; + int len; + + ret = ath10k_pci_diag_read_hi(ar, &dbg_hdr, hi_dbglog_hdr, + sizeof(dbg_hdr)); + if (ret != 0) { + ath10k_err(ar, "failed to dump debug log area: %d\n", ret); + return; + } + + ath10k_dbg(ar, ATH10K_DBG_PCI, + "debug log header, dbuf: 0x%x dropped: %i\n", + le32_to_cpu(dbg_hdr.dbuf), le32_to_cpu(dbg_hdr.dropped)); + dbufp = le32_to_cpu(dbg_hdr.dbuf); + + /* i is for logging purposes and sanity check in case firmware buffers + * are corrupted and will not properly terminate the list. + * In standard firmware, it appears there are no more than 2 + * buffers, so 10 should be safe upper limit even if firmware + * changes quite a bit. + */ + i = 0; + while (dbufp && i < 10) { + ret = ath10k_pci_diag_read_mem(ar, dbufp, &dbuf, sizeof(dbuf)); + if (ret != 0) { + ath10k_err(ar, "failed to read debug log area: %d (addr 0x%x)\n", + ret, dbufp); + return; + } + + len = le32_to_cpu(dbuf.length); + + ath10k_dbg(ar, ATH10K_DBG_PCI, + "[%i] next: 0x%x buf: 0x%x sz: %i len: %i count: %i free: %i\n", + i, le32_to_cpu(dbuf.next), le32_to_cpu(dbuf.buffer), + le32_to_cpu(dbuf.bufsize), len, + le32_to_cpu(dbuf.count), le32_to_cpu(dbuf.free)); + if (dbuf.buffer == 0 || len == 0) + goto next; + + /* Pick arbitrary upper bound in case firmware is corrupted for + * whatever reason. + */ + if (len > 4096) { + ath10k_err(ar, + "debuglog buf length is out of bounds: %d\n", + len); + /* Do not trust the next pointer either... */ + return; + } + + buffer = kmalloc(len, GFP_ATOMIC); + + if (!buffer) + goto next; + + ret = ath10k_pci_diag_read_mem(ar, le32_to_cpu(dbuf.buffer), + buffer, len); + if (ret != 0) { + ath10k_err(ar, "failed to read debug log buffer: %d (addr 0x%x)\n", + ret, le32_to_cpu(dbuf.buffer)); + kfree(buffer); + return; + } + + WARN_ON(len & 0x3); + + ath10k_dbg_save_fw_dbg_buffer(ar, (__le32 *)(buffer), len >> 2); + kfree(buffer); + +next: + dbufp = le32_to_cpu(dbuf.next); + if (dbufp == le32_to_cpu(dbg_hdr.dbuf)) { + /* It is a circular buffer it seems, bail if next + * is head + */ + break; + } + i++; + } /* While we have a debug buffer to read */ +} + static void ath10k_pci_fw_crashed_dump(struct ath10k *ar) { struct ath10k_fw_crash_data *crash_data; @@ -1458,6 +1554,9 @@ static void ath10k_pci_fw_crashed_dump(struct ath10k *ar) ath10k_err(ar, "firmware crashed! (uuid %s)\n", uuid); ath10k_print_driver_info(ar); ath10k_pci_dump_registers(ar, crash_data); + ath10k_pci_dump_dbglog(ar); + if (crash_data) + crash_data->crashed_since_read = true; spin_unlock_bh(&ar->data_lock); diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c index 621019f..1758b4a 100644 --- a/drivers/net/wireless/ath/ath10k/wmi.c +++ b/drivers/net/wireless/ath/ath10k/wmi.c @@ -2492,10 +2492,23 @@ void ath10k_wmi_event_echo(struct ath10k *ar, struct sk_buff *skb) int ath10k_wmi_event_debug_mesg(struct ath10k *ar, struct sk_buff *skb) { + struct ath10k_fw_dbglog_report *ev; + ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi event debug mesg len %d\n", skb->len); trace_ath10k_wmi_dbglog(ar, skb->data, skb->len); + ev = (struct ath10k_fw_dbglog_report *)skb->data; + + spin_lock_bh(&ar->data_lock); + /* First 4 bytes are a messages-dropped-due-to-overflow counter, + * and should not be recorded in the dbglog buffer, so we skip + * them. + */ + WARN_ON(skb->len & 0x3); + ath10k_dbg_save_fw_dbg_buffer(ar, ev->messages, + (skb->len - 4)/sizeof(__le32)); + spin_unlock_bh(&ar->data_lock); return 0; } diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/ath/ath10k/wmi.h index db25535..8d9b5b3 100644 --- a/drivers/net/wireless/ath/ath10k/wmi.h +++ b/drivers/net/wireless/ath/ath10k/wmi.h @@ -6262,6 +6262,12 @@ struct wmi_svc_rdy_ev_arg { const struct wlan_host_mem_req *mem_reqs[WMI_MAX_MEM_REQS]; }; +struct ath10k_fw_dbglog_report { + __le32 dropped_count; + __le32 messages[]; +} __packed; + + struct wmi_rdy_ev_arg { __le32 sw_version; __le32 abi_version; -- 2.4.3 _______________________________________________ ath10k mailing list ath10k@lists.infradead.org http://lists.infradead.org/mailman/listinfo/ath10k
next prev parent reply other threads:[~2016-05-09 23:11 UTC|newest] Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-05-09 23:10 [PATCH 00/21] ath10k patches, generic and CT firmware related greearb 2016-05-09 23:10 ` greearb 2016-05-09 23:10 ` [PATCH 01/21] ath10k: Fix crash related to printing features greearb 2016-05-09 23:10 ` greearb 2016-05-09 23:10 ` [PATCH 02/21] ath10k: fix typo in logging message greearb 2016-05-09 23:10 ` greearb 2016-05-09 23:10 ` [PATCH 03/21] ath10k: Support setting debug mask from driver code greearb 2016-05-09 23:10 ` greearb 2016-05-11 10:40 ` Michal Kazior 2016-05-11 10:40 ` Michal Kazior 2016-05-11 15:10 ` Ben Greear 2016-05-11 15:10 ` Ben Greear 2016-05-09 23:10 ` [PATCH 04/21] ath10k: rate-limit packet tx errors greearb 2016-05-09 23:10 ` greearb 2016-05-09 23:10 ` greearb [this message] 2016-05-09 23:10 ` [PATCH 05/21] ath10k: save firmware debug log messages greearb 2016-05-09 23:11 ` [PATCH 06/21] ath10k: save firmware stacks upon firmware crash greearb 2016-05-09 23:11 ` greearb 2016-05-09 23:11 ` [PATCH 07/21] ath10k: save firmware RAM and ROM BSS sections on crash greearb 2016-05-09 23:11 ` greearb 2016-05-09 23:11 ` [PATCH 08/21] ath10k: make firmware text debug messages more verbose greearb 2016-05-09 23:11 ` greearb 2016-05-09 23:11 ` [PATCH 09/21] ath10k: print fw debug messages in hex greearb 2016-05-09 23:11 ` greearb 2016-05-09 23:11 ` [PATCH 10/21] ath10k: support logging ath10k_info as KERN_DEBUG greearb 2016-05-09 23:11 ` greearb 2016-05-09 23:11 ` [PATCH 11/21] ath10k: add fw-powerup-fail to ethtool stats greearb 2016-05-09 23:11 ` greearb 2016-05-09 23:11 ` [PATCH 12/21] ath10k: Support up to 64 vdevs greearb 2016-05-09 23:11 ` greearb 2016-05-09 23:11 ` [PATCH 13/21] ath10k: Document cycle count related counters greearb 2016-05-09 23:11 ` greearb 2016-05-11 10:24 ` Michal Kazior 2016-05-11 10:24 ` Michal Kazior 2016-05-09 23:11 ` [PATCH 14/21] ath10k: Add tx/rx bytes, cycle counters to ethtool stats greearb 2016-05-09 23:11 ` greearb 2016-05-09 23:11 ` [PATCH 15/21] ath10k: support CT firmware flag greearb 2016-05-09 23:11 ` greearb 2016-05-10 7:20 ` Mohammed Shafi Shajakhan 2016-05-10 7:20 ` Mohammed Shafi Shajakhan 2016-05-10 14:52 ` Ben Greear 2016-05-10 14:52 ` Ben Greear 2016-05-09 23:11 ` [PATCH 16/21] ath10k: Support 32+ stations greearb 2016-05-09 23:11 ` greearb 2016-05-09 23:11 ` [PATCH 17/21] ath10k: Enable detecting failure to install key in firmware (CT) greearb 2016-05-09 23:11 ` greearb 2016-05-09 23:11 ` [PATCH 18/21] ath10k: Note limitation on beaconing vdevs greearb 2016-05-09 23:11 ` greearb 2016-05-09 23:11 ` [PATCH 19/21] ath10k: Enable adhoc mode for CT firmware greearb 2016-05-09 23:11 ` greearb 2016-05-09 23:11 ` [PATCH 20/21] ath10k: read firmware crash over ioread32 if CE fails greearb 2016-05-09 23:11 ` greearb 2016-05-09 23:11 ` [PATCH 21/21] ath10k: Read dbglog buffers over register ping-pong greearb 2016-05-09 23:11 ` greearb
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=1462835475-11079-6-git-send-email-greearb@candelatech.com \ --to=greearb@candelatech.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.