iwlwifi: mvm: move fw-dbg code to separate file
authorGolan Ben-Ami <golan.ben.ami@intel.com>
Tue, 27 Oct 2015 17:17:14 +0000 (19:17 +0200)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Tue, 1 Dec 2015 19:17:35 +0000 (21:17 +0200)
The fw debug functionality is big enough to warrant
a separate file. Move existing related functions to the new file.

Signed-off-by: Golan Ben-Ami <golan.ben.ami@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
14 files changed:
drivers/net/wireless/intel/iwlwifi/iwl-fw.h
drivers/net/wireless/intel/iwlwifi/mvm/Makefile
drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c [new file with mode: 0644]
drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.h [new file with mode: 0644]
drivers/net/wireless/intel/iwlwifi/mvm/fw.c
drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
drivers/net/wireless/intel/iwlwifi/mvm/ops.c
drivers/net/wireless/intel/iwlwifi/mvm/rx.c
drivers/net/wireless/intel/iwlwifi/mvm/time-event.c
drivers/net/wireless/intel/iwlwifi/mvm/tx.c
drivers/net/wireless/intel/iwlwifi/mvm/utils.c

index c6946f1644fc5d0205281e74e05122a804a77d61..2e1909fcd3bae1c49aed6b638abb13407453c828 100644 (file)
@@ -305,21 +305,4 @@ iwl_fw_dbg_conf_usniffer(const struct iwl_fw *fw, u8 id)
        return conf_tlv->usniffer;
 }
 
-#define iwl_fw_dbg_trigger_enabled(fw, id) ({                  \
-       void *__dbg_trigger = (fw)->dbg_trigger_tlv[(id)];      \
-       unlikely(__dbg_trigger);                                \
-})
-
-static inline struct iwl_fw_dbg_trigger_tlv*
-_iwl_fw_dbg_get_trigger(const struct iwl_fw *fw, enum iwl_fw_dbg_trigger id)
-{
-       return fw->dbg_trigger_tlv[id];
-}
-
-#define iwl_fw_dbg_get_trigger(fw, id) ({                      \
-       BUILD_BUG_ON(!__builtin_constant_p(id));                \
-       BUILD_BUG_ON((id) >= FW_DBG_TRIGGER_MAX);               \
-       _iwl_fw_dbg_get_trigger((fw), (id));                    \
-})
-
 #endif  /* __iwl_fw_h__ */
index 8c2c3d13b09233a3e944ab2ee3e502dde0415312..2c0d20f2a918a2cb94526367bd4e2242f99d2f98 100644 (file)
@@ -6,7 +6,7 @@ iwlmvm-y += power.o coex.o coex_legacy.o
 iwlmvm-y += tt.o offloading.o tdls.o
 iwlmvm-$(CONFIG_IWLWIFI_DEBUGFS) += debugfs.o debugfs-vif.o
 iwlmvm-$(CONFIG_IWLWIFI_LEDS) += led.o
-iwlmvm-y += tof.o
+iwlmvm-y += tof.o fw-dbg.o
 iwlmvm-$(CONFIG_PM_SLEEP) += d3.o
 
 ccflags-y += -D__CHECK_ENDIAN__ -I$(src)/../
index 48d5ee1b026c058c0f90d46133ec19111d9ad222..3f7682da99e7fb20bc5f9faeecacc8fb552266d1 100644 (file)
@@ -65,6 +65,7 @@
 #include <linux/vmalloc.h>
 
 #include "mvm.h"
+#include "fw-dbg.h"
 #include "sta.h"
 #include "iwl-io.h"
 #include "debugfs.h"
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c
new file mode 100644 (file)
index 0000000..b8e0591
--- /dev/null
@@ -0,0 +1,780 @@
+/******************************************************************************
+ *
+ * This file is provided under a dual BSD/GPLv2 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
+ * Copyright(c) 2015        Intel Deutschland GmbH
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program;
+ *
+ * The full GNU General Public License is included in this distribution
+ * in the file called COPYING.
+ *
+ * Contact Information:
+ *  Intel Linux Wireless <ilw@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ * BSD LICENSE
+ *
+ * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
+ * Copyright(c) 2015        Intel Deutschland GmbH
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *  * Neither the name Intel Corporation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *****************************************************************************/
+#include <linux/devcoredump.h>
+
+#include "fw-dbg.h"
+#include "iwl-io.h"
+#include "mvm.h"
+#include "iwl-prph.h"
+#include "iwl-csr.h"
+
+static ssize_t iwl_mvm_read_coredump(char *buffer, loff_t offset, size_t count,
+                                    const void *data, size_t datalen)
+{
+       const struct iwl_mvm_dump_ptrs *dump_ptrs = data;
+       ssize_t bytes_read;
+       ssize_t bytes_read_trans;
+
+       if (offset < dump_ptrs->op_mode_len) {
+               bytes_read = min_t(ssize_t, count,
+                                  dump_ptrs->op_mode_len - offset);
+               memcpy(buffer, (u8 *)dump_ptrs->op_mode_ptr + offset,
+                      bytes_read);
+               offset += bytes_read;
+               count -= bytes_read;
+
+               if (count == 0)
+                       return bytes_read;
+       } else {
+               bytes_read = 0;
+       }
+
+       if (!dump_ptrs->trans_ptr)
+               return bytes_read;
+
+       offset -= dump_ptrs->op_mode_len;
+       bytes_read_trans = min_t(ssize_t, count,
+                                dump_ptrs->trans_ptr->len - offset);
+       memcpy(buffer + bytes_read,
+              (u8 *)dump_ptrs->trans_ptr->data + offset,
+              bytes_read_trans);
+
+       return bytes_read + bytes_read_trans;
+}
+
+static void iwl_mvm_free_coredump(const void *data)
+{
+       const struct iwl_mvm_dump_ptrs *fw_error_dump = data;
+
+       vfree(fw_error_dump->op_mode_ptr);
+       vfree(fw_error_dump->trans_ptr);
+       kfree(fw_error_dump);
+}
+
+static void iwl_mvm_dump_fifos(struct iwl_mvm *mvm,
+                              struct iwl_fw_error_dump_data **dump_data)
+{
+       struct iwl_fw_error_dump_fifo *fifo_hdr;
+       u32 *fifo_data;
+       u32 fifo_len;
+       unsigned long flags;
+       int i, j;
+
+       if (!iwl_trans_grab_nic_access(mvm->trans, false, &flags))
+               return;
+
+       /* Pull RXF data from all RXFs */
+       for (i = 0; i < ARRAY_SIZE(mvm->shared_mem_cfg.rxfifo_size); i++) {
+               /*
+                * Keep aside the additional offset that might be needed for
+                * next RXF
+                */
+               u32 offset_diff = RXF_DIFF_FROM_PREV * i;
+
+               fifo_hdr = (void *)(*dump_data)->data;
+               fifo_data = (void *)fifo_hdr->data;
+               fifo_len = mvm->shared_mem_cfg.rxfifo_size[i];
+
+               /* No need to try to read the data if the length is 0 */
+               if (fifo_len == 0)
+                       continue;
+
+               /* Add a TLV for the RXF */
+               (*dump_data)->type = cpu_to_le32(IWL_FW_ERROR_DUMP_RXF);
+               (*dump_data)->len = cpu_to_le32(fifo_len + sizeof(*fifo_hdr));
+
+               fifo_hdr->fifo_num = cpu_to_le32(i);
+               fifo_hdr->available_bytes =
+                       cpu_to_le32(iwl_trans_read_prph(mvm->trans,
+                                                       RXF_RD_D_SPACE +
+                                                       offset_diff));
+               fifo_hdr->wr_ptr =
+                       cpu_to_le32(iwl_trans_read_prph(mvm->trans,
+                                                       RXF_RD_WR_PTR +
+                                                       offset_diff));
+               fifo_hdr->rd_ptr =
+                       cpu_to_le32(iwl_trans_read_prph(mvm->trans,
+                                                       RXF_RD_RD_PTR +
+                                                       offset_diff));
+               fifo_hdr->fence_ptr =
+                       cpu_to_le32(iwl_trans_read_prph(mvm->trans,
+                                                       RXF_RD_FENCE_PTR +
+                                                       offset_diff));
+               fifo_hdr->fence_mode =
+                       cpu_to_le32(iwl_trans_read_prph(mvm->trans,
+                                                       RXF_SET_FENCE_MODE +
+                                                       offset_diff));
+
+               /* Lock fence */
+               iwl_trans_write_prph(mvm->trans,
+                                    RXF_SET_FENCE_MODE + offset_diff, 0x1);
+               /* Set fence pointer to the same place like WR pointer */
+               iwl_trans_write_prph(mvm->trans,
+                                    RXF_LD_WR2FENCE + offset_diff, 0x1);
+               /* Set fence offset */
+               iwl_trans_write_prph(mvm->trans,
+                                    RXF_LD_FENCE_OFFSET_ADDR + offset_diff,
+                                    0x0);
+
+               /* Read FIFO */
+               fifo_len /= sizeof(u32); /* Size in DWORDS */
+               for (j = 0; j < fifo_len; j++)
+                       fifo_data[j] = iwl_trans_read_prph(mvm->trans,
+                                                        RXF_FIFO_RD_FENCE_INC +
+                                                        offset_diff);
+               *dump_data = iwl_fw_error_next_data(*dump_data);
+       }
+
+       /* Pull TXF data from all TXFs */
+       for (i = 0; i < ARRAY_SIZE(mvm->shared_mem_cfg.txfifo_size); i++) {
+               /* Mark the number of TXF we're pulling now */
+               iwl_trans_write_prph(mvm->trans, TXF_LARC_NUM, i);
+
+               fifo_hdr = (void *)(*dump_data)->data;
+               fifo_data = (void *)fifo_hdr->data;
+               fifo_len = mvm->shared_mem_cfg.txfifo_size[i];
+
+               /* No need to try to read the data if the length is 0 */
+               if (fifo_len == 0)
+                       continue;
+
+               /* Add a TLV for the FIFO */
+               (*dump_data)->type = cpu_to_le32(IWL_FW_ERROR_DUMP_TXF);
+               (*dump_data)->len = cpu_to_le32(fifo_len + sizeof(*fifo_hdr));
+
+               fifo_hdr->fifo_num = cpu_to_le32(i);
+               fifo_hdr->available_bytes =
+                       cpu_to_le32(iwl_trans_read_prph(mvm->trans,
+                                                       TXF_FIFO_ITEM_CNT));
+               fifo_hdr->wr_ptr =
+                       cpu_to_le32(iwl_trans_read_prph(mvm->trans,
+                                                       TXF_WR_PTR));
+               fifo_hdr->rd_ptr =
+                       cpu_to_le32(iwl_trans_read_prph(mvm->trans,
+                                                       TXF_RD_PTR));
+               fifo_hdr->fence_ptr =
+                       cpu_to_le32(iwl_trans_read_prph(mvm->trans,
+                                                       TXF_FENCE_PTR));
+               fifo_hdr->fence_mode =
+                       cpu_to_le32(iwl_trans_read_prph(mvm->trans,
+                                                       TXF_LOCK_FENCE));
+
+               /* Set the TXF_READ_MODIFY_ADDR to TXF_WR_PTR */
+               iwl_trans_write_prph(mvm->trans, TXF_READ_MODIFY_ADDR,
+                                    TXF_WR_PTR);
+
+               /* Dummy-read to advance the read pointer to the head */
+               iwl_trans_read_prph(mvm->trans, TXF_READ_MODIFY_DATA);
+
+               /* Read FIFO */
+               fifo_len /= sizeof(u32); /* Size in DWORDS */
+               for (j = 0; j < fifo_len; j++)
+                       fifo_data[j] = iwl_trans_read_prph(mvm->trans,
+                                                         TXF_READ_MODIFY_DATA);
+               *dump_data = iwl_fw_error_next_data(*dump_data);
+       }
+
+       iwl_trans_release_nic_access(mvm->trans, &flags);
+}
+
+void iwl_mvm_free_fw_dump_desc(struct iwl_mvm *mvm)
+{
+       if (mvm->fw_dump_desc == &iwl_mvm_dump_desc_assert ||
+           !mvm->fw_dump_desc)
+               return;
+
+       kfree(mvm->fw_dump_desc);
+       mvm->fw_dump_desc = NULL;
+}
+
+#define IWL8260_ICCM_OFFSET            0x44000 /* Only for B-step */
+#define IWL8260_ICCM_LEN               0xC000 /* Only for B-step */
+
+static const struct {
+       u32 start, end;
+} iwl_prph_dump_addr[] = {
+       { .start = 0x00a00000, .end = 0x00a00000 },
+       { .start = 0x00a0000c, .end = 0x00a00024 },
+       { .start = 0x00a0002c, .end = 0x00a0003c },
+       { .start = 0x00a00410, .end = 0x00a00418 },
+       { .start = 0x00a00420, .end = 0x00a00420 },
+       { .start = 0x00a00428, .end = 0x00a00428 },
+       { .start = 0x00a00430, .end = 0x00a0043c },
+       { .start = 0x00a00444, .end = 0x00a00444 },
+       { .start = 0x00a004c0, .end = 0x00a004cc },
+       { .start = 0x00a004d8, .end = 0x00a004d8 },
+       { .start = 0x00a004e0, .end = 0x00a004f0 },
+       { .start = 0x00a00840, .end = 0x00a00840 },
+       { .start = 0x00a00850, .end = 0x00a00858 },
+       { .start = 0x00a01004, .end = 0x00a01008 },
+       { .start = 0x00a01010, .end = 0x00a01010 },
+       { .start = 0x00a01018, .end = 0x00a01018 },
+       { .start = 0x00a01024, .end = 0x00a01024 },
+       { .start = 0x00a0102c, .end = 0x00a01034 },
+       { .start = 0x00a0103c, .end = 0x00a01040 },
+       { .start = 0x00a01048, .end = 0x00a01094 },
+       { .start = 0x00a01c00, .end = 0x00a01c20 },
+       { .start = 0x00a01c58, .end = 0x00a01c58 },
+       { .start = 0x00a01c7c, .end = 0x00a01c7c },
+       { .start = 0x00a01c28, .end = 0x00a01c54 },
+       { .start = 0x00a01c5c, .end = 0x00a01c5c },
+       { .start = 0x00a01c60, .end = 0x00a01cdc },
+       { .start = 0x00a01ce0, .end = 0x00a01d0c },
+       { .start = 0x00a01d18, .end = 0x00a01d20 },
+       { .start = 0x00a01d2c, .end = 0x00a01d30 },
+       { .start = 0x00a01d40, .end = 0x00a01d5c },
+       { .start = 0x00a01d80, .end = 0x00a01d80 },
+       { .start = 0x00a01d98, .end = 0x00a01d9c },
+       { .start = 0x00a01da8, .end = 0x00a01da8 },
+       { .start = 0x00a01db8, .end = 0x00a01df4 },
+       { .start = 0x00a01dc0, .end = 0x00a01dfc },
+       { .start = 0x00a01e00, .end = 0x00a01e2c },
+       { .start = 0x00a01e40, .end = 0x00a01e60 },
+       { .start = 0x00a01e68, .end = 0x00a01e6c },
+       { .start = 0x00a01e74, .end = 0x00a01e74 },
+       { .start = 0x00a01e84, .end = 0x00a01e90 },
+       { .start = 0x00a01e9c, .end = 0x00a01ec4 },
+       { .start = 0x00a01ed0, .end = 0x00a01ee0 },
+       { .start = 0x00a01f00, .end = 0x00a01f1c },
+       { .start = 0x00a01f44, .end = 0x00a01ffc },
+       { .start = 0x00a02000, .end = 0x00a02048 },
+       { .start = 0x00a02068, .end = 0x00a020f0 },
+       { .start = 0x00a02100, .end = 0x00a02118 },
+       { .start = 0x00a02140, .end = 0x00a0214c },
+       { .start = 0x00a02168, .end = 0x00a0218c },
+       { .start = 0x00a021c0, .end = 0x00a021c0 },
+       { .start = 0x00a02400, .end = 0x00a02410 },
+       { .start = 0x00a02418, .end = 0x00a02420 },
+       { .start = 0x00a02428, .end = 0x00a0242c },
+       { .start = 0x00a02434, .end = 0x00a02434 },
+       { .start = 0x00a02440, .end = 0x00a02460 },
+       { .start = 0x00a02468, .end = 0x00a024b0 },
+       { .start = 0x00a024c8, .end = 0x00a024cc },
+       { .start = 0x00a02500, .end = 0x00a02504 },
+       { .start = 0x00a0250c, .end = 0x00a02510 },
+       { .start = 0x00a02540, .end = 0x00a02554 },
+       { .start = 0x00a02580, .end = 0x00a025f4 },
+       { .start = 0x00a02600, .end = 0x00a0260c },
+       { .start = 0x00a02648, .end = 0x00a02650 },
+       { .start = 0x00a02680, .end = 0x00a02680 },
+       { .start = 0x00a026c0, .end = 0x00a026d0 },
+       { .start = 0x00a02700, .end = 0x00a0270c },
+       { .start = 0x00a02804, .end = 0x00a02804 },
+       { .start = 0x00a02818, .end = 0x00a0281c },
+       { .start = 0x00a02c00, .end = 0x00a02db4 },
+       { .start = 0x00a02df4, .end = 0x00a02fb0 },
+       { .start = 0x00a03000, .end = 0x00a03014 },
+       { .start = 0x00a0301c, .end = 0x00a0302c },
+       { .start = 0x00a03034, .end = 0x00a03038 },
+       { .start = 0x00a03040, .end = 0x00a03048 },
+       { .start = 0x00a03060, .end = 0x00a03068 },
+       { .start = 0x00a03070, .end = 0x00a03074 },
+       { .start = 0x00a0307c, .end = 0x00a0307c },
+       { .start = 0x00a03080, .end = 0x00a03084 },
+       { .start = 0x00a0308c, .end = 0x00a03090 },
+       { .start = 0x00a03098, .end = 0x00a03098 },
+       { .start = 0x00a030a0, .end = 0x00a030a0 },
+       { .start = 0x00a030a8, .end = 0x00a030b4 },
+       { .start = 0x00a030bc, .end = 0x00a030bc },
+       { .start = 0x00a030c0, .end = 0x00a0312c },
+       { .start = 0x00a03c00, .end = 0x00a03c5c },
+       { .start = 0x00a04400, .end = 0x00a04454 },
+       { .start = 0x00a04460, .end = 0x00a04474 },
+       { .start = 0x00a044c0, .end = 0x00a044ec },
+       { .start = 0x00a04500, .end = 0x00a04504 },
+       { .start = 0x00a04510, .end = 0x00a04538 },
+       { .start = 0x00a04540, .end = 0x00a04548 },
+       { .start = 0x00a04560, .end = 0x00a0457c },
+       { .start = 0x00a04590, .end = 0x00a04598 },
+       { .start = 0x00a045c0, .end = 0x00a045f4 },
+};
+
+static u32 iwl_dump_prph(struct iwl_trans *trans,
+                        struct iwl_fw_error_dump_data **data)
+{
+       struct iwl_fw_error_dump_prph *prph;
+       unsigned long flags;
+       u32 prph_len = 0, i;
+
+       if (!iwl_trans_grab_nic_access(trans, false, &flags))
+               return 0;
+
+       for (i = 0; i < ARRAY_SIZE(iwl_prph_dump_addr); i++) {
+               /* The range includes both boundaries */
+               int num_bytes_in_chunk = iwl_prph_dump_addr[i].end -
+                        iwl_prph_dump_addr[i].start + 4;
+               int reg;
+               __le32 *val;
+
+               prph_len += sizeof(**data) + sizeof(*prph) + num_bytes_in_chunk;
+
+               (*data)->type = cpu_to_le32(IWL_FW_ERROR_DUMP_PRPH);
+               (*data)->len = cpu_to_le32(sizeof(*prph) +
+                                       num_bytes_in_chunk);
+               prph = (void *)(*data)->data;
+               prph->prph_start = cpu_to_le32(iwl_prph_dump_addr[i].start);
+               val = (void *)prph->data;
+
+               for (reg = iwl_prph_dump_addr[i].start;
+                    reg <= iwl_prph_dump_addr[i].end;
+                    reg += 4)
+                       *val++ = cpu_to_le32(iwl_read_prph_no_grab(trans,
+                                                                  reg));
+
+                       *data = iwl_fw_error_next_data(*data);
+       }
+
+       iwl_trans_release_nic_access(trans, &flags);
+
+       return prph_len;
+}
+
+void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm)
+{
+       struct iwl_fw_error_dump_file *dump_file;
+       struct iwl_fw_error_dump_data *dump_data;
+       struct iwl_fw_error_dump_info *dump_info;
+       struct iwl_fw_error_dump_mem *dump_mem;
+       struct iwl_fw_error_dump_trigger_desc *dump_trig;
+       struct iwl_mvm_dump_ptrs *fw_error_dump;
+       u32 sram_len, sram_ofs;
+       u32 file_len, fifo_data_len = 0;
+       u32 smem_len = mvm->cfg->smem_len;
+       u32 sram2_len = mvm->cfg->dccm2_len;
+       bool monitor_dump_only = false;
+       int i;
+
+       lockdep_assert_held(&mvm->mutex);
+
+       /* there's no point in fw dump if the bus is dead */
+       if (test_bit(STATUS_TRANS_DEAD, &mvm->trans->status)) {
+               IWL_ERR(mvm, "Skip fw error dump since bus is dead\n");
+               return;
+       }
+
+       if (mvm->fw_dump_trig &&
+           mvm->fw_dump_trig->mode & IWL_FW_DBG_TRIGGER_MONITOR_ONLY)
+               monitor_dump_only = true;
+
+       fw_error_dump = kzalloc(sizeof(*fw_error_dump), GFP_KERNEL);
+       if (!fw_error_dump)
+               return;
+
+       /* SRAM - include stack CCM if driver knows the values for it */
+       if (!mvm->cfg->dccm_offset || !mvm->cfg->dccm_len) {
+               const struct fw_img *img;
+
+               img = &mvm->fw->img[mvm->cur_ucode];
+               sram_ofs = img->sec[IWL_UCODE_SECTION_DATA].offset;
+               sram_len = img->sec[IWL_UCODE_SECTION_DATA].len;
+       } else {
+               sram_ofs = mvm->cfg->dccm_offset;
+               sram_len = mvm->cfg->dccm_len;
+       }
+
+       /* reading RXF/TXF sizes */
+       if (test_bit(STATUS_FW_ERROR, &mvm->trans->status)) {
+               struct iwl_mvm_shared_mem_cfg *mem_cfg = &mvm->shared_mem_cfg;
+
+               fifo_data_len = 0;
+
+               /* Count RXF size */
+               for (i = 0; i < ARRAY_SIZE(mem_cfg->rxfifo_size); i++) {
+                       if (!mem_cfg->rxfifo_size[i])
+                               continue;
+
+                       /* Add header info */
+                       fifo_data_len += mem_cfg->rxfifo_size[i] +
+                                        sizeof(*dump_data) +
+                                        sizeof(struct iwl_fw_error_dump_fifo);
+               }
+
+               for (i = 0; i < ARRAY_SIZE(mem_cfg->txfifo_size); i++) {
+                       if (!mem_cfg->txfifo_size[i])
+                               continue;
+
+                       /* Add header info */
+                       fifo_data_len += mem_cfg->txfifo_size[i] +
+                                        sizeof(*dump_data) +
+                                        sizeof(struct iwl_fw_error_dump_fifo);
+               }
+       }
+
+       file_len = sizeof(*dump_file) +
+                  sizeof(*dump_data) * 2 +
+                  sram_len + sizeof(*dump_mem) +
+                  fifo_data_len +
+                  sizeof(*dump_info);
+
+       /* Make room for the SMEM, if it exists */
+       if (smem_len)
+               file_len += sizeof(*dump_data) + sizeof(*dump_mem) + smem_len;
+
+       /* Make room for the secondary SRAM, if it exists */
+       if (sram2_len)
+               file_len += sizeof(*dump_data) + sizeof(*dump_mem) + sram2_len;
+
+       /* Make room for fw's virtual image pages, if it exists */
+       if (mvm->fw->img[mvm->cur_ucode].paging_mem_size)
+               file_len += mvm->num_of_paging_blk *
+                       (sizeof(*dump_data) +
+                        sizeof(struct iwl_fw_error_dump_paging) +
+                        PAGING_BLOCK_SIZE);
+
+       /* If we only want a monitor dump, reset the file length */
+       if (monitor_dump_only) {
+               file_len = sizeof(*dump_file) + sizeof(*dump_data) +
+                          sizeof(*dump_info);
+       }
+
+       /* Make room for PRPH registers */
+       for (i = 0; i < ARRAY_SIZE(iwl_prph_dump_addr); i++) {
+               /* The range includes both boundaries */
+               int num_bytes_in_chunk = iwl_prph_dump_addr[i].end -
+                       iwl_prph_dump_addr[i].start + 4;
+
+               file_len += sizeof(*dump_data) +
+                       sizeof(struct iwl_fw_error_dump_prph) +
+                       num_bytes_in_chunk;
+       }
+
+       /*
+        * In 8000 HW family B-step include the ICCM (which resides separately)
+        */
+       if (mvm->cfg->device_family == IWL_DEVICE_FAMILY_8000 &&
+           CSR_HW_REV_STEP(mvm->trans->hw_rev) == SILICON_B_STEP)
+               file_len += sizeof(*dump_data) + sizeof(*dump_mem) +
+                           IWL8260_ICCM_LEN;
+
+       if (mvm->fw_dump_desc)
+               file_len += sizeof(*dump_data) + sizeof(*dump_trig) +
+                           mvm->fw_dump_desc->len;
+
+       dump_file = vzalloc(file_len);
+       if (!dump_file) {
+               kfree(fw_error_dump);
+               iwl_mvm_free_fw_dump_desc(mvm);
+               return;
+       }
+
+       fw_error_dump->op_mode_ptr = dump_file;
+
+       dump_file->barker = cpu_to_le32(IWL_FW_ERROR_DUMP_BARKER);
+       dump_data = (void *)dump_file->data;
+
+       dump_data->type = cpu_to_le32(IWL_FW_ERROR_DUMP_DEV_FW_INFO);
+       dump_data->len = cpu_to_le32(sizeof(*dump_info));
+       dump_info = (void *)dump_data->data;
+       dump_info->device_family =
+               mvm->cfg->device_family == IWL_DEVICE_FAMILY_7000 ?
+                       cpu_to_le32(IWL_FW_ERROR_DUMP_FAMILY_7) :
+                       cpu_to_le32(IWL_FW_ERROR_DUMP_FAMILY_8);
+       dump_info->hw_step = cpu_to_le32(CSR_HW_REV_STEP(mvm->trans->hw_rev));
+       memcpy(dump_info->fw_human_readable, mvm->fw->human_readable,
+              sizeof(dump_info->fw_human_readable));
+       strncpy(dump_info->dev_human_readable, mvm->cfg->name,
+               sizeof(dump_info->dev_human_readable));
+       strncpy(dump_info->bus_human_readable, mvm->dev->bus->name,
+               sizeof(dump_info->bus_human_readable));
+
+       dump_data = iwl_fw_error_next_data(dump_data);
+       /* We only dump the FIFOs if the FW is in error state */
+       if (test_bit(STATUS_FW_ERROR, &mvm->trans->status))
+               iwl_mvm_dump_fifos(mvm, &dump_data);
+
+       if (mvm->fw_dump_desc) {
+               dump_data->type = cpu_to_le32(IWL_FW_ERROR_DUMP_ERROR_INFO);
+               dump_data->len = cpu_to_le32(sizeof(*dump_trig) +
+                                            mvm->fw_dump_desc->len);
+               dump_trig = (void *)dump_data->data;
+               memcpy(dump_trig, &mvm->fw_dump_desc->trig_desc,
+                      sizeof(*dump_trig) + mvm->fw_dump_desc->len);
+
+               /* now we can free this copy */
+               iwl_mvm_free_fw_dump_desc(mvm);
+               dump_data = iwl_fw_error_next_data(dump_data);
+       }
+
+       /* In case we only want monitor dump, skip to dump trasport data */
+       if (monitor_dump_only)
+               goto dump_trans_data;
+
+       dump_data->type = cpu_to_le32(IWL_FW_ERROR_DUMP_MEM);
+       dump_data->len = cpu_to_le32(sram_len + sizeof(*dump_mem));
+       dump_mem = (void *)dump_data->data;
+       dump_mem->type = cpu_to_le32(IWL_FW_ERROR_DUMP_MEM_SRAM);
+       dump_mem->offset = cpu_to_le32(sram_ofs);
+       iwl_trans_read_mem_bytes(mvm->trans, sram_ofs, dump_mem->data,
+                                sram_len);
+
+       if (smem_len) {
+               dump_data = iwl_fw_error_next_data(dump_data);
+               dump_data->type = cpu_to_le32(IWL_FW_ERROR_DUMP_MEM);
+               dump_data->len = cpu_to_le32(smem_len + sizeof(*dump_mem));
+               dump_mem = (void *)dump_data->data;
+               dump_mem->type = cpu_to_le32(IWL_FW_ERROR_DUMP_MEM_SMEM);
+               dump_mem->offset = cpu_to_le32(mvm->cfg->smem_offset);
+               iwl_trans_read_mem_bytes(mvm->trans, mvm->cfg->smem_offset,
+                                        dump_mem->data, smem_len);
+       }
+
+       if (sram2_len) {
+               dump_data = iwl_fw_error_next_data(dump_data);
+               dump_data->type = cpu_to_le32(IWL_FW_ERROR_DUMP_MEM);
+               dump_data->len = cpu_to_le32(sram2_len + sizeof(*dump_mem));
+               dump_mem = (void *)dump_data->data;
+               dump_mem->type = cpu_to_le32(IWL_FW_ERROR_DUMP_MEM_SRAM);
+               dump_mem->offset = cpu_to_le32(mvm->cfg->dccm2_offset);
+               iwl_trans_read_mem_bytes(mvm->trans, mvm->cfg->dccm2_offset,
+                                        dump_mem->data, sram2_len);
+       }
+
+       if (mvm->cfg->device_family == IWL_DEVICE_FAMILY_8000 &&
+           CSR_HW_REV_STEP(mvm->trans->hw_rev) == SILICON_B_STEP) {
+               dump_data = iwl_fw_error_next_data(dump_data);
+               dump_data->type = cpu_to_le32(IWL_FW_ERROR_DUMP_MEM);
+               dump_data->len = cpu_to_le32(IWL8260_ICCM_LEN +
+                                            sizeof(*dump_mem));
+               dump_mem = (void *)dump_data->data;
+               dump_mem->type = cpu_to_le32(IWL_FW_ERROR_DUMP_MEM_SRAM);
+               dump_mem->offset = cpu_to_le32(IWL8260_ICCM_OFFSET);
+               iwl_trans_read_mem_bytes(mvm->trans, IWL8260_ICCM_OFFSET,
+                                        dump_mem->data, IWL8260_ICCM_LEN);
+       }
+
+       /* Dump fw's virtual image */
+       if (mvm->fw->img[mvm->cur_ucode].paging_mem_size) {
+               u32 i;
+
+               for (i = 1; i < mvm->num_of_paging_blk + 1; i++) {
+                       struct iwl_fw_error_dump_paging *paging;
+                       struct page *pages =
+                               mvm->fw_paging_db[i].fw_paging_block;
+
+                       dump_data = iwl_fw_error_next_data(dump_data);
+                       dump_data->type = cpu_to_le32(IWL_FW_ERROR_DUMP_PAGING);
+                       dump_data->len = cpu_to_le32(sizeof(*paging) +
+                                                    PAGING_BLOCK_SIZE);
+                       paging = (void *)dump_data->data;
+                       paging->index = cpu_to_le32(i);
+                       memcpy(paging->data, page_address(pages),
+                              PAGING_BLOCK_SIZE);
+               }
+       }
+
+       dump_data = iwl_fw_error_next_data(dump_data);
+       iwl_dump_prph(mvm->trans, &dump_data);
+
+dump_trans_data:
+       fw_error_dump->trans_ptr = iwl_trans_dump_data(mvm->trans,
+                                                      mvm->fw_dump_trig);
+       fw_error_dump->op_mode_len = file_len;
+       if (fw_error_dump->trans_ptr)
+               file_len += fw_error_dump->trans_ptr->len;
+       dump_file->file_len = cpu_to_le32(file_len);
+
+       dev_coredumpm(mvm->trans->dev, THIS_MODULE, fw_error_dump, 0,
+                     GFP_KERNEL, iwl_mvm_read_coredump, iwl_mvm_free_coredump);
+
+       mvm->fw_dump_trig = NULL;
+       clear_bit(IWL_MVM_STATUS_DUMPING_FW_LOG, &mvm->status);
+}
+
+struct iwl_mvm_dump_desc iwl_mvm_dump_desc_assert = {
+       .trig_desc = {
+               .type = cpu_to_le32(FW_DBG_TRIGGER_FW_ASSERT),
+       },
+};
+
+int iwl_mvm_fw_dbg_collect_desc(struct iwl_mvm *mvm,
+                               struct iwl_mvm_dump_desc *desc,
+                               struct iwl_fw_dbg_trigger_tlv *trigger)
+{
+       unsigned int delay = 0;
+
+       if (trigger)
+               delay = msecs_to_jiffies(le32_to_cpu(trigger->stop_delay));
+
+       if (test_and_set_bit(IWL_MVM_STATUS_DUMPING_FW_LOG, &mvm->status))
+               return -EBUSY;
+
+       if (WARN_ON(mvm->fw_dump_desc))
+               iwl_mvm_free_fw_dump_desc(mvm);
+
+       IWL_WARN(mvm, "Collecting data: trigger %d fired.\n",
+                le32_to_cpu(desc->trig_desc.type));
+
+       mvm->fw_dump_desc = desc;
+       mvm->fw_dump_trig = trigger;
+
+       queue_delayed_work(system_wq, &mvm->fw_dump_wk, delay);
+
+       return 0;
+}
+
+int iwl_mvm_fw_dbg_collect(struct iwl_mvm *mvm, enum iwl_fw_dbg_trigger trig,
+                          const char *str, size_t len,
+                          struct iwl_fw_dbg_trigger_tlv *trigger)
+{
+       struct iwl_mvm_dump_desc *desc;
+
+       desc = kzalloc(sizeof(*desc) + len, GFP_ATOMIC);
+       if (!desc)
+               return -ENOMEM;
+
+       desc->len = len;
+       desc->trig_desc.type = cpu_to_le32(trig);
+       memcpy(desc->trig_desc.data, str, len);
+
+       return iwl_mvm_fw_dbg_collect_desc(mvm, desc, trigger);
+}
+
+int iwl_mvm_fw_dbg_collect_trig(struct iwl_mvm *mvm,
+                               struct iwl_fw_dbg_trigger_tlv *trigger,
+                               const char *fmt, ...)
+{
+       u16 occurrences = le16_to_cpu(trigger->occurrences);
+       int ret, len = 0;
+       char buf[64];
+
+       if (!occurrences)
+               return 0;
+
+       if (fmt) {
+               va_list ap;
+
+               buf[sizeof(buf) - 1] = '\0';
+
+               va_start(ap, fmt);
+               vsnprintf(buf, sizeof(buf), fmt, ap);
+               va_end(ap);
+
+               /* check for truncation */
+               if (WARN_ON_ONCE(buf[sizeof(buf) - 1]))
+                       buf[sizeof(buf) - 1] = '\0';
+
+               len = strlen(buf) + 1;
+       }
+
+       ret = iwl_mvm_fw_dbg_collect(mvm, le32_to_cpu(trigger->id), buf, len,
+                                    trigger);
+
+       if (ret)
+               return ret;
+
+       trigger->occurrences = cpu_to_le16(occurrences - 1);
+       return 0;
+}
+
+static inline void iwl_mvm_restart_early_start(struct iwl_mvm *mvm)
+{
+       if (mvm->cfg->device_family == IWL_DEVICE_FAMILY_7000)
+               iwl_clear_bits_prph(mvm->trans, MON_BUFF_SAMPLE_CTL, 0x100);
+       else
+               iwl_write_prph(mvm->trans, DBGC_IN_SAMPLE, 1);
+}
+
+int iwl_mvm_start_fw_dbg_conf(struct iwl_mvm *mvm, u8 conf_id)
+{
+       u8 *ptr;
+       int ret;
+       int i;
+
+       if (WARN_ONCE(conf_id >= ARRAY_SIZE(mvm->fw->dbg_conf_tlv),
+                     "Invalid configuration %d\n", conf_id))
+               return -EINVAL;
+
+       /* EARLY START - firmware's configuration is hard coded */
+       if ((!mvm->fw->dbg_conf_tlv[conf_id] ||
+            !mvm->fw->dbg_conf_tlv[conf_id]->num_of_hcmds) &&
+           conf_id == FW_DBG_START_FROM_ALIVE) {
+               iwl_mvm_restart_early_start(mvm);
+               return 0;
+       }
+
+       if (!mvm->fw->dbg_conf_tlv[conf_id])
+               return -EINVAL;
+
+       if (mvm->fw_dbg_conf != FW_DBG_INVALID)
+               IWL_WARN(mvm, "FW already configured (%d) - re-configuring\n",
+                        mvm->fw_dbg_conf);
+
+       /* Send all HCMDs for configuring the FW debug */
+       ptr = (void *)&mvm->fw->dbg_conf_tlv[conf_id]->hcmd;
+       for (i = 0; i < mvm->fw->dbg_conf_tlv[conf_id]->num_of_hcmds; i++) {
+               struct iwl_fw_dbg_conf_hcmd *cmd = (void *)ptr;
+
+               ret = iwl_mvm_send_cmd_pdu(mvm, cmd->id, 0,
+                                          le16_to_cpu(cmd->len), cmd->data);
+               if (ret)
+                       return ret;
+
+               ptr += sizeof(*cmd);
+               ptr += le16_to_cpu(cmd->len);
+       }
+
+       mvm->fw_dbg_conf = conf_id;
+       return ret;
+}
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.h b/drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.h
new file mode 100644 (file)
index 0000000..32232d6
--- /dev/null
@@ -0,0 +1,150 @@
+/******************************************************************************
+ *
+ * This file is provided under a dual BSD/GPLv2 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
+ * Copyright(c) 2015        Intel Deutschland GmbH
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program;
+ *
+ * The full GNU General Public License is included in this distribution
+ * in the file called COPYING.
+ *
+ * Contact Information:
+ *  Intel Linux Wireless <ilw@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ * BSD LICENSE
+ *
+ * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
+ * Copyright(c) 2015        Intel Deutschland GmbH
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *  * Neither the name Intel Corporation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *****************************************************************************/
+
+#ifndef __mvm_fw_dbg_h__
+#define __mvm_fw_dbg_h__
+#include "iwl-fw-file.h"
+#include "iwl-fw-error-dump.h"
+#include "mvm.h"
+
+void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm);
+void iwl_mvm_free_fw_dump_desc(struct iwl_mvm *mvm);
+int iwl_mvm_fw_dbg_collect_desc(struct iwl_mvm *mvm,
+                               struct iwl_mvm_dump_desc *desc,
+                               struct iwl_fw_dbg_trigger_tlv *trigger);
+int iwl_mvm_fw_dbg_collect(struct iwl_mvm *mvm, enum iwl_fw_dbg_trigger trig,
+                          const char *str, size_t len,
+                          struct iwl_fw_dbg_trigger_tlv *trigger);
+int iwl_mvm_fw_dbg_collect_trig(struct iwl_mvm *mvm,
+                               struct iwl_fw_dbg_trigger_tlv *trigger,
+                               const char *fmt, ...) __printf(3, 4);
+int iwl_mvm_start_fw_dbg_conf(struct iwl_mvm *mvm, u8 id);
+
+#define iwl_fw_dbg_trigger_enabled(fw, id) ({                  \
+       void *__dbg_trigger = (fw)->dbg_trigger_tlv[(id)];      \
+       unlikely(__dbg_trigger);                                \
+})
+
+static inline struct iwl_fw_dbg_trigger_tlv*
+_iwl_fw_dbg_get_trigger(const struct iwl_fw *fw, enum iwl_fw_dbg_trigger id)
+{
+       return fw->dbg_trigger_tlv[id];
+}
+
+#define iwl_fw_dbg_get_trigger(fw, id) ({                      \
+       BUILD_BUG_ON(!__builtin_constant_p(id));                \
+       BUILD_BUG_ON((id) >= FW_DBG_TRIGGER_MAX);               \
+       _iwl_fw_dbg_get_trigger((fw), (id));                    \
+})
+
+static inline bool
+iwl_fw_dbg_trigger_vif_match(struct iwl_fw_dbg_trigger_tlv *trig,
+                            struct ieee80211_vif *vif)
+{
+       u32 trig_vif = le32_to_cpu(trig->vif_type);
+
+       return trig_vif == IWL_FW_DBG_CONF_VIF_ANY || vif->type == trig_vif;
+}
+
+static inline bool
+iwl_fw_dbg_trigger_stop_conf_match(struct iwl_mvm *mvm,
+                                  struct iwl_fw_dbg_trigger_tlv *trig)
+{
+       return ((trig->mode & IWL_FW_DBG_TRIGGER_STOP) &&
+               (mvm->fw_dbg_conf == FW_DBG_INVALID ||
+               (BIT(mvm->fw_dbg_conf) & le32_to_cpu(trig->stop_conf_ids))));
+}
+
+static inline bool
+iwl_fw_dbg_trigger_check_stop(struct iwl_mvm *mvm,
+                             struct ieee80211_vif *vif,
+                             struct iwl_fw_dbg_trigger_tlv *trig)
+{
+       if (vif && !iwl_fw_dbg_trigger_vif_match(trig, vif))
+               return false;
+
+       return iwl_fw_dbg_trigger_stop_conf_match(mvm, trig);
+}
+
+static inline void
+_iwl_fw_dbg_trigger_simple_stop(struct iwl_mvm *mvm,
+                               struct ieee80211_vif *vif,
+                               struct iwl_fw_dbg_trigger_tlv *trigger)
+{
+       if (!trigger)
+               return;
+
+       if (!iwl_fw_dbg_trigger_check_stop(mvm, vif, trigger))
+               return;
+
+       iwl_mvm_fw_dbg_collect_trig(mvm, trigger, NULL);
+}
+
+#define iwl_fw_dbg_trigger_simple_stop(mvm, vif, trig) \
+       _iwl_fw_dbg_trigger_simple_stop((mvm), (vif),   \
+                                       iwl_fw_dbg_get_trigger((mvm)->fw,\
+                                                              (trig)))
+
+#endif  /* __mvm_fw_dbg_h__ */
index d906fa13ba9710a3e9250cd481d735aa71f767de..05c933313f97118abbac102d5b7adf586801bacc 100644 (file)
@@ -74,6 +74,7 @@
 #include "iwl-eeprom-parse.h"
 
 #include "mvm.h"
+#include "fw-dbg.h"
 #include "iwl-phy-db.h"
 
 #define MVM_UCODE_ALIVE_TIMEOUT        HZ
@@ -805,137 +806,6 @@ static void iwl_mvm_get_shared_mem_conf(struct iwl_mvm *mvm)
        iwl_free_resp(&cmd);
 }
 
-int iwl_mvm_fw_dbg_collect_desc(struct iwl_mvm *mvm,
-                               struct iwl_mvm_dump_desc *desc,
-                               struct iwl_fw_dbg_trigger_tlv *trigger)
-{
-       unsigned int delay = 0;
-
-       if (trigger)
-               delay = msecs_to_jiffies(le32_to_cpu(trigger->stop_delay));
-
-       if (test_and_set_bit(IWL_MVM_STATUS_DUMPING_FW_LOG, &mvm->status))
-               return -EBUSY;
-
-       if (WARN_ON(mvm->fw_dump_desc))
-               iwl_mvm_free_fw_dump_desc(mvm);
-
-       IWL_WARN(mvm, "Collecting data: trigger %d fired.\n",
-                le32_to_cpu(desc->trig_desc.type));
-
-       mvm->fw_dump_desc = desc;
-       mvm->fw_dump_trig = trigger;
-
-       queue_delayed_work(system_wq, &mvm->fw_dump_wk, delay);
-
-       return 0;
-}
-
-int iwl_mvm_fw_dbg_collect(struct iwl_mvm *mvm, enum iwl_fw_dbg_trigger trig,
-                          const char *str, size_t len,
-                          struct iwl_fw_dbg_trigger_tlv *trigger)
-{
-       struct iwl_mvm_dump_desc *desc;
-
-       desc = kzalloc(sizeof(*desc) + len, GFP_ATOMIC);
-       if (!desc)
-               return -ENOMEM;
-
-       desc->len = len;
-       desc->trig_desc.type = cpu_to_le32(trig);
-       memcpy(desc->trig_desc.data, str, len);
-
-       return iwl_mvm_fw_dbg_collect_desc(mvm, desc, trigger);
-}
-
-int iwl_mvm_fw_dbg_collect_trig(struct iwl_mvm *mvm,
-                               struct iwl_fw_dbg_trigger_tlv *trigger,
-                               const char *fmt, ...)
-{
-       u16 occurrences = le16_to_cpu(trigger->occurrences);
-       int ret, len = 0;
-       char buf[64];
-
-       if (!occurrences)
-               return 0;
-
-       if (fmt) {
-               va_list ap;
-
-               buf[sizeof(buf) - 1] = '\0';
-
-               va_start(ap, fmt);
-               vsnprintf(buf, sizeof(buf), fmt, ap);
-               va_end(ap);
-
-               /* check for truncation */
-               if (WARN_ON_ONCE(buf[sizeof(buf) - 1]))
-                       buf[sizeof(buf) - 1] = '\0';
-
-               len = strlen(buf) + 1;
-       }
-
-       ret = iwl_mvm_fw_dbg_collect(mvm, le32_to_cpu(trigger->id), buf, len,
-                                    trigger);
-
-       if (ret)
-               return ret;
-
-       trigger->occurrences = cpu_to_le16(occurrences - 1);
-       return 0;
-}
-
-static inline void iwl_mvm_restart_early_start(struct iwl_mvm *mvm)
-{
-       if (mvm->cfg->device_family == IWL_DEVICE_FAMILY_7000)
-               iwl_clear_bits_prph(mvm->trans, MON_BUFF_SAMPLE_CTL, 0x100);
-       else
-               iwl_write_prph(mvm->trans, DBGC_IN_SAMPLE, 1);
-}
-
-int iwl_mvm_start_fw_dbg_conf(struct iwl_mvm *mvm, u8 conf_id)
-{
-       u8 *ptr;
-       int ret;
-       int i;
-
-       if (WARN_ONCE(conf_id >= ARRAY_SIZE(mvm->fw->dbg_conf_tlv),
-                     "Invalid configuration %d\n", conf_id))
-               return -EINVAL;
-
-       /* EARLY START - firmware's configuration is hard coded */
-       if ((!mvm->fw->dbg_conf_tlv[conf_id] ||
-            !mvm->fw->dbg_conf_tlv[conf_id]->num_of_hcmds) &&
-           conf_id == FW_DBG_START_FROM_ALIVE) {
-               iwl_mvm_restart_early_start(mvm);
-               return 0;
-       }
-
-       if (!mvm->fw->dbg_conf_tlv[conf_id])
-               return -EINVAL;
-
-       if (mvm->fw_dbg_conf != FW_DBG_INVALID)
-               IWL_WARN(mvm, "FW already configured (%d) - re-configuring\n",
-                        mvm->fw_dbg_conf);
-
-       /* Send all HCMDs for configuring the FW debug */
-       ptr = (void *)&mvm->fw->dbg_conf_tlv[conf_id]->hcmd;
-       for (i = 0; i < mvm->fw->dbg_conf_tlv[conf_id]->num_of_hcmds; i++) {
-               struct iwl_fw_dbg_conf_hcmd *cmd = (void *)ptr;
-
-               ret = iwl_mvm_send_cmd_pdu(mvm, cmd->id, 0,
-                                          le16_to_cpu(cmd->len), cmd->data);
-               if (ret)
-                       return ret;
-
-               ptr += sizeof(*cmd);
-               ptr += le16_to_cpu(cmd->len);
-       }
-
-       mvm->fw_dbg_conf = conf_id;
-       return ret;
-}
-
 static int iwl_mvm_config_ltr(struct iwl_mvm *mvm)
 {
        struct iwl_ltr_config_cmd cmd = {
index ad7ad720d2e768a17145e1f04a9f294a5fda8e2f..ee511aae727d8967ebf76c051fe96dcbc9b39b72 100644 (file)
@@ -72,6 +72,7 @@
 #include "fw-api.h"
 #include "mvm.h"
 #include "time-event.h"
+#include "fw-dbg.h"
 
 const u8 iwl_mvm_ac_to_tx_fifo[] = {
        IWL_MVM_TX_FIFO_VO,
index b83334f27b44d5aaa3f2a99cb64bf7c5d615a417..327703d5d4ba111467f3855603fa868e2ca6d817 100644 (file)
@@ -70,6 +70,7 @@
 #include <linux/ip.h>
 #include <linux/if_arp.h>
 #include <linux/devcoredump.h>
+#include <linux/time.h>
 #include <net/mac80211.h>
 #include <net/ieee80211_radiotap.h>
 #include <net/tcp.h>
@@ -86,6 +87,7 @@
 #include "iwl-prph.h"
 #include "iwl-csr.h"
 #include "iwl-nvm-parse.h"
+#include "fw-dbg.h"
 
 static const struct ieee80211_iface_limit iwl_mvm_limits[] = {
        {
@@ -939,584 +941,6 @@ static void iwl_mvm_cleanup_iterator(void *data, u8 *mac,
        memset(&mvmvif->bf_data, 0, sizeof(mvmvif->bf_data));
 }
 
-static ssize_t iwl_mvm_read_coredump(char *buffer, loff_t offset, size_t count,
-                                    const void *data, size_t datalen)
-{
-       const struct iwl_mvm_dump_ptrs *dump_ptrs = data;
-       ssize_t bytes_read;
-       ssize_t bytes_read_trans;
-
-       if (offset < dump_ptrs->op_mode_len) {
-               bytes_read = min_t(ssize_t, count,
-                                  dump_ptrs->op_mode_len - offset);
-               memcpy(buffer, (u8 *)dump_ptrs->op_mode_ptr + offset,
-                      bytes_read);
-               offset += bytes_read;
-               count -= bytes_read;
-
-               if (count == 0)
-                       return bytes_read;
-       } else {
-               bytes_read = 0;
-       }
-
-       if (!dump_ptrs->trans_ptr)
-               return bytes_read;
-
-       offset -= dump_ptrs->op_mode_len;
-       bytes_read_trans = min_t(ssize_t, count,
-                                dump_ptrs->trans_ptr->len - offset);
-       memcpy(buffer + bytes_read,
-              (u8 *)dump_ptrs->trans_ptr->data + offset,
-              bytes_read_trans);
-
-       return bytes_read + bytes_read_trans;
-}
-
-static void iwl_mvm_free_coredump(const void *data)
-{
-       const struct iwl_mvm_dump_ptrs *fw_error_dump = data;
-
-       vfree(fw_error_dump->op_mode_ptr);
-       vfree(fw_error_dump->trans_ptr);
-       kfree(fw_error_dump);
-}
-
-static void iwl_mvm_dump_fifos(struct iwl_mvm *mvm,
-                              struct iwl_fw_error_dump_data **dump_data)
-{
-       struct iwl_fw_error_dump_fifo *fifo_hdr;
-       u32 *fifo_data;
-       u32 fifo_len;
-       unsigned long flags;
-       int i, j;
-
-       if (!iwl_trans_grab_nic_access(mvm->trans, false, &flags))
-               return;
-
-       /* Pull RXF data from all RXFs */
-       for (i = 0; i < ARRAY_SIZE(mvm->shared_mem_cfg.rxfifo_size); i++) {
-               /*
-                * Keep aside the additional offset that might be needed for
-                * next RXF
-                */
-               u32 offset_diff = RXF_DIFF_FROM_PREV * i;
-
-               fifo_hdr = (void *)(*dump_data)->data;
-               fifo_data = (void *)fifo_hdr->data;
-               fifo_len = mvm->shared_mem_cfg.rxfifo_size[i];
-
-               /* No need to try to read the data if the length is 0 */
-               if (fifo_len == 0)
-                       continue;
-
-               /* Add a TLV for the RXF */
-               (*dump_data)->type = cpu_to_le32(IWL_FW_ERROR_DUMP_RXF);
-               (*dump_data)->len = cpu_to_le32(fifo_len + sizeof(*fifo_hdr));
-
-               fifo_hdr->fifo_num = cpu_to_le32(i);
-               fifo_hdr->available_bytes =
-                       cpu_to_le32(iwl_trans_read_prph(mvm->trans,
-                                                       RXF_RD_D_SPACE +
-                                                       offset_diff));
-               fifo_hdr->wr_ptr =
-                       cpu_to_le32(iwl_trans_read_prph(mvm->trans,
-                                                       RXF_RD_WR_PTR +
-                                                       offset_diff));
-               fifo_hdr->rd_ptr =
-                       cpu_to_le32(iwl_trans_read_prph(mvm->trans,
-                                                       RXF_RD_RD_PTR +
-                                                       offset_diff));
-               fifo_hdr->fence_ptr =
-                       cpu_to_le32(iwl_trans_read_prph(mvm->trans,
-                                                       RXF_RD_FENCE_PTR +
-                                                       offset_diff));
-               fifo_hdr->fence_mode =
-                       cpu_to_le32(iwl_trans_read_prph(mvm->trans,
-                                                       RXF_SET_FENCE_MODE +
-                                                       offset_diff));
-
-               /* Lock fence */
-               iwl_trans_write_prph(mvm->trans,
-                                    RXF_SET_FENCE_MODE + offset_diff, 0x1);
-               /* Set fence pointer to the same place like WR pointer */
-               iwl_trans_write_prph(mvm->trans,
-                                    RXF_LD_WR2FENCE + offset_diff, 0x1);
-               /* Set fence offset */
-               iwl_trans_write_prph(mvm->trans,
-                                    RXF_LD_FENCE_OFFSET_ADDR + offset_diff,
-                                    0x0);
-
-               /* Read FIFO */
-               fifo_len /= sizeof(u32); /* Size in DWORDS */
-               for (j = 0; j < fifo_len; j++)
-                       fifo_data[j] = iwl_trans_read_prph(mvm->trans,
-                                                        RXF_FIFO_RD_FENCE_INC +
-                                                        offset_diff);
-               *dump_data = iwl_fw_error_next_data(*dump_data);
-       }
-
-       /* Pull TXF data from all TXFs */
-       for (i = 0; i < ARRAY_SIZE(mvm->shared_mem_cfg.txfifo_size); i++) {
-               /* Mark the number of TXF we're pulling now */
-               iwl_trans_write_prph(mvm->trans, TXF_LARC_NUM, i);
-
-               fifo_hdr = (void *)(*dump_data)->data;
-               fifo_data = (void *)fifo_hdr->data;
-               fifo_len = mvm->shared_mem_cfg.txfifo_size[i];
-
-               /* No need to try to read the data if the length is 0 */
-               if (fifo_len == 0)
-                       continue;
-
-               /* Add a TLV for the FIFO */
-               (*dump_data)->type = cpu_to_le32(IWL_FW_ERROR_DUMP_TXF);
-               (*dump_data)->len = cpu_to_le32(fifo_len + sizeof(*fifo_hdr));
-
-               fifo_hdr->fifo_num = cpu_to_le32(i);
-               fifo_hdr->available_bytes =
-                       cpu_to_le32(iwl_trans_read_prph(mvm->trans,
-                                                       TXF_FIFO_ITEM_CNT));
-               fifo_hdr->wr_ptr =
-                       cpu_to_le32(iwl_trans_read_prph(mvm->trans,
-                                                       TXF_WR_PTR));
-               fifo_hdr->rd_ptr =
-                       cpu_to_le32(iwl_trans_read_prph(mvm->trans,
-                                                       TXF_RD_PTR));
-               fifo_hdr->fence_ptr =
-                       cpu_to_le32(iwl_trans_read_prph(mvm->trans,
-                                                       TXF_FENCE_PTR));
-               fifo_hdr->fence_mode =
-                       cpu_to_le32(iwl_trans_read_prph(mvm->trans,
-                                                       TXF_LOCK_FENCE));
-
-               /* Set the TXF_READ_MODIFY_ADDR to TXF_WR_PTR */
-               iwl_trans_write_prph(mvm->trans, TXF_READ_MODIFY_ADDR,
-                                    TXF_WR_PTR);
-
-               /* Dummy-read to advance the read pointer to the head */
-               iwl_trans_read_prph(mvm->trans, TXF_READ_MODIFY_DATA);
-
-               /* Read FIFO */
-               fifo_len /= sizeof(u32); /* Size in DWORDS */
-               for (j = 0; j < fifo_len; j++)
-                       fifo_data[j] = iwl_trans_read_prph(mvm->trans,
-                                                         TXF_READ_MODIFY_DATA);
-               *dump_data = iwl_fw_error_next_data(*dump_data);
-       }
-
-       iwl_trans_release_nic_access(mvm->trans, &flags);
-}
-
-void iwl_mvm_free_fw_dump_desc(struct iwl_mvm *mvm)
-{
-       if (mvm->fw_dump_desc == &iwl_mvm_dump_desc_assert ||
-           !mvm->fw_dump_desc)
-               return;
-
-       kfree(mvm->fw_dump_desc);
-       mvm->fw_dump_desc = NULL;
-}
-
-#define IWL8260_ICCM_OFFSET            0x44000 /* Only for B-step */
-#define IWL8260_ICCM_LEN               0xC000 /* Only for B-step */
-
-static const struct {
-       u32 start, end;
-} iwl_prph_dump_addr[] = {
-       { .start = 0x00a00000, .end = 0x00a00000 },
-       { .start = 0x00a0000c, .end = 0x00a00024 },
-       { .start = 0x00a0002c, .end = 0x00a0003c },
-       { .start = 0x00a00410, .end = 0x00a00418 },
-       { .start = 0x00a00420, .end = 0x00a00420 },
-       { .start = 0x00a00428, .end = 0x00a00428 },
-       { .start = 0x00a00430, .end = 0x00a0043c },
-       { .start = 0x00a00444, .end = 0x00a00444 },
-       { .start = 0x00a004c0, .end = 0x00a004cc },
-       { .start = 0x00a004d8, .end = 0x00a004d8 },
-       { .start = 0x00a004e0, .end = 0x00a004f0 },
-       { .start = 0x00a00840, .end = 0x00a00840 },
-       { .start = 0x00a00850, .end = 0x00a00858 },
-       { .start = 0x00a01004, .end = 0x00a01008 },
-       { .start = 0x00a01010, .end = 0x00a01010 },
-       { .start = 0x00a01018, .end = 0x00a01018 },
-       { .start = 0x00a01024, .end = 0x00a01024 },
-       { .start = 0x00a0102c, .end = 0x00a01034 },
-       { .start = 0x00a0103c, .end = 0x00a01040 },
-       { .start = 0x00a01048, .end = 0x00a01094 },
-       { .start = 0x00a01c00, .end = 0x00a01c20 },
-       { .start = 0x00a01c58, .end = 0x00a01c58 },
-       { .start = 0x00a01c7c, .end = 0x00a01c7c },
-       { .start = 0x00a01c28, .end = 0x00a01c54 },
-       { .start = 0x00a01c5c, .end = 0x00a01c5c },
-       { .start = 0x00a01c60, .end = 0x00a01cdc },
-       { .start = 0x00a01ce0, .end = 0x00a01d0c },
-       { .start = 0x00a01d18, .end = 0x00a01d20 },
-       { .start = 0x00a01d2c, .end = 0x00a01d30 },
-       { .start = 0x00a01d40, .end = 0x00a01d5c },
-       { .start = 0x00a01d80, .end = 0x00a01d80 },
-       { .start = 0x00a01d98, .end = 0x00a01d9c },
-       { .start = 0x00a01da8, .end = 0x00a01da8 },
-       { .start = 0x00a01db8, .end = 0x00a01df4 },
-       { .start = 0x00a01dc0, .end = 0x00a01dfc },
-       { .start = 0x00a01e00, .end = 0x00a01e2c },
-       { .start = 0x00a01e40, .end = 0x00a01e60 },
-       { .start = 0x00a01e68, .end = 0x00a01e6c },
-       { .start = 0x00a01e74, .end = 0x00a01e74 },
-       { .start = 0x00a01e84, .end = 0x00a01e90 },
-       { .start = 0x00a01e9c, .end = 0x00a01ec4 },
-       { .start = 0x00a01ed0, .end = 0x00a01ee0 },
-       { .start = 0x00a01f00, .end = 0x00a01f1c },
-       { .start = 0x00a01f44, .end = 0x00a01ffc },
-       { .start = 0x00a02000, .end = 0x00a02048 },
-       { .start = 0x00a02068, .end = 0x00a020f0 },
-       { .start = 0x00a02100, .end = 0x00a02118 },
-       { .start = 0x00a02140, .end = 0x00a0214c },
-       { .start = 0x00a02168, .end = 0x00a0218c },
-       { .start = 0x00a021c0, .end = 0x00a021c0 },
-       { .start = 0x00a02400, .end = 0x00a02410 },
-       { .start = 0x00a02418, .end = 0x00a02420 },
-       { .start = 0x00a02428, .end = 0x00a0242c },
-       { .start = 0x00a02434, .end = 0x00a02434 },
-       { .start = 0x00a02440, .end = 0x00a02460 },
-       { .start = 0x00a02468, .end = 0x00a024b0 },
-       { .start = 0x00a024c8, .end = 0x00a024cc },
-       { .start = 0x00a02500, .end = 0x00a02504 },
-       { .start = 0x00a0250c, .end = 0x00a02510 },
-       { .start = 0x00a02540, .end = 0x00a02554 },
-       { .start = 0x00a02580, .end = 0x00a025f4 },
-       { .start = 0x00a02600, .end = 0x00a0260c },
-       { .start = 0x00a02648, .end = 0x00a02650 },
-       { .start = 0x00a02680, .end = 0x00a02680 },
-       { .start = 0x00a026c0, .end = 0x00a026d0 },
-       { .start = 0x00a02700, .end = 0x00a0270c },
-       { .start = 0x00a02804, .end = 0x00a02804 },
-       { .start = 0x00a02818, .end = 0x00a0281c },
-       { .start = 0x00a02c00, .end = 0x00a02db4 },
-       { .start = 0x00a02df4, .end = 0x00a02fb0 },
-       { .start = 0x00a03000, .end = 0x00a03014 },
-       { .start = 0x00a0301c, .end = 0x00a0302c },
-       { .start = 0x00a03034, .end = 0x00a03038 },
-       { .start = 0x00a03040, .end = 0x00a03048 },
-       { .start = 0x00a03060, .end = 0x00a03068 },
-       { .start = 0x00a03070, .end = 0x00a03074 },
-       { .start = 0x00a0307c, .end = 0x00a0307c },
-       { .start = 0x00a03080, .end = 0x00a03084 },
-       { .start = 0x00a0308c, .end = 0x00a03090 },
-       { .start = 0x00a03098, .end = 0x00a03098 },
-       { .start = 0x00a030a0, .end = 0x00a030a0 },
-       { .start = 0x00a030a8, .end = 0x00a030b4 },
-       { .start = 0x00a030bc, .end = 0x00a030bc },
-       { .start = 0x00a030c0, .end = 0x00a0312c },
-       { .start = 0x00a03c00, .end = 0x00a03c5c },
-       { .start = 0x00a04400, .end = 0x00a04454 },
-       { .start = 0x00a04460, .end = 0x00a04474 },
-       { .start = 0x00a044c0, .end = 0x00a044ec },
-       { .start = 0x00a04500, .end = 0x00a04504 },
-       { .start = 0x00a04510, .end = 0x00a04538 },
-       { .start = 0x00a04540, .end = 0x00a04548 },
-       { .start = 0x00a04560, .end = 0x00a0457c },
-       { .start = 0x00a04590, .end = 0x00a04598 },
-       { .start = 0x00a045c0, .end = 0x00a045f4 },
-};
-
-static u32 iwl_dump_prph(struct iwl_trans *trans,
-                        struct iwl_fw_error_dump_data **data)
-{
-       struct iwl_fw_error_dump_prph *prph;
-       unsigned long flags;
-       u32 prph_len = 0, i;
-
-       if (!iwl_trans_grab_nic_access(trans, false, &flags))
-               return 0;
-
-       for (i = 0; i < ARRAY_SIZE(iwl_prph_dump_addr); i++) {
-               /* The range includes both boundaries */
-               int num_bytes_in_chunk = iwl_prph_dump_addr[i].end -
-                        iwl_prph_dump_addr[i].start + 4;
-               int reg;
-               __le32 *val;
-
-               prph_len += sizeof(**data) + sizeof(*prph) + num_bytes_in_chunk;
-
-               (*data)->type = cpu_to_le32(IWL_FW_ERROR_DUMP_PRPH);
-               (*data)->len = cpu_to_le32(sizeof(*prph) +
-                                       num_bytes_in_chunk);
-               prph = (void *)(*data)->data;
-               prph->prph_start = cpu_to_le32(iwl_prph_dump_addr[i].start);
-               val = (void *)prph->data;
-
-               for (reg = iwl_prph_dump_addr[i].start;
-                    reg <= iwl_prph_dump_addr[i].end;
-                    reg += 4)
-                       *val++ = cpu_to_le32(iwl_read_prph_no_grab(trans,
-                                                                  reg));
-
-                       *data = iwl_fw_error_next_data(*data);
-       }
-
-       iwl_trans_release_nic_access(trans, &flags);
-
-       return prph_len;
-}
-
-void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm)
-{
-       struct iwl_fw_error_dump_file *dump_file;
-       struct iwl_fw_error_dump_data *dump_data;
-       struct iwl_fw_error_dump_info *dump_info;
-       struct iwl_fw_error_dump_mem *dump_mem;
-       struct iwl_fw_error_dump_trigger_desc *dump_trig;
-       struct iwl_mvm_dump_ptrs *fw_error_dump;
-       u32 sram_len, sram_ofs;
-       u32 file_len, fifo_data_len = 0;
-       u32 smem_len = mvm->cfg->smem_len;
-       u32 sram2_len = mvm->cfg->dccm2_len;
-       bool monitor_dump_only = false;
-       int i;
-
-       lockdep_assert_held(&mvm->mutex);
-
-       /* there's no point in fw dump if the bus is dead */
-       if (test_bit(STATUS_TRANS_DEAD, &mvm->trans->status)) {
-               IWL_ERR(mvm, "Skip fw error dump since bus is dead\n");
-               return;
-       }
-
-       if (mvm->fw_dump_trig &&
-           mvm->fw_dump_trig->mode & IWL_FW_DBG_TRIGGER_MONITOR_ONLY)
-               monitor_dump_only = true;
-
-       fw_error_dump = kzalloc(sizeof(*fw_error_dump), GFP_KERNEL);
-       if (!fw_error_dump)
-               return;
-
-       /* SRAM - include stack CCM if driver knows the values for it */
-       if (!mvm->cfg->dccm_offset || !mvm->cfg->dccm_len) {
-               const struct fw_img *img;
-
-               img = &mvm->fw->img[mvm->cur_ucode];
-               sram_ofs = img->sec[IWL_UCODE_SECTION_DATA].offset;
-               sram_len = img->sec[IWL_UCODE_SECTION_DATA].len;
-       } else {
-               sram_ofs = mvm->cfg->dccm_offset;
-               sram_len = mvm->cfg->dccm_len;
-       }
-
-       /* reading RXF/TXF sizes */
-       if (test_bit(STATUS_FW_ERROR, &mvm->trans->status)) {
-               struct iwl_mvm_shared_mem_cfg *mem_cfg = &mvm->shared_mem_cfg;
-
-               fifo_data_len = 0;
-
-               /* Count RXF size */
-               for (i = 0; i < ARRAY_SIZE(mem_cfg->rxfifo_size); i++) {
-                       if (!mem_cfg->rxfifo_size[i])
-                               continue;
-
-                       /* Add header info */
-                       fifo_data_len += mem_cfg->rxfifo_size[i] +
-                                        sizeof(*dump_data) +
-                                        sizeof(struct iwl_fw_error_dump_fifo);
-               }
-
-               for (i = 0; i < ARRAY_SIZE(mem_cfg->txfifo_size); i++) {
-                       if (!mem_cfg->txfifo_size[i])
-                               continue;
-
-                       /* Add header info */
-                       fifo_data_len += mem_cfg->txfifo_size[i] +
-                                        sizeof(*dump_data) +
-                                        sizeof(struct iwl_fw_error_dump_fifo);
-               }
-       }
-
-       file_len = sizeof(*dump_file) +
-                  sizeof(*dump_data) * 2 +
-                  sram_len + sizeof(*dump_mem) +
-                  fifo_data_len +
-                  sizeof(*dump_info);
-
-       /* Make room for the SMEM, if it exists */
-       if (smem_len)
-               file_len += sizeof(*dump_data) + sizeof(*dump_mem) + smem_len;
-
-       /* Make room for the secondary SRAM, if it exists */
-       if (sram2_len)
-               file_len += sizeof(*dump_data) + sizeof(*dump_mem) + sram2_len;
-
-       /* Make room for fw's virtual image pages, if it exists */
-       if (mvm->fw->img[mvm->cur_ucode].paging_mem_size)
-               file_len += mvm->num_of_paging_blk *
-                       (sizeof(*dump_data) +
-                        sizeof(struct iwl_fw_error_dump_paging) +
-                        PAGING_BLOCK_SIZE);
-
-       /* If we only want a monitor dump, reset the file length */
-       if (monitor_dump_only) {
-               file_len = sizeof(*dump_file) + sizeof(*dump_data) +
-                          sizeof(*dump_info);
-       }
-
-       /* Make room for PRPH registers */
-       for (i = 0; i < ARRAY_SIZE(iwl_prph_dump_addr); i++) {
-               /* The range includes both boundaries */
-               int num_bytes_in_chunk = iwl_prph_dump_addr[i].end -
-                       iwl_prph_dump_addr[i].start + 4;
-
-               file_len += sizeof(*dump_data) +
-                       sizeof(struct iwl_fw_error_dump_prph) +
-                       num_bytes_in_chunk;
-       }
-
-       /*
-        * In 8000 HW family B-step include the ICCM (which resides separately)
-        */
-       if (mvm->cfg->device_family == IWL_DEVICE_FAMILY_8000 &&
-           CSR_HW_REV_STEP(mvm->trans->hw_rev) == SILICON_B_STEP)
-               file_len += sizeof(*dump_data) + sizeof(*dump_mem) +
-                           IWL8260_ICCM_LEN;
-
-       if (mvm->fw_dump_desc)
-               file_len += sizeof(*dump_data) + sizeof(*dump_trig) +
-                           mvm->fw_dump_desc->len;
-
-       dump_file = vzalloc(file_len);
-       if (!dump_file) {
-               kfree(fw_error_dump);
-               iwl_mvm_free_fw_dump_desc(mvm);
-               return;
-       }
-
-       fw_error_dump->op_mode_ptr = dump_file;
-
-       dump_file->barker = cpu_to_le32(IWL_FW_ERROR_DUMP_BARKER);
-       dump_data = (void *)dump_file->data;
-
-       dump_data->type = cpu_to_le32(IWL_FW_ERROR_DUMP_DEV_FW_INFO);
-       dump_data->len = cpu_to_le32(sizeof(*dump_info));
-       dump_info = (void *) dump_data->data;
-       dump_info->device_family =
-               mvm->cfg->device_family == IWL_DEVICE_FAMILY_7000 ?
-                       cpu_to_le32(IWL_FW_ERROR_DUMP_FAMILY_7) :
-                       cpu_to_le32(IWL_FW_ERROR_DUMP_FAMILY_8);
-       dump_info->hw_step = cpu_to_le32(CSR_HW_REV_STEP(mvm->trans->hw_rev));
-       memcpy(dump_info->fw_human_readable, mvm->fw->human_readable,
-              sizeof(dump_info->fw_human_readable));
-       strncpy(dump_info->dev_human_readable, mvm->cfg->name,
-               sizeof(dump_info->dev_human_readable));
-       strncpy(dump_info->bus_human_readable, mvm->dev->bus->name,
-               sizeof(dump_info->bus_human_readable));
-
-       dump_data = iwl_fw_error_next_data(dump_data);
-       /* We only dump the FIFOs if the FW is in error state */
-       if (test_bit(STATUS_FW_ERROR, &mvm->trans->status))
-               iwl_mvm_dump_fifos(mvm, &dump_data);
-
-       if (mvm->fw_dump_desc) {
-               dump_data->type = cpu_to_le32(IWL_FW_ERROR_DUMP_ERROR_INFO);
-               dump_data->len = cpu_to_le32(sizeof(*dump_trig) +
-                                            mvm->fw_dump_desc->len);
-               dump_trig = (void *)dump_data->data;
-               memcpy(dump_trig, &mvm->fw_dump_desc->trig_desc,
-                      sizeof(*dump_trig) + mvm->fw_dump_desc->len);
-
-               /* now we can free this copy */
-               iwl_mvm_free_fw_dump_desc(mvm);
-               dump_data = iwl_fw_error_next_data(dump_data);
-       }
-
-       /* In case we only want monitor dump, skip to dump trasport data */
-       if (monitor_dump_only)
-               goto dump_trans_data;
-
-       dump_data->type = cpu_to_le32(IWL_FW_ERROR_DUMP_MEM);
-       dump_data->len = cpu_to_le32(sram_len + sizeof(*dump_mem));
-       dump_mem = (void *)dump_data->data;
-       dump_mem->type = cpu_to_le32(IWL_FW_ERROR_DUMP_MEM_SRAM);
-       dump_mem->offset = cpu_to_le32(sram_ofs);
-       iwl_trans_read_mem_bytes(mvm->trans, sram_ofs, dump_mem->data,
-                                sram_len);
-
-       if (smem_len) {
-               dump_data = iwl_fw_error_next_data(dump_data);
-               dump_data->type = cpu_to_le32(IWL_FW_ERROR_DUMP_MEM);
-               dump_data->len = cpu_to_le32(smem_len + sizeof(*dump_mem));
-               dump_mem = (void *)dump_data->data;
-               dump_mem->type = cpu_to_le32(IWL_FW_ERROR_DUMP_MEM_SMEM);
-               dump_mem->offset = cpu_to_le32(mvm->cfg->smem_offset);
-               iwl_trans_read_mem_bytes(mvm->trans, mvm->cfg->smem_offset,
-                                        dump_mem->data, smem_len);
-       }
-
-       if (sram2_len) {
-               dump_data = iwl_fw_error_next_data(dump_data);
-               dump_data->type = cpu_to_le32(IWL_FW_ERROR_DUMP_MEM);
-               dump_data->len = cpu_to_le32(sram2_len + sizeof(*dump_mem));
-               dump_mem = (void *)dump_data->data;
-               dump_mem->type = cpu_to_le32(IWL_FW_ERROR_DUMP_MEM_SRAM);
-               dump_mem->offset = cpu_to_le32(mvm->cfg->dccm2_offset);
-               iwl_trans_read_mem_bytes(mvm->trans, mvm->cfg->dccm2_offset,
-                                        dump_mem->data, sram2_len);
-       }
-
-       if (mvm->cfg->device_family == IWL_DEVICE_FAMILY_8000 &&
-           CSR_HW_REV_STEP(mvm->trans->hw_rev) == SILICON_B_STEP) {
-               dump_data = iwl_fw_error_next_data(dump_data);
-               dump_data->type = cpu_to_le32(IWL_FW_ERROR_DUMP_MEM);
-               dump_data->len = cpu_to_le32(IWL8260_ICCM_LEN +
-                                            sizeof(*dump_mem));
-               dump_mem = (void *)dump_data->data;
-               dump_mem->type = cpu_to_le32(IWL_FW_ERROR_DUMP_MEM_SRAM);
-               dump_mem->offset = cpu_to_le32(IWL8260_ICCM_OFFSET);
-               iwl_trans_read_mem_bytes(mvm->trans, IWL8260_ICCM_OFFSET,
-                                        dump_mem->data, IWL8260_ICCM_LEN);
-       }
-
-       /* Dump fw's virtual image */
-       if (mvm->fw->img[mvm->cur_ucode].paging_mem_size) {
-               u32 i;
-
-               for (i = 1; i < mvm->num_of_paging_blk + 1; i++) {
-                       struct iwl_fw_error_dump_paging *paging;
-                       struct page *pages =
-                               mvm->fw_paging_db[i].fw_paging_block;
-
-                       dump_data = iwl_fw_error_next_data(dump_data);
-                       dump_data->type = cpu_to_le32(IWL_FW_ERROR_DUMP_PAGING);
-                       dump_data->len = cpu_to_le32(sizeof(*paging) +
-                                                    PAGING_BLOCK_SIZE);
-                       paging = (void *)dump_data->data;
-                       paging->index = cpu_to_le32(i);
-                       memcpy(paging->data, page_address(pages),
-                              PAGING_BLOCK_SIZE);
-               }
-       }
-
-       dump_data = iwl_fw_error_next_data(dump_data);
-       iwl_dump_prph(mvm->trans, &dump_data);
-
-dump_trans_data:
-       fw_error_dump->trans_ptr = iwl_trans_dump_data(mvm->trans,
-                                                      mvm->fw_dump_trig);
-       fw_error_dump->op_mode_len = file_len;
-       if (fw_error_dump->trans_ptr)
-               file_len += fw_error_dump->trans_ptr->len;
-       dump_file->file_len = cpu_to_le32(file_len);
-
-       dev_coredumpm(mvm->trans->dev, THIS_MODULE, fw_error_dump, 0,
-                     GFP_KERNEL, iwl_mvm_read_coredump, iwl_mvm_free_coredump);
-
-       mvm->fw_dump_trig = NULL;
-       clear_bit(IWL_MVM_STATUS_DUMPING_FW_LOG, &mvm->status);
-}
-
-struct iwl_mvm_dump_desc iwl_mvm_dump_desc_assert = {
-       .trig_desc = {
-               .type = cpu_to_le32(FW_DBG_TRIGGER_FW_ASSERT),
-       },
-};
-
 static void iwl_mvm_restart_cleanup(struct iwl_mvm *mvm)
 {
        /* clear the D3 reconfig, we only need it to avoid dumping a
index 013b37920048ed19ea4de43012b8eb5f67129cf9..5692856d3e4253c87aea2ab21dba9a9d83150f41 100644 (file)
@@ -1480,69 +1480,10 @@ void iwl_mvm_tdls_ch_switch_work(struct work_struct *work);
 struct ieee80211_vif *iwl_mvm_get_bss_vif(struct iwl_mvm *mvm);
 
 void iwl_mvm_nic_restart(struct iwl_mvm *mvm, bool fw_error);
-void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm);
-
-int iwl_mvm_start_fw_dbg_conf(struct iwl_mvm *mvm, u8 id);
-int iwl_mvm_fw_dbg_collect(struct iwl_mvm *mvm, enum iwl_fw_dbg_trigger trig,
-                          const char *str, size_t len,
-                          struct iwl_fw_dbg_trigger_tlv *trigger);
-int iwl_mvm_fw_dbg_collect_desc(struct iwl_mvm *mvm,
-                               struct iwl_mvm_dump_desc *desc,
-                               struct iwl_fw_dbg_trigger_tlv *trigger);
-void iwl_mvm_free_fw_dump_desc(struct iwl_mvm *mvm);
-int iwl_mvm_fw_dbg_collect_trig(struct iwl_mvm *mvm,
-                               struct iwl_fw_dbg_trigger_tlv *trigger,
-                               const char *fmt, ...) __printf(3, 4);
 unsigned int iwl_mvm_get_wd_timeout(struct iwl_mvm *mvm,
                                    struct ieee80211_vif *vif,
                                    bool tdls, bool cmd_q);
 void iwl_mvm_connection_loss(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
                             const char *errmsg);
-static inline bool
-iwl_fw_dbg_trigger_vif_match(struct iwl_fw_dbg_trigger_tlv *trig,
-                            struct ieee80211_vif *vif)
-{
-       u32 trig_vif = le32_to_cpu(trig->vif_type);
-
-       return trig_vif == IWL_FW_DBG_CONF_VIF_ANY || vif->type == trig_vif;
-}
-
-static inline bool
-iwl_fw_dbg_trigger_stop_conf_match(struct iwl_mvm *mvm,
-                                  struct iwl_fw_dbg_trigger_tlv *trig)
-{
-       return ((trig->mode & IWL_FW_DBG_TRIGGER_STOP) &&
-               (mvm->fw_dbg_conf == FW_DBG_INVALID ||
-               (BIT(mvm->fw_dbg_conf) & le32_to_cpu(trig->stop_conf_ids))));
-}
-
-static inline bool
-iwl_fw_dbg_trigger_check_stop(struct iwl_mvm *mvm,
-                             struct ieee80211_vif *vif,
-                             struct iwl_fw_dbg_trigger_tlv *trig)
-{
-       if (vif && !iwl_fw_dbg_trigger_vif_match(trig, vif))
-               return false;
-
-       return iwl_fw_dbg_trigger_stop_conf_match(mvm, trig);
-}
-
-static inline void
-_iwl_fw_dbg_trigger_simple_stop(struct iwl_mvm *mvm,
-                               struct ieee80211_vif *vif,
-                               struct iwl_fw_dbg_trigger_tlv *trigger)
-{
-       if (!trigger)
-               return;
-
-       if (!iwl_fw_dbg_trigger_check_stop(mvm, vif, trigger))
-               return;
-
-       iwl_mvm_fw_dbg_collect_trig(mvm, trigger, NULL);
-}
-#define iwl_fw_dbg_trigger_simple_stop(mvm, vif, trig) \
-       _iwl_fw_dbg_trigger_simple_stop((mvm), (vif),   \
-                                       iwl_fw_dbg_get_trigger((mvm)->fw,\
-                                                              (trig)))
 
 #endif /* __IWL_MVM_H__ */
index f002e558fc136890e7bbdacc47d6768c4717ee7e..f96ed5577c5e6939d19177060d787d807c2da95a 100644 (file)
@@ -82,6 +82,7 @@
 #include "rs.h"
 #include "fw-api-scan.h"
 #include "time-event.h"
+#include "fw-dbg.h"
 
 #define DRV_DESCRIPTION        "The new Intel(R) wireless AGN driver for Linux"
 MODULE_DESCRIPTION(DRV_DESCRIPTION);
index 5b58f5320e8df39c049a69b7d44d781e85dc8ad5..d1d50ffb14592f330c080cbb6d3005f13af9cb0d 100644 (file)
@@ -65,6 +65,7 @@
 #include "iwl-trans.h"
 #include "mvm.h"
 #include "fw-api.h"
+#include "fw-dbg.h"
 
 /*
  * iwl_mvm_rx_rx_phy_cmd - REPLY_RX_PHY_CMD handler
index 7530eb23035d3ea315c8d6671eebce16d0ec44c6..52692dfee47aa9d2bebfcaf94cd2c17f90c2fae1 100644 (file)
@@ -73,6 +73,7 @@
 #include "mvm.h"
 #include "iwl-io.h"
 #include "iwl-prph.h"
+#include "fw-dbg.h"
 
 /*
  * For the high priority TE use a time event type that has similar priority to
index c652a66be80353532a215f6b728d6d847d50825d..aaebb5d4462ab046da0bcf886bc94f03b4c2766d 100644 (file)
@@ -69,6 +69,7 @@
 #include "iwl-eeprom-parse.h"
 #include "mvm.h"
 #include "sta.h"
+#include "fw-dbg.h"
 
 static void
 iwl_mvm_bar_check_trigger(struct iwl_mvm *mvm, const u8 *addr,
index ad0f16909e2e243483334b9d9cb274c72a78be50..bbb7f6b27f5e1a9420eb8f7f9135b597164c1856 100644 (file)
@@ -68,7 +68,7 @@
 #include "iwl-debug.h"
 #include "iwl-io.h"
 #include "iwl-prph.h"
-
+#include "fw-dbg.h"
 #include "mvm.h"
 #include "fw-api-rs.h"