Commit d3433d1b authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Johannes Berg
Browse files

wifi: iwlwifi: mvm: fix the TXF mapping for BZ devices 



Those devices' fifos are numbered differently.
Because of that, we were looking at the size of the VO fifo size to
determine the size of the A-MSDU which led to a lower throughput.

Note that for those devices the only user of the AC -> fifo mapping is
the size limitation of A-MSDU.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240218194912.da336ca2fa0a.I73e44d5fc474ebb6f275b9008950e59c012f33b2@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 78f65fbf

drivers/net/wireless/intel/iwlwifi/fw/api/txq.h

+11 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */

/*

 * Copyright (C) 2005-2014, 2019-2021, 2023 Intel Corporation

 * Copyright (C) 2005-2014, 2019-2021, 2023-2024 Intel Corporation

 * Copyright (C) 2013-2015 Intel Mobile Communications GmbH

 * Copyright (C) 2016-2017 Intel Deutschland GmbH

 */
@@ -66,6 +66,16 @@ enum iwl_gen2_tx_fifo { 
	IWL_GEN2_TRIG_TX_FIFO_VO,

};



enum iwl_bz_tx_fifo {

	IWL_BZ_EDCA_TX_FIFO_BK,

	IWL_BZ_EDCA_TX_FIFO_BE,

	IWL_BZ_EDCA_TX_FIFO_VI,

	IWL_BZ_EDCA_TX_FIFO_VO,

	IWL_BZ_TRIG_TX_FIFO_BK,

	IWL_BZ_TRIG_TX_FIFO_BE,

	IWL_BZ_TRIG_TX_FIFO_VI,

	IWL_BZ_TRIG_TX_FIFO_VO,

};

/**

 * enum iwl_tx_queue_cfg_actions - TXQ config options

 * @TX_QUEUE_CFG_ENABLE_QUEUE: enable a queue

drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c

+11 −0
Original line number Diff line number Diff line
@@ -31,6 +31,17 @@ const u8 iwl_mvm_ac_to_gen2_tx_fifo[] = { 
	IWL_GEN2_TRIG_TX_FIFO_BK,

};



const u8 iwl_mvm_ac_to_bz_tx_fifo[] = {

	IWL_BZ_EDCA_TX_FIFO_VO,

	IWL_BZ_EDCA_TX_FIFO_VI,

	IWL_BZ_EDCA_TX_FIFO_BE,

	IWL_BZ_EDCA_TX_FIFO_BK,

	IWL_BZ_TRIG_TX_FIFO_VO,

	IWL_BZ_TRIG_TX_FIFO_VI,

	IWL_BZ_TRIG_TX_FIFO_BE,

	IWL_BZ_TRIG_TX_FIFO_BK,

};



struct iwl_mvm_mac_iface_iterator_data {

	struct iwl_mvm *mvm;

	struct ieee80211_vif *vif;

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

+6 −2
Original line number Diff line number Diff line
@@ -1581,12 +1581,16 @@ static inline int iwl_mvm_max_active_links(struct iwl_mvm *mvm, 


extern const u8 iwl_mvm_ac_to_tx_fifo[];

extern const u8 iwl_mvm_ac_to_gen2_tx_fifo[];

extern const u8 iwl_mvm_ac_to_bz_tx_fifo[];



static inline u8 iwl_mvm_mac_ac_to_tx_fifo(struct iwl_mvm *mvm,

					   enum ieee80211_ac_numbers ac)

{

	return iwl_mvm_has_new_tx_api(mvm) ?

		iwl_mvm_ac_to_gen2_tx_fifo[ac] : iwl_mvm_ac_to_tx_fifo[ac];

	if (mvm->trans->trans_cfg->device_family >= IWL_DEVICE_FAMILY_BZ)

		return iwl_mvm_ac_to_bz_tx_fifo[ac];

	if (iwl_mvm_has_new_tx_api(mvm))

		return iwl_mvm_ac_to_gen2_tx_fifo[ac];

	return iwl_mvm_ac_to_tx_fifo[ac];

}



struct iwl_rate_info {