Commit 832bc250 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-for-kalle-2019-04-03' of... 

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

Second batch of iwlwifi fixes intended for v5.1

* fix for a potential deadlock in the TX path;
* a fix for offloaded rate-control;
* support new PCI HW IDs which use a new FW;
parents bafdf85d debec2f2

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

+16 −2
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ 
#define IWL_22000_HR_A0_FW_PRE		"iwlwifi-QuQnj-a0-hr-a0-"

#define IWL_22000_SU_Z0_FW_PRE		"iwlwifi-su-z0-"

#define IWL_QU_B_JF_B_FW_PRE		"iwlwifi-Qu-b0-jf-b0-"

#define IWL_QUZ_A_HR_B_FW_PRE		"iwlwifi-QuZ-a0-hr-b0-"

#define IWL_QNJ_B_JF_B_FW_PRE		"iwlwifi-QuQnj-b0-jf-b0-"

#define IWL_CC_A_FW_PRE			"iwlwifi-cc-a0-"

#define IWL_22000_SO_A_JF_B_FW_PRE	"iwlwifi-so-a0-jf-b0-"
@@ -105,8 +106,8 @@ 
	IWL_22000_HR_A0_FW_PRE __stringify(api) ".ucode"

#define IWL_22000_SU_Z0_MODULE_FIRMWARE(api) \

	IWL_22000_SU_Z0_FW_PRE __stringify(api) ".ucode"

#define IWL_QU_B_JF_B_MODULE_FIRMWARE(api) \

	IWL_QU_B_JF_B_FW_PRE __stringify(api) ".ucode"

#define IWL_QUZ_A_HR_B_MODULE_FIRMWARE(api) \

	IWL_QUZ_A_HR_B_FW_PRE __stringify(api) ".ucode"

#define IWL_QU_B_JF_B_MODULE_FIRMWARE(api) \

	IWL_QU_B_JF_B_FW_PRE __stringify(api) ".ucode"

#define IWL_QNJ_B_JF_B_MODULE_FIRMWARE(api)		\
@@ -235,6 +236,18 @@ const struct iwl_cfg iwl_ax101_cfg_qu_hr = { 
	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

};



const struct iwl_cfg iwl_ax101_cfg_quz_hr = {

	.name = "Intel(R) Wi-Fi 6 AX101",

	.fw_name_pre = IWL_QUZ_A_HR_B_FW_PRE,

	IWL_DEVICE_22500,

	/*

	 * This device doesn't support receiving BlockAck with a large bitmap

	 * so we need to restrict the size of transmitted aggregation to the

	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

};



const struct iwl_cfg iwl_ax200_cfg_cc = {

	.name = "Intel(R) Wi-Fi 6 AX200 160MHz",

	.fw_name_pre = IWL_CC_A_FW_PRE,
@@ -444,6 +457,7 @@ MODULE_FIRMWARE(IWL_22000_HR_B_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); 
MODULE_FIRMWARE(IWL_22000_HR_A0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_SU_Z0_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_QU_B_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_QUZ_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_QNJ_B_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_CC_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_SO_A_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

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

+1 −0
Original line number Diff line number Diff line
@@ -549,6 +549,7 @@ 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;

extern const struct iwl_cfg iwl_ax101_cfg_qu_hr;

extern const struct iwl_cfg iwl_ax101_cfg_quz_hr;

extern const struct iwl_cfg iwl22000_2ax_cfg_hr;

extern const struct iwl_cfg iwl_ax200_cfg_cc;

extern const struct iwl_cfg killer1650s_2ax_cfg_qu_b0_hr_b0;

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

+1 −0
Original line number Diff line number Diff line
@@ -327,6 +327,7 @@ enum { 
#define CSR_HW_REV_TYPE_NONE		(0x00001F0)

#define CSR_HW_REV_TYPE_QNJ		(0x0000360)

#define CSR_HW_REV_TYPE_QNJ_B0		(0x0000364)

#define CSR_HW_REV_TYPE_QUZ		(0x0000354)

#define CSR_HW_REV_TYPE_HR_CDB		(0x0000340)

#define CSR_HW_REV_TYPE_SO		(0x0000370)

#define CSR_HW_REV_TYPE_TY		(0x0000420)

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

+7 −0
Original line number Diff line number Diff line
@@ -3258,6 +3258,13 @@ static void iwl_mvm_sta_rc_update(struct ieee80211_hw *hw, 
				  struct ieee80211_sta *sta, u32 changed)

{

	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);

	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);



	if (changed & (IEEE80211_RC_BW_CHANGED |

		       IEEE80211_RC_SUPP_RATES_CHANGED |

		       IEEE80211_RC_NSS_CHANGED))

		iwl_mvm_rs_rate_init(mvm, sta, mvmvif->phy_ctxt->channel->band,

				     true);



	if (vif->type == NL80211_IFTYPE_STATION &&

	    changed & IEEE80211_RC_NSS_CHANGED)

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

+2 −0
Original line number Diff line number Diff line
@@ -1399,7 +1399,9 @@ void iwl_mvm_add_new_dqa_stream_wk(struct work_struct *wk) 


		iwl_mvm_sta_alloc_queue(mvm, txq->sta, txq->ac, tid);

		list_del_init(&mvmtxq->list);

		local_bh_disable();

		iwl_mvm_mac_itxq_xmit(mvm->hw, txq);

		local_bh_enable();

	}



	mutex_unlock(&mvm->mutex);