diff options
author | Liad Kaufman <liad.kaufman@intel.com> | 2015-03-02 04:46:46 -0500 |
---|---|---|
committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-03-18 02:41:59 -0400 |
commit | e539761d98dbd80204867194a9f110f8392c2637 (patch) | |
tree | 6ddd149695a6be2ac3e4ec997af14630287339bb /drivers/net/wireless | |
parent | fe92e32ace11b21311fbeb8dbf14ac45b87e700d (diff) |
iwlwifi: mvm: add iccm data to 8000 b-step data dump
In 8000 HW family B-step only, the ICCM is separate
from the SRAM. This adds the ICCM to the dump data
collected for FW debug.
Signed-off-by: Liad Kaufman <liad.kaufman@intel.com>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/mac80211.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c index babe8922faeb..a3a84d1523bc 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c | |||
@@ -1007,6 +1007,9 @@ void iwl_mvm_free_fw_dump_desc(struct iwl_mvm *mvm) | |||
1007 | mvm->fw_dump_desc = NULL; | 1007 | mvm->fw_dump_desc = NULL; |
1008 | } | 1008 | } |
1009 | 1009 | ||
1010 | #define IWL8260_ICCM_OFFSET 0x44000 /* Only for B-step */ | ||
1011 | #define IWL8260_ICCM_LEN 0xC000 /* Only for B-step */ | ||
1012 | |||
1010 | void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm) | 1013 | void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm) |
1011 | { | 1014 | { |
1012 | struct iwl_fw_error_dump_file *dump_file; | 1015 | struct iwl_fw_error_dump_file *dump_file; |
@@ -1083,6 +1086,14 @@ void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm) | |||
1083 | fifo_data_len + | 1086 | fifo_data_len + |
1084 | sizeof(*dump_info); | 1087 | sizeof(*dump_info); |
1085 | 1088 | ||
1089 | /* | ||
1090 | * In 8000 HW family B-step include the ICCM (which resides separately) | ||
1091 | */ | ||
1092 | if (mvm->cfg->device_family == IWL_DEVICE_FAMILY_8000 && | ||
1093 | CSR_HW_REV_STEP(mvm->trans->hw_rev) == SILICON_B_STEP) | ||
1094 | file_len += sizeof(*dump_data) + sizeof(*dump_mem) + | ||
1095 | IWL8260_ICCM_LEN; | ||
1096 | |||
1086 | if (mvm->fw_dump_desc) | 1097 | if (mvm->fw_dump_desc) |
1087 | file_len += sizeof(*dump_data) + sizeof(*dump_trig) + | 1098 | file_len += sizeof(*dump_data) + sizeof(*dump_trig) + |
1088 | mvm->fw_dump_desc->len; | 1099 | mvm->fw_dump_desc->len; |
@@ -1170,6 +1181,19 @@ void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm) | |||
1170 | dump_mem->data, sram2_len); | 1181 | dump_mem->data, sram2_len); |
1171 | } | 1182 | } |
1172 | 1183 | ||
1184 | if (mvm->cfg->device_family == IWL_DEVICE_FAMILY_8000 && | ||
1185 | CSR_HW_REV_STEP(mvm->trans->hw_rev) == SILICON_B_STEP) { | ||
1186 | dump_data = iwl_fw_error_next_data(dump_data); | ||
1187 | dump_data->type = cpu_to_le32(IWL_FW_ERROR_DUMP_MEM); | ||
1188 | dump_data->len = cpu_to_le32(IWL8260_ICCM_LEN + | ||
1189 | sizeof(*dump_mem)); | ||
1190 | dump_mem = (void *)dump_data->data; | ||
1191 | dump_mem->type = cpu_to_le32(IWL_FW_ERROR_DUMP_MEM_SRAM); | ||
1192 | dump_mem->offset = cpu_to_le32(IWL8260_ICCM_OFFSET); | ||
1193 | iwl_trans_read_mem_bytes(mvm->trans, IWL8260_ICCM_OFFSET, | ||
1194 | dump_mem->data, IWL8260_ICCM_LEN); | ||
1195 | } | ||
1196 | |||
1173 | fw_error_dump->trans_ptr = iwl_trans_dump_data(mvm->trans); | 1197 | fw_error_dump->trans_ptr = iwl_trans_dump_data(mvm->trans); |
1174 | fw_error_dump->op_mode_len = file_len; | 1198 | fw_error_dump->op_mode_len = file_len; |
1175 | if (fw_error_dump->trans_ptr) | 1199 | if (fw_error_dump->trans_ptr) |