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

Commit 19e737c9 authored by Eytan Lifshitz's avatar Eytan Lifshitz Committed by Johannes Berg
Browse files

iwlwifi: mvm: add support for NICs which have only 16 Tx queues. 



Some NICs embedded in platforms that have only 16 Tx queues,
this affect the mapping of the Tx queues.

Signed-off-by: default avatarEytan Lifshitz <eytan.lifshitz@intel.com>
Reviewed-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Reviewed-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 81a67e32

drivers/net/wireless/iwlwifi/mvm/fw-api.h

+6 −6
Original line number Diff line number Diff line
@@ -72,17 +72,17 @@ 
#include "fw-api-d3.h"

#include "fw-api-bt-coex.h"



/* queue and FIFO numbers by usage */

/* maximal number of Tx queues in any platform */

#define IWL_MVM_MAX_QUEUES	20



/* Tx queue numbers */

enum {

	IWL_MVM_OFFCHANNEL_QUEUE = 8,

	IWL_MVM_CMD_QUEUE = 9,

	IWL_MVM_AUX_QUEUE = 15,

	IWL_MVM_FIRST_AGG_QUEUE = 16,

	IWL_MVM_NUM_QUEUES = 20,

	IWL_MVM_LAST_AGG_QUEUE = IWL_MVM_NUM_QUEUES - 1,

	IWL_MVM_CMD_FIFO = 7

};



#define IWL_MVM_CMD_FIFO	7



#define IWL_MVM_STATION_COUNT	16



/* commands */

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

+1 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ static int iwl_mvm_load_ucode_wait_alive(struct iwl_mvm *mvm, 
	 */



	for (i = 0; i < IWL_MAX_HW_QUEUES; i++) {

		if (i < IWL_MVM_FIRST_AGG_QUEUE && i != IWL_MVM_CMD_QUEUE)

		if (i < mvm->first_agg_queue && i != IWL_MVM_CMD_QUEUE)

			mvm->queue_to_mac80211[i] = i;

		else

			mvm->queue_to_mac80211[i] = IWL_INVALID_MAC80211_QUEUE;

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

+6 −6
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ struct iwl_mvm_mac_iface_iterator_data { 
	struct ieee80211_vif *vif;

	unsigned long available_mac_ids[BITS_TO_LONGS(NUM_MAC_INDEX_DRIVER)];

	unsigned long available_tsf_ids[BITS_TO_LONGS(NUM_TSF_IDS)];

	unsigned long used_hw_queues[BITS_TO_LONGS(IWL_MVM_FIRST_AGG_QUEUE)];

	unsigned long used_hw_queues[BITS_TO_LONGS(IWL_MVM_MAX_QUEUES)];

	enum iwl_tsf_id preferred_tsf;

	bool found_vif;

};
@@ -218,7 +218,7 @@ static int iwl_mvm_mac_ctxt_allocate_resources(struct iwl_mvm *mvm, 
		.preferred_tsf = NUM_TSF_IDS,

		.used_hw_queues = {

			BIT(IWL_MVM_OFFCHANNEL_QUEUE) |

			BIT(IWL_MVM_AUX_QUEUE) |

			BIT(mvm->aux_queue) |

			BIT(IWL_MVM_CMD_QUEUE)

		},

		.found_vif = false,
@@ -302,9 +302,9 @@ static int iwl_mvm_mac_ctxt_allocate_resources(struct iwl_mvm *mvm, 
	/* Find available queues, and allocate them to the ACs */

	for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) {

		u8 queue = find_first_zero_bit(data.used_hw_queues,

					       IWL_MVM_FIRST_AGG_QUEUE);

					       mvm->first_agg_queue);



		if (queue >= IWL_MVM_FIRST_AGG_QUEUE) {

		if (queue >= mvm->first_agg_queue) {

			IWL_ERR(mvm, "Failed to allocate queue\n");

			ret = -EIO;

			goto exit_fail;
@@ -317,9 +317,9 @@ static int iwl_mvm_mac_ctxt_allocate_resources(struct iwl_mvm *mvm, 
	/* Allocate the CAB queue for softAP and GO interfaces */

	if (vif->type == NL80211_IFTYPE_AP) {

		u8 queue = find_first_zero_bit(data.used_hw_queues,

					       IWL_MVM_FIRST_AGG_QUEUE);

					       mvm->first_agg_queue);



		if (queue >= IWL_MVM_FIRST_AGG_QUEUE) {

		if (queue >= mvm->first_agg_queue) {

			IWL_ERR(mvm, "Failed to allocate cab queue\n");

			ret = -EIO;

			goto exit_fail;

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

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) 
		    IEEE80211_HW_SUPPORTS_STATIC_SMPS |

		    IEEE80211_HW_SUPPORTS_UAPSD;



	hw->queues = IWL_MVM_FIRST_AGG_QUEUE;

	hw->queues = mvm->first_agg_queue;

	hw->offchannel_tx_hw_queue = IWL_MVM_OFFCHANNEL_QUEUE;

	hw->rate_control_algorithm = "iwl-mvm-rs";

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

+5 −0
Original line number Diff line number Diff line
@@ -547,6 +547,11 @@ struct iwl_mvm { 
	u32 noa_duration;

	struct ieee80211_vif *noa_vif;

#endif



	/* Tx queues */

	u8 aux_queue;

	u8 first_agg_queue;

	u8 last_agg_queue;

};



/* Extract MVM priv from op_mode and _hw */