Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 041b499b authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes

parents d5aedd7e 3c5da7ee

drivers/net/wireless/iwlwifi/iwl-7000.c

+27 −2
Original line number Diff line number Diff line
@@ -67,8 +67,8 @@ 
#include "iwl-agn-hw.h"



/* Highest firmware API version supported */

#define IWL7260_UCODE_API_MAX	7

#define IWL3160_UCODE_API_MAX	7

#define IWL7260_UCODE_API_MAX	8

#define IWL3160_UCODE_API_MAX	8



/* Oldest version we won't warn about */

#define IWL7260_UCODE_API_OK	7
@@ -130,6 +130,7 @@ const struct iwl_cfg iwl7260_2ac_cfg = { 
	.ht_params = &iwl7000_ht_params,

	.nvm_ver = IWL7260_NVM_VERSION,

	.nvm_calib_ver = IWL7260_TX_POWER_VERSION,

	.host_interrupt_operation_mode = true,

};



const struct iwl_cfg iwl7260_2ac_cfg_high_temp = {
@@ -140,6 +141,7 @@ const struct iwl_cfg iwl7260_2ac_cfg_high_temp = { 
	.nvm_ver = IWL7260_NVM_VERSION,

	.nvm_calib_ver = IWL7260_TX_POWER_VERSION,

	.high_temp = true,

	.host_interrupt_operation_mode = true,

};



const struct iwl_cfg iwl7260_2n_cfg = {
@@ -149,6 +151,7 @@ const struct iwl_cfg iwl7260_2n_cfg = { 
	.ht_params = &iwl7000_ht_params,

	.nvm_ver = IWL7260_NVM_VERSION,

	.nvm_calib_ver = IWL7260_TX_POWER_VERSION,

	.host_interrupt_operation_mode = true,

};



const struct iwl_cfg iwl7260_n_cfg = {
@@ -158,6 +161,7 @@ const struct iwl_cfg iwl7260_n_cfg = { 
	.ht_params = &iwl7000_ht_params,

	.nvm_ver = IWL7260_NVM_VERSION,

	.nvm_calib_ver = IWL7260_TX_POWER_VERSION,

	.host_interrupt_operation_mode = true,

};



const struct iwl_cfg iwl3160_2ac_cfg = {
@@ -167,6 +171,7 @@ const struct iwl_cfg iwl3160_2ac_cfg = { 
	.ht_params = &iwl7000_ht_params,

	.nvm_ver = IWL3160_NVM_VERSION,

	.nvm_calib_ver = IWL3160_TX_POWER_VERSION,

	.host_interrupt_operation_mode = true,

};



const struct iwl_cfg iwl3160_2n_cfg = {
@@ -176,6 +181,7 @@ const struct iwl_cfg iwl3160_2n_cfg = { 
	.ht_params = &iwl7000_ht_params,

	.nvm_ver = IWL3160_NVM_VERSION,

	.nvm_calib_ver = IWL3160_TX_POWER_VERSION,

	.host_interrupt_operation_mode = true,

};



const struct iwl_cfg iwl3160_n_cfg = {
@@ -185,6 +191,7 @@ const struct iwl_cfg iwl3160_n_cfg = { 
	.ht_params = &iwl7000_ht_params,

	.nvm_ver = IWL3160_NVM_VERSION,

	.nvm_calib_ver = IWL3160_TX_POWER_VERSION,

	.host_interrupt_operation_mode = true,

};



const struct iwl_cfg iwl7265_2ac_cfg = {
@@ -196,5 +203,23 @@ const struct iwl_cfg iwl7265_2ac_cfg = { 
	.nvm_calib_ver = IWL7265_TX_POWER_VERSION,

};



const struct iwl_cfg iwl7265_2n_cfg = {

	.name = "Intel(R) Dual Band Wireless N 7265",

	.fw_name_pre = IWL7265_FW_PRE,

	IWL_DEVICE_7000,

	.ht_params = &iwl7000_ht_params,

	.nvm_ver = IWL7265_NVM_VERSION,

	.nvm_calib_ver = IWL7265_TX_POWER_VERSION,

};



const struct iwl_cfg iwl7265_n_cfg = {

	.name = "Intel(R) Wireless N 7265",

	.fw_name_pre = IWL7265_FW_PRE,

	IWL_DEVICE_7000,

	.ht_params = &iwl7000_ht_params,

	.nvm_ver = IWL7265_NVM_VERSION,

	.nvm_calib_ver = IWL7265_TX_POWER_VERSION,

};



MODULE_FIRMWARE(IWL7260_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));

MODULE_FIRMWARE(IWL3160_MODULE_FIRMWARE(IWL3160_UCODE_API_OK));

drivers/net/wireless/iwlwifi/iwl-config.h

+5 −0
Original line number Diff line number Diff line
@@ -207,6 +207,8 @@ struct iwl_eeprom_params { 
 * @rx_with_siso_diversity: 1x1 device with rx antenna diversity

 * @internal_wimax_coex: internal wifi/wimax combo device

 * @high_temp: Is this NIC is designated to be in high temperature.

 * @host_interrupt_operation_mode: device needs host interrupt operation

 *	mode set

 *

 * We enable the driver to be backward compatible wrt. hardware features.

 * API differences in uCode shouldn't be handled here but through TLVs
@@ -235,6 +237,7 @@ struct iwl_cfg { 
	enum iwl_led_mode led_mode;

	const bool rx_with_siso_diversity;

	const bool internal_wimax_coex;

	const bool host_interrupt_operation_mode;

	bool high_temp;

};
@@ -294,6 +297,8 @@ extern const struct iwl_cfg iwl3160_2ac_cfg; 
extern const struct iwl_cfg iwl3160_2n_cfg;

extern const struct iwl_cfg iwl3160_n_cfg;

extern const struct iwl_cfg iwl7265_2ac_cfg;

extern const struct iwl_cfg iwl7265_2n_cfg;

extern const struct iwl_cfg iwl7265_n_cfg;

#endif /* CONFIG_IWLMVM */



#endif /* __IWL_CONFIG_H__ */

drivers/net/wireless/iwlwifi/iwl-csr.h

+1 −4
Original line number Diff line number Diff line
@@ -495,14 +495,11 @@ enum secure_load_status_reg { 
 * the CSR_INT_COALESCING is an 8 bit register in 32-usec unit

 *

 * default interrupt coalescing timer is 64 x 32 = 2048 usecs

 * default interrupt coalescing calibration timer is 16 x 32 = 512 usecs

 */

#define IWL_HOST_INT_TIMEOUT_MAX	(0xFF)

#define IWL_HOST_INT_TIMEOUT_DEF	(0x40)

#define IWL_HOST_INT_TIMEOUT_MIN	(0x0)

#define IWL_HOST_INT_CALIB_TIMEOUT_MAX	(0xFF)

#define IWL_HOST_INT_CALIB_TIMEOUT_DEF	(0x10)

#define IWL_HOST_INT_CALIB_TIMEOUT_MIN	(0x0)

#define IWL_HOST_INT_OPER_MODE		BIT(31)



/*****************************************************************************

 *                        7000/3000 series SHR DTS addresses                 *

drivers/net/wireless/iwlwifi/mvm/bt-coex.c

+5 −1
Original line number Diff line number Diff line
@@ -391,7 +391,6 @@ int iwl_send_bt_init_conf(struct iwl_mvm *mvm) 
					    BT_VALID_LUT |

					    BT_VALID_WIFI_RX_SW_PRIO_BOOST |

					    BT_VALID_WIFI_TX_SW_PRIO_BOOST |

					    BT_VALID_MULTI_PRIO_LUT |

					    BT_VALID_CORUN_LUT_20 |

					    BT_VALID_CORUN_LUT_40 |

					    BT_VALID_ANT_ISOLATION |
@@ -842,6 +841,11 @@ static void iwl_mvm_bt_rssi_iterator(void *_data, u8 *mac, 


	sta = rcu_dereference_protected(mvm->fw_id_to_mac_id[mvmvif->ap_sta_id],

					lockdep_is_held(&mvm->mutex));



	/* This can happen if the station has been removed right now */

	if (IS_ERR_OR_NULL(sta))

		return;



	mvmsta = (void *)sta->drv_priv;



	data->num_bss_ifaces++;

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

+3 −2
Original line number Diff line number Diff line
@@ -895,7 +895,7 @@ static int iwl_mvm_get_last_nonqos_seq(struct iwl_mvm *mvm, 
		/* new API returns next, not last-used seqno */

		if (mvm->fw->ucode_capa.flags &

				IWL_UCODE_TLV_FLAGS_D3_CONTINUITY_API)

			err -= 0x10;

			err = (u16) (err - 0x10);

	}



	iwl_free_resp(&cmd);
@@ -1549,7 +1549,7 @@ static bool iwl_mvm_setup_connection_keep(struct iwl_mvm *mvm, 
	if (gtkdata.unhandled_cipher)

		return false;

	if (!gtkdata.num_keys)

		return true;

		goto out;

	if (!gtkdata.last_gtk)

		return false;
@@ -1600,6 +1600,7 @@ static bool iwl_mvm_setup_connection_keep(struct iwl_mvm *mvm, 
					   (void *)&replay_ctr, GFP_KERNEL);

	}



out:

	mvmvif->seqno_valid = true;

	/* +0x10 because the set API expects next-to-use, not last-used */

	mvmvif->seqno = le16_to_cpu(status->non_qos_seq_ctr) + 0x10;