Merge tag 'iwlwifi-next-for-kalle-2016-10-25-2' of... (3f8247c8) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -293,6 +293,7 @@ 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_STA_PM_NOTIF: firmware will send STA PM notification
		* @IWL_UCODE_TLV_CAPA_EXTENDED_DTS_MEASURE: extended DTS measurement
		* @IWL_UCODE_TLV_CAPA_SHORT_PM_TIMEOUTS: supports short PM timeouts
		* @IWL_UCODE_TLV_CAPA_BT_MPLUT_SUPPORT: supports bt-coex Multi-priority LUT
		@@ -342,6 +343,7 @@ 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_STA_PM_NOTIF = (__force iwl_ucode_tlv_capa_t)38,
		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,
		IWL_UCODE_TLV_CAPA_BT_MPLUT_SUPPORT = (__force iwl_ucode_tlv_capa_t)67,

drivers/net/wireless/intel/iwlwifi/mvm/fw-api-rx.h

+26 −0

Original line number	Diff line number	Diff line
		@@ -474,4 +474,30 @@ struct iwl_mvm_internal_rxq_notif {
		u8 data[];
		} __packed;

		/**
		* enum iwl_mvm_pm_event - type of station PM event
		* @IWL_MVM_PM_EVENT_AWAKE: station woke up
		* @IWL_MVM_PM_EVENT_ASLEEP: station went to sleep
		* @IWL_MVM_PM_EVENT_UAPSD: station sent uAPSD trigger
		* @IWL_MVM_PM_EVENT_PS_POLL: station sent PS-Poll
		*/
		enum iwl_mvm_pm_event {
		IWL_MVM_PM_EVENT_AWAKE,
		IWL_MVM_PM_EVENT_ASLEEP,
		IWL_MVM_PM_EVENT_UAPSD,
		IWL_MVM_PM_EVENT_PS_POLL,
		}; /* PEER_PM_NTFY_API_E_VER_1 */

		/**
		* struct iwl_mvm_pm_state_notification - station PM state notification
		* @sta_id: station ID of the station changing state
		* @type: the new powersave state, see IWL_MVM_PM_EVENT_ above
		*/
		struct iwl_mvm_pm_state_notification {
		u8 sta_id;
		u8 type;
		/* private: */
		u16 reserved;
		} __packed; /* PEER_PM_NTFY_API_S_VER_1 */

		#endif /* __fw_api_rx_h__ */

drivers/net/wireless/intel/iwlwifi/mvm/fw-api-sta.h

+6 −3

Original line number	Diff line number	Diff line
		@@ -179,7 +179,7 @@ enum iwl_sta_key_flag {
		* enum iwl_sta_modify_flag - indicate to the fw what flag are being changed
		* @STA_MODIFY_QUEUE_REMOVAL: this command removes a queue
		* @STA_MODIFY_TID_DISABLE_TX: this command modifies %tid_disable_tx
		* @STA_MODIFY_TX_RATE: unused
		* @STA_MODIFY_UAPSD_ACS: this command modifies %uapsd_trigger_acs
		* @STA_MODIFY_ADD_BA_TID: this command modifies %add_immediate_ba_tid
		* @STA_MODIFY_REMOVE_BA_TID: this command modifies %remove_immediate_ba_tid
		* @STA_MODIFY_SLEEPING_STA_TX_COUNT: this command modifies %sleep_tx_count
		@@ -189,7 +189,7 @@ enum iwl_sta_key_flag {
		enum iwl_sta_modify_flag {
		STA_MODIFY_QUEUE_REMOVAL = BIT(0),
		STA_MODIFY_TID_DISABLE_TX = BIT(1),
		STA_MODIFY_TX_RATE = BIT(2),
		STA_MODIFY_UAPSD_ACS = BIT(2),
		STA_MODIFY_ADD_BA_TID = BIT(3),
		STA_MODIFY_REMOVE_BA_TID = BIT(4),
		STA_MODIFY_SLEEPING_STA_TX_COUNT = BIT(5),
		@@ -353,6 +353,8 @@ struct iwl_mvm_add_sta_cmd_v7 {
		* @beamform_flags: beam forming controls
		* @tfd_queue_msk: tfd queues used by this station
		* @rx_ba_window: aggregation window size
		* @scd_queue_bank: queue bank in used. Each bank contains 32 queues. 0 means
		* that the queues used by this station are in the first 32.
		*
		* The device contains an internal table of per-station information, with info
		* on security keys, aggregation parameters, and Tx rates for initial Tx
		@@ -382,7 +384,8 @@ struct iwl_mvm_add_sta_cmd {
		__le16 beamform_flags;
		__le32 tfd_queue_msk;
		__le16 rx_ba_window;
		__le16 reserved;
		u8 scd_queue_bank;
		u8 uapsd_trigger_acs;
		} __packed; /* ADD_STA_CMD_API_S_VER_8 */

		/**

drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -332,6 +332,7 @@ enum iwl_data_path_subcmd_ids {
		DQA_ENABLE_CMD = 0x0,
		UPDATE_MU_GROUPS_CMD = 0x1,
		TRIGGER_RX_QUEUES_NOTIF_CMD = 0x2,
		STA_PM_NOTIF = 0xFD,
		MU_GROUP_MGMT_NOTIF = 0xFE,
		RX_QUEUES_NOTIFICATION = 0xFF,
		};

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

+55 −45

Original line number	Diff line number	Diff line
		@@ -70,49 +70,6 @@
		#include "iwl-prph.h"
		#include "iwl-csr.h"

		static ssize_t iwl_mvm_read_coredump(char *buffer, loff_t offset, size_t count,
		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(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);
		}

		#define RADIO_REG_MAX_READ 0x2ad
		static void iwl_mvm_read_radio_reg(struct iwl_mvm *mvm,
		struct iwl_fw_error_dump_data **dump_data)
		@@ -491,6 +448,43 @@ static u32 iwl_dump_prph(struct iwl_trans *trans,
		return prph_len;
		}

		/*
		* alloc_sgtable - allocates scallerlist table in the given size,
		* fills it with pages and returns it
		* @size: the size (in bytes) of the table
		*/
		static struct scatterlist *alloc_sgtable(int size)
		{
		int alloc_size, nents, i;
		struct page *new_page;
		struct scatterlist *iter;
		struct scatterlist *table;

		nents = DIV_ROUND_UP(size, PAGE_SIZE);
		table = kcalloc(nents, sizeof(*table), GFP_KERNEL);
		if (!table)
		return NULL;
		sg_init_table(table, nents);
		iter = table;
		for_each_sg(table, iter, sg_nents(table), i) {
		new_page = alloc_page(GFP_KERNEL);
		if (!new_page) {
		/* release all previous allocated pages in the table */
		iter = table;
		for_each_sg(table, iter, sg_nents(table), i) {
		new_page = sg_page(iter);
		if (new_page)
		__free_page(new_page);
		}
		return NULL;
		}
		alloc_size = min_t(int, size, PAGE_SIZE);
		size -= PAGE_SIZE;
		sg_set_page(iter, new_page, alloc_size, 0);
		}
		return table;
		}

		void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm)
		{
		struct iwl_fw_error_dump_file *dump_file;
		@@ -499,6 +493,7 @@ void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm)
		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;
		struct scatterlist *sg_dump_data;
		u32 sram_len, sram_ofs;
		struct iwl_fw_dbg_mem_seg_tlv * const *fw_dbg_mem =
		mvm->fw->dbg_mem_tlv;
		@@ -815,8 +810,23 @@ void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm)
		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);
		sg_dump_data = alloc_sgtable(file_len);
		if (sg_dump_data) {
		sg_pcopy_from_buffer(sg_dump_data,
		sg_nents(sg_dump_data),
		fw_error_dump->op_mode_ptr,
		fw_error_dump->op_mode_len, 0);
		sg_pcopy_from_buffer(sg_dump_data,
		sg_nents(sg_dump_data),
		fw_error_dump->trans_ptr->data,
		fw_error_dump->trans_ptr->len,
		fw_error_dump->op_mode_len);
		dev_coredumpsg(mvm->trans->dev, sg_dump_data, file_len,
		GFP_KERNEL);
		}
		vfree(fw_error_dump->op_mode_ptr);
		vfree(fw_error_dump->trans_ptr);
		kfree(fw_error_dump);

		out:
		iwl_mvm_free_fw_dump_desc(mvm);