Commit d5367de2 authored by Erel Geron's avatar Erel Geron Committed by Luca Coelho
Browse files

iwlwifi: mvm: TLC support for Coex Schema 2 



The new coex schema requires setting the non-shared antenna
for the single_stream_ant_msk field in the TLC command.

Signed-off-by: default avatarErel Geron <erelx.geron@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 337bfc98

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

+9 −0
Original line number Diff line number Diff line
@@ -691,6 +691,15 @@ bool iwl_mvm_bt_coex_is_tpc_allowed(struct iwl_mvm *mvm, 
	return bt_activity >= BT_LOW_TRAFFIC;

}



u8 iwl_mvm_bt_coex_get_single_ant_msk(struct iwl_mvm *mvm, u8 enabled_ants)

{

	if (fw_has_capa(&mvm->fw->ucode_capa, IWL_UCODE_TLV_CAPA_COEX_SCHEMA_2) &&

	    (mvm->cfg->non_shared_ant & enabled_ants))

		return mvm->cfg->non_shared_ant;



	return first_antenna(enabled_ants);

}



u8 iwl_mvm_bt_coex_tx_prio(struct iwl_mvm *mvm, struct ieee80211_hdr *hdr,

			   struct ieee80211_tx_info *info, u8 ac)

{

drivers/net/wireless/intel/iwlwifi/mvm/mvm.h

+1 −0
Original line number Diff line number Diff line
@@ -1819,6 +1819,7 @@ bool iwl_mvm_bt_coex_is_ant_avail(struct iwl_mvm *mvm, u8 ant); 
bool iwl_mvm_bt_coex_is_shared_ant_avail(struct iwl_mvm *mvm);

bool iwl_mvm_bt_coex_is_tpc_allowed(struct iwl_mvm *mvm,

				    enum nl80211_band band);

u8 iwl_mvm_bt_coex_get_single_ant_msk(struct iwl_mvm *mvm, u8 enabled_ants);

u8 iwl_mvm_bt_coex_tx_prio(struct iwl_mvm *mvm, struct ieee80211_hdr *hdr,

			   struct ieee80211_tx_info *info, u8 ac);

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

+3 −2
Original line number Diff line number Diff line
@@ -3213,7 +3213,7 @@ static void rs_drv_rate_init(struct iwl_mvm *mvm, struct ieee80211_sta *sta, 


	/* These values will be overridden later */

	lq_sta->lq.single_stream_ant_msk =

		first_antenna(iwl_mvm_get_valid_tx_ant(mvm));

		iwl_mvm_bt_coex_get_single_ant_msk(mvm, iwl_mvm_get_valid_tx_ant(mvm));

	lq_sta->lq.dual_stream_ant_msk = ANT_AB;



	/* as default allow aggregation for all tids */
@@ -3576,7 +3576,8 @@ static void rs_fill_lq_cmd(struct iwl_mvm *mvm, 
	mvmsta = iwl_mvm_sta_from_mac80211(sta);

	mvmvif = iwl_mvm_vif_from_mac80211(mvmsta->vif);



	if (num_of_ant(initial_rate->ant) == 1)

	if (!fw_has_capa(&mvm->fw->ucode_capa, IWL_UCODE_TLV_CAPA_COEX_SCHEMA_2) &&

	    num_of_ant(initial_rate->ant) == 1)

		lq_cmd->single_stream_ant_msk = initial_rate->ant;



	lq_cmd->agg_frame_cnt_limit = mvmsta->max_agg_bufsize;

CRA Git | Maintained and supported by SUSTech CRA and CCSE