Merge tag 'iwlwifi-next-for-kalle-2015-10-25' of... (b3bcb1b2) · Commits · 戴 / test

drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h

+16 −0

Original line number	Diff line number	Diff line
		@@ -86,6 +86,8 @@
		* Structured as &struct iwl_fw_error_dump_trigger_desc.
		* @IWL_FW_ERROR_DUMP_RB: the content of an RB structured as
		* &struct iwl_fw_error_dump_rb
		* @IWL_FW_ERROR_PAGING: UMAC's image memory segments which were
		* paged to the DRAM.
		*/
		enum iwl_fw_error_dump_type {
		/* 0 is deprecated */
		@@ -100,6 +102,7 @@ enum iwl_fw_error_dump_type {
		IWL_FW_ERROR_DUMP_MEM = 9,
		IWL_FW_ERROR_DUMP_ERROR_INFO = 10,
		IWL_FW_ERROR_DUMP_RB = 11,
		IWL_FW_ERROR_DUMP_PAGING = 12,

		IWL_FW_ERROR_DUMP_MAX,
		};
		@@ -239,6 +242,19 @@ struct iwl_fw_error_dump_rb {
		u8 data[];
		};

		/**
		* struct iwl_fw_error_dump_paging - content of the UMAC's image page
		* block on DRAM
		* @index: the index of the page block
		* @reserved:
		* @data: the content of the page block
		*/
		struct iwl_fw_error_dump_paging {
		__le32 index;
		__le32 reserved;
		u8 data[];
		};

		/**
		* iwl_fw_error_next_data - advance fw error dump data pointer
		* @data: previous data block

+4 −0

Original line number	Diff line number	Diff line
		@@ -306,6 +306,8 @@ typedef unsigned int __bitwise__ iwl_ucode_tlv_capa_t;
		* is supported.
		* @IWL_UCODE_TLV_CAPA_BT_COEX_RRC: supports BT Coex RRC
		* @IWL_UCODE_TLV_CAPA_GSCAN_SUPPORT: supports gscan
		* @IWL_UCODE_TLV_CAPA_EXTENDED_DTS_MEASURE: extended DTS measurement
		* @IWL_UCODE_TLV_CAPA_SHORT_PM_TIMEOUTS: supports short PM timeouts
		*
		* @NUM_IWL_UCODE_TLV_CAPA: number of bits used
		*/
		@@ -330,6 +332,8 @@ enum iwl_ucode_tlv_capa {
		IWL_UCODE_TLV_CAPA_LAR_MULTI_MCC = (__force iwl_ucode_tlv_capa_t)29,
		IWL_UCODE_TLV_CAPA_BT_COEX_RRC = (__force iwl_ucode_tlv_capa_t)30,
		IWL_UCODE_TLV_CAPA_GSCAN_SUPPORT = (__force iwl_ucode_tlv_capa_t)31,
		IWL_UCODE_TLV_CAPA_EXTENDED_DTS_MEASURE = (__force iwl_ucode_tlv_capa_t)64,
		IWL_UCODE_TLV_CAPA_SHORT_PM_TIMEOUTS = (__force iwl_ucode_tlv_capa_t)65,

		NUM_IWL_UCODE_TLV_CAPA
		#ifdef __CHECKER__

+2 −0

Original line number	Diff line number	Diff line
		@@ -409,6 +409,7 @@ enum iwl_d3_status {
		* @STATUS_TRANS_GOING_IDLE: shutting down the trans, only special commands
		* are sent
		* @STATUS_TRANS_IDLE: the trans is idle - general commands are not to be sent
		* @STATUS_TRANS_DEAD: trans is dead - avoid any read/write operation
		*/
		enum iwl_trans_status {
		STATUS_SYNC_HCMD_ACTIVE,
		@@ -419,6 +420,7 @@ enum iwl_trans_status {
		STATUS_FW_ERROR,
		STATUS_TRANS_GOING_IDLE,
		STATUS_TRANS_IDLE,
		STATUS_TRANS_DEAD,
		};

		/**

+3 −1

Original line number	Diff line number	Diff line
		@@ -71,6 +71,9 @@
		#define IWL_MVM_DEFAULT_PS_RX_DATA_TIMEOUT (100 * USEC_PER_MSEC)
		#define IWL_MVM_WOWLAN_PS_TX_DATA_TIMEOUT (10 * USEC_PER_MSEC)
		#define IWL_MVM_WOWLAN_PS_RX_DATA_TIMEOUT (10 * USEC_PER_MSEC)
		#define IWL_MVM_SHORT_PS_TX_DATA_TIMEOUT (2 * 1024) /* defined in TU */
		#define IWL_MVM_SHORT_PS_RX_DATA_TIMEOUT (40 * 1024) /* defined in TU */
		#define IWL_MVM_P2P_LOWLATENCY_PS_ENABLE 0
		#define IWL_MVM_UAPSD_RX_DATA_TIMEOUT (50 * USEC_PER_MSEC)
		#define IWL_MVM_UAPSD_TX_DATA_TIMEOUT (50 * USEC_PER_MSEC)
		#define IWL_MVM_UAPSD_QUEUES (IEEE80211_WMM_IE_STA_QOSINFO_AC_VO \|\
		@@ -101,7 +104,6 @@
		#define IWL_MVM_FW_BCAST_FILTER_PASS_ALL 0
		#define IWL_MVM_QUOTA_THRESHOLD 4
		#define IWL_MVM_RS_RSSI_BASED_INIT_RATE 0
		#define IWL_MVM_RS_DISABLE_P2P_MIMO 0
		#define IWL_MVM_RS_80_20_FAR_RANGE_TWEAK 1
		#define IWL_MVM_TOF_IS_RESPONDER 0
		#define IWL_MVM_RS_NUM_TRY_BEFORE_ANT_TOGGLE 1

+22 −3

Original line number	Diff line number	Diff line
		@@ -715,11 +715,30 @@ static ssize_t iwl_dbgfs_tof_responder_params_write(struct ieee80211_vif *vif,
		goto out;
		}

		data = iwl_dbgfs_is_match("ctrl_ch_position=", buf);
		data = iwl_dbgfs_is_match("center_freq=", buf);
		if (data) {
		struct iwl_tof_responder_config_cmd *cmd =
		&mvm->tof_data.responder_cfg;

		ret = kstrtou32(data, 10, &value);
		if (ret == 0)
		mvm->tof_data.responder_cfg.ctrl_ch_position = value;
		if (ret == 0 && value) {
		enum ieee80211_band band = (cmd->channel_num <= 14) ?
		IEEE80211_BAND_2GHZ :
		IEEE80211_BAND_5GHZ;
		struct ieee80211_channel chn = {
		.band = band,
		.center_freq = ieee80211_channel_to_frequency(
		cmd->channel_num, band),
		};
		struct cfg80211_chan_def chandef = {
		.chan = &chn,
		.center_freq1 =
		ieee80211_channel_to_frequency(value,
		band),
		};

		cmd->ctrl_ch_position = iwl_mvm_get_ctrl_pos(&chandef);
		}
		goto out;
		}