Commit 1e2dce98 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-for-kalle-2018-03-16' of... 

Merge tag 'iwlwifi-for-kalle-2018-03-16' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes

Third batch of iwlwifi fixes intended for 4.16:

* Fix an issue with the multicast queue;
* Fix IGTK handling;
* Fix some missing return value checks;
* Add support for a HW workaround for issues on some platforms;
parents 87de1201 86a2b204

drivers/net/wireless/intel/iwlwifi/cfg/9000.c

+62 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
#include <linux/stringify.h>

#include "iwl-config.h"

#include "iwl-agn-hw.h"

#include "fw/file.h"



/* Highest firmware API version supported */

#define IWL9000_UCODE_API_MAX	36
@@ -265,6 +266,67 @@ const struct iwl_cfg iwl9560_2ac_cfg_soc = { 
	.integrated = true,

	.soc_latency = 5000,

};



const struct iwl_cfg iwl9460_2ac_cfg_shared_clk = {

	.name = "Intel(R) Dual Band Wireless AC 9460",

	.fw_name_pre = IWL9000A_FW_PRE,

	.fw_name_pre_b_or_c_step = IWL9000B_FW_PRE,

	.fw_name_pre_rf_next_step = IWL9000RFB_FW_PRE,

	IWL_DEVICE_9000,

	.ht_params = &iwl9000_ht_params,

	.nvm_ver = IWL9000_NVM_VERSION,

	.nvm_calib_ver = IWL9000_TX_POWER_VERSION,

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,

	.integrated = true,

	.soc_latency = 5000,

	.extra_phy_cfg_flags = FW_PHY_CFG_SHARED_CLK

};



const struct iwl_cfg iwl9461_2ac_cfg_shared_clk = {

	.name = "Intel(R) Dual Band Wireless AC 9461",

	.fw_name_pre = IWL9000A_FW_PRE,

	.fw_name_pre_b_or_c_step = IWL9000B_FW_PRE,

	.fw_name_pre_rf_next_step = IWL9000RFB_FW_PRE,

	IWL_DEVICE_9000,

	.ht_params = &iwl9000_ht_params,

	.nvm_ver = IWL9000_NVM_VERSION,

	.nvm_calib_ver = IWL9000_TX_POWER_VERSION,

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,

	.integrated = true,

	.soc_latency = 5000,

	.extra_phy_cfg_flags = FW_PHY_CFG_SHARED_CLK

};



const struct iwl_cfg iwl9462_2ac_cfg_shared_clk = {

	.name = "Intel(R) Dual Band Wireless AC 9462",

	.fw_name_pre = IWL9000A_FW_PRE,

	.fw_name_pre_b_or_c_step = IWL9000B_FW_PRE,

	.fw_name_pre_rf_next_step = IWL9000RFB_FW_PRE,

	IWL_DEVICE_9000,

	.ht_params = &iwl9000_ht_params,

	.nvm_ver = IWL9000_NVM_VERSION,

	.nvm_calib_ver = IWL9000_TX_POWER_VERSION,

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,

	.integrated = true,

	.soc_latency = 5000,

	.extra_phy_cfg_flags = FW_PHY_CFG_SHARED_CLK

};



const struct iwl_cfg iwl9560_2ac_cfg_shared_clk = {

	.name = "Intel(R) Dual Band Wireless AC 9560",

	.fw_name_pre = IWL9000A_FW_PRE,

	.fw_name_pre_b_or_c_step = IWL9000B_FW_PRE,

	.fw_name_pre_rf_next_step = IWL9000RFB_FW_PRE,

	IWL_DEVICE_9000,

	.ht_params = &iwl9000_ht_params,

	.nvm_ver = IWL9000_NVM_VERSION,

	.nvm_calib_ver = IWL9000_TX_POWER_VERSION,

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,

	.integrated = true,

	.soc_latency = 5000,

	.extra_phy_cfg_flags = FW_PHY_CFG_SHARED_CLK

};



MODULE_FIRMWARE(IWL9000A_MODULE_FIRMWARE(IWL9000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL9000B_MODULE_FIRMWARE(IWL9000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL9000RFB_MODULE_FIRMWARE(IWL9000_UCODE_API_MAX));

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

+1 −0
Original line number Diff line number Diff line
@@ -441,6 +441,7 @@ enum iwl_fw_phy_cfg { 
	FW_PHY_CFG_TX_CHAIN = 0xf << FW_PHY_CFG_TX_CHAIN_POS,

	FW_PHY_CFG_RX_CHAIN_POS = 20,

	FW_PHY_CFG_RX_CHAIN = 0xf << FW_PHY_CFG_RX_CHAIN_POS,

	FW_PHY_CFG_SHARED_CLK = BIT(31),

};



#define IWL_UCODE_MAX_CS		1

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

+5 −0
Original line number Diff line number Diff line
@@ -398,6 +398,7 @@ struct iwl_cfg { 
	u8 ucode_api_max;

	u8 ucode_api_min;

	u32 min_umac_error_event_table;

	u32 extra_phy_cfg_flags;

};



/*
@@ -477,6 +478,10 @@ extern const struct iwl_cfg iwl9460_2ac_cfg_soc; 
extern const struct iwl_cfg iwl9461_2ac_cfg_soc;

extern const struct iwl_cfg iwl9462_2ac_cfg_soc;

extern const struct iwl_cfg iwl9560_2ac_cfg_soc;

extern const struct iwl_cfg iwl9460_2ac_cfg_shared_clk;

extern const struct iwl_cfg iwl9461_2ac_cfg_shared_clk;

extern const struct iwl_cfg iwl9462_2ac_cfg_shared_clk;

extern const struct iwl_cfg iwl9560_2ac_cfg_shared_clk;

extern const struct iwl_cfg iwl22000_2ac_cfg_hr;

extern const struct iwl_cfg iwl22000_2ac_cfg_hr_cdb;

extern const struct iwl_cfg iwl22000_2ac_cfg_jf;

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

+4 −0
Original line number Diff line number Diff line
@@ -433,6 +433,10 @@ static int iwl_send_phy_cfg_cmd(struct iwl_mvm *mvm) 


	/* Set parameters */

	phy_cfg_cmd.phy_cfg = cpu_to_le32(iwl_mvm_get_phy_config(mvm));



	/* set flags extra PHY configuration flags from the device's cfg */

	phy_cfg_cmd.phy_cfg |= cpu_to_le32(mvm->cfg->extra_phy_cfg_flags);



	phy_cfg_cmd.calib_control.event_trigger =

		mvm->fw->default_calib[ucode_type].event_trigger;

	phy_cfg_cmd.calib_control.flow_trigger =

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

+2 −2
Original line number Diff line number Diff line
@@ -2132,10 +2132,10 @@ static int iwl_mvm_start_ap_ibss(struct ieee80211_hw *hw, 
		 * Send the bcast station. At this stage the TBTT and DTIM time

		 * events are added and applied to the scheduler

		 */

		iwl_mvm_send_add_bcast_sta(mvm, vif);

		ret = iwl_mvm_send_add_bcast_sta(mvm, vif);

		if (ret)

			goto out_unbind;

		iwl_mvm_add_mcast_sta(mvm, vif);

		ret = iwl_mvm_add_mcast_sta(mvm, vif);

		if (ret) {

			iwl_mvm_send_rm_bcast_sta(mvm, vif);

			goto out_unbind;

CRA Git | Maintained and supported by SUSTech CRA and CCSE