Merge tag 'iwlwifi-next-for-kalle-2018-10-12' of... (12f7a186) · Commits · 戴 / test

drivers/net/wireless/intel/iwlwifi/fw/dbg.c

+20 −7

Original line number	Diff line number	Diff line
		@@ -1154,14 +1154,14 @@ int iwl_fw_start_dbg_conf(struct iwl_fw_runtime *fwrt, u8 conf_id)
		}
		IWL_EXPORT_SYMBOL(iwl_fw_start_dbg_conf);

		void iwl_fw_error_dump_wk(struct work_struct *work)
		/* this function assumes dump_start was called beforehand and dump_end will be
		* called afterwards
		*/
		void iwl_fw_dbg_collect_sync(struct iwl_fw_runtime *fwrt)
		{
		struct iwl_fw_runtime *fwrt =
		container_of(work, struct iwl_fw_runtime, dump.wk.work);
		struct iwl_fw_dbg_params params = {0};

		if (fwrt->ops && fwrt->ops->dump_start &&
		fwrt->ops->dump_start(fwrt->ops_ctx))
		if (!test_bit(IWL_FWRT_STATUS_DUMPING, &fwrt->status))
		return;

		if (fwrt->ops && fwrt->ops->fw_running &&
		@@ -1169,7 +1169,7 @@ void iwl_fw_error_dump_wk(struct work_struct *work)
		IWL_ERR(fwrt, "Firmware not running - cannot dump error\n");
		iwl_fw_free_dump_desc(fwrt);
		clear_bit(IWL_FWRT_STATUS_DUMPING, &fwrt->status);
		goto out;
		return;
		}

		iwl_fw_dbg_stop_recording(fwrt, &params);
		@@ -1183,7 +1183,20 @@ void iwl_fw_error_dump_wk(struct work_struct *work)
		udelay(500);
		iwl_fw_dbg_restart_recording(fwrt, &params);
		}
		out:
		}
		IWL_EXPORT_SYMBOL(iwl_fw_dbg_collect_sync);

		void iwl_fw_error_dump_wk(struct work_struct *work)
		{
		struct iwl_fw_runtime *fwrt =
		container_of(work, struct iwl_fw_runtime, dump.wk.work);

		if (fwrt->ops && fwrt->ops->dump_start &&
		fwrt->ops->dump_start(fwrt->ops_ctx))
		return;

		iwl_fw_dbg_collect_sync(fwrt);

		if (fwrt->ops && fwrt->ops->dump_end)
		fwrt->ops->dump_end(fwrt->ops_ctx);
		}

drivers/net/wireless/intel/iwlwifi/fw/dbg.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -367,4 +367,5 @@ static inline void iwl_fw_resume_timestamp(struct iwl_fw_runtime *fwrt) {}
		#endif /* CONFIG_IWLWIFI_DEBUGFS */

		void iwl_fw_alive_error_dump(struct iwl_fw_runtime *fwrt);
		void iwl_fw_dbg_collect_sync(struct iwl_fw_runtime *fwrt);
		#endif /* __iwl_fw_dbg_h__ */

drivers/net/wireless/intel/iwlwifi/iwl-devtrace-data.h

+6 −24

Original line number	Diff line number	Diff line
		@@ -30,37 +30,19 @@
		#undef TRACE_SYSTEM
		#define TRACE_SYSTEM iwlwifi_data

		TRACE_EVENT(iwlwifi_dev_tx_data,
		TP_PROTO(const struct device *dev,
		struct sk_buff *skb, u8 hdr_len),
		TP_ARGS(dev, skb, hdr_len),
		TRACE_EVENT(iwlwifi_dev_tx_tb,
		TP_PROTO(const struct device dev, struct sk_buff skb,
		u8 *data_src, size_t data_len),
		TP_ARGS(dev, skb, data_src, data_len),
		TP_STRUCT__entry(
		DEV_ENTRY

		__dynamic_array(u8, data,
		iwl_trace_data(skb) ? skb->len - hdr_len : 0)
		iwl_trace_data(skb) ? data_len : 0)
		),
		TP_fast_assign(
		DEV_ASSIGN;
		if (iwl_trace_data(skb))
		skb_copy_bits(skb, hdr_len,
		__get_dynamic_array(data),
		skb->len - hdr_len);
		),
		TP_printk("[%s] TX frame data", __get_str(dev))
		);

		TRACE_EVENT(iwlwifi_dev_tx_tso_chunk,
		TP_PROTO(const struct device *dev,
		u8 *data_src, size_t data_len),
		TP_ARGS(dev, data_src, data_len),
		TP_STRUCT__entry(
		DEV_ENTRY

		__dynamic_array(u8, data, data_len)
		),
		TP_fast_assign(
		DEV_ASSIGN;
		memcpy(__get_dynamic_array(data), data_src, data_len);
		),
		TP_printk("[%s] TX frame data", __get_str(dev))

drivers/net/wireless/intel/iwlwifi/mvm/d3.c

+38 −26

Original line number	Diff line number	Diff line
		@@ -722,8 +722,10 @@ int iwl_mvm_wowlan_config_key_params(struct iwl_mvm *mvm,
		{
		struct iwl_wowlan_kek_kck_material_cmd kek_kck_cmd = {};
		struct iwl_wowlan_tkip_params_cmd tkip_cmd = {};
		bool unified = fw_has_capa(&mvm->fw->ucode_capa,
		IWL_UCODE_TLV_CAPA_CNSLDTD_D3_D0_IMG);
		struct wowlan_key_data key_data = {
		.configure_keys = !d0i3,
		.configure_keys = !d0i3 && !unified,
		.use_rsc_tsc = false,
		.tkip = &tkip_cmd,
		.use_tkip = false,
		@@ -1636,32 +1638,10 @@ out_free_resp:
		}

		static struct iwl_wowlan_status *
		iwl_mvm_get_wakeup_status(struct iwl_mvm mvm, struct ieee80211_vif vif)
		iwl_mvm_get_wakeup_status(struct iwl_mvm *mvm)
		{
		u32 base = mvm->error_event_table[0];
		struct error_table_start {
		/* cf. struct iwl_error_event_table */
		u32 valid;
		u32 error_id;
		} err_info;
		int ret;

		iwl_trans_read_mem_bytes(mvm->trans, base,
		&err_info, sizeof(err_info));

		if (err_info.valid) {
		IWL_INFO(mvm, "error table is valid (%d) with error (%d)\n",
		err_info.valid, err_info.error_id);
		if (err_info.error_id == RF_KILL_INDICATOR_FOR_WOWLAN) {
		struct cfg80211_wowlan_wakeup wakeup = {
		.rfkill_release = true,
		};
		ieee80211_report_wowlan_wakeup(vif, &wakeup,
		GFP_KERNEL);
		}
		return ERR_PTR(-EIO);
		}

		/* only for tracing for now */
		ret = iwl_mvm_send_cmd_pdu(mvm, OFFLOADS_QUERY_CMD, 0, 0, NULL);
		if (ret)
		@@ -1680,7 +1660,7 @@ static bool iwl_mvm_query_wakeup_reasons(struct iwl_mvm *mvm,
		bool keep;
		struct iwl_mvm_sta *mvm_ap_sta;

		fw_status = iwl_mvm_get_wakeup_status(mvm, vif);
		fw_status = iwl_mvm_get_wakeup_status(mvm);
		if (IS_ERR_OR_NULL(fw_status))
		goto out_unlock;

		@@ -1805,7 +1785,7 @@ static void iwl_mvm_query_netdetect_reasons(struct iwl_mvm *mvm,
		u32 reasons = 0;
		int i, j, n_matches, ret;

		fw_status = iwl_mvm_get_wakeup_status(mvm, vif);
		fw_status = iwl_mvm_get_wakeup_status(mvm);
		if (!IS_ERR_OR_NULL(fw_status)) {
		reasons = le32_to_cpu(fw_status->wakeup_reasons);
		kfree(fw_status);
		@@ -1918,6 +1898,29 @@ static void iwl_mvm_d3_disconnect_iter(void data, u8 mac,
		ieee80211_resume_disconnect(vif);
		}

		static int iwl_mvm_check_rt_status(struct iwl_mvm *mvm,
		struct ieee80211_vif *vif)
		{
		u32 base = mvm->error_event_table[0];
		struct error_table_start {
		/* cf. struct iwl_error_event_table */
		u32 valid;
		u32 error_id;
		} err_info;

		iwl_trans_read_mem_bytes(mvm->trans, base,
		&err_info, sizeof(err_info));

		if (err_info.valid &&
		err_info.error_id == RF_KILL_INDICATOR_FOR_WOWLAN) {
		struct cfg80211_wowlan_wakeup wakeup = {
		.rfkill_release = true,
		};
		ieee80211_report_wowlan_wakeup(vif, &wakeup, GFP_KERNEL);
		}
		return err_info.valid;
		}

		static int __iwl_mvm_resume(struct iwl_mvm *mvm, bool test)
		{
		struct ieee80211_vif *vif = NULL;
		@@ -1949,6 +1952,15 @@ static int __iwl_mvm_resume(struct iwl_mvm *mvm, bool test)
		/* query SRAM first in case we want event logging */
		iwl_mvm_read_d3_sram(mvm);

		if (iwl_mvm_check_rt_status(mvm, vif)) {
		set_bit(STATUS_FW_ERROR, &mvm->trans->status);
		iwl_mvm_dump_nic_error_log(mvm);
		iwl_fw_dbg_collect_desc(&mvm->fwrt, &iwl_dump_desc_assert,
		NULL, 0);
		ret = 1;
		goto err;
		}

		if (d0i3_first) {
		ret = iwl_mvm_send_cmd_pdu(mvm, D0I3_END_CMD, 0, 0, NULL);
		if (ret < 0) {

drivers/net/wireless/intel/iwlwifi/mvm/fw.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -364,7 +364,14 @@ static int iwl_mvm_load_ucode_wait_alive(struct iwl_mvm *mvm,
		*/

		memset(&mvm->queue_info, 0, sizeof(mvm->queue_info));
		mvm->queue_info[IWL_MVM_DQA_CMD_QUEUE].hw_queue_refcount = 1;
		/*
		* Set a 'fake' TID for the command queue, since we use the
		* hweight() of the tid_bitmap as a refcount now. Not that
		* we ever even consider the command queue as one we might
		* want to reuse, but be safe nevertheless.
		*/
		mvm->queue_info[IWL_MVM_DQA_CMD_QUEUE].tid_bitmap =
		BIT(IWL_MAX_TID_COUNT + 2);

		for (i = 0; i < IEEE80211_MAX_QUEUES; i++)
		atomic_set(&mvm->mac80211_queue_stop_count[i], 0);

Admin message