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

Commit 4bdd4dfe authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Luca Coelho
Browse files

iwlwifi: advertise maximal MPDU length when Rx MQ is supported 



The new hardware that supports multiple queue also
de-aggregates A-MSDUs. This means that we can advertise
the maximal size of A-MSDUs regardless of the receive
buffer's size.
In order to be able to forcefully use a lower A-MSDU size,
add a default value for the module parameter. Pre-9000
will have a default of 4K, and 9000 will have 12K.
Setting the amsdu_size module parameter to 4K will limit
the A-MSDU on 9000 as well.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent af5e964f

drivers/net/wireless/intel/iwlwifi/dvm/main.c

+1 −0
Original line number Diff line number Diff line
@@ -1317,6 +1317,7 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans, 
	trans_cfg.n_no_reclaim_cmds = ARRAY_SIZE(no_reclaim_cmds);



	switch (iwlwifi_mod_params.amsdu_size) {

	case IWL_AMSDU_DEF:

	case IWL_AMSDU_4K:

		trans_cfg.rx_buf_size = IWL_AMSDU_4K;

		break;

drivers/net/wireless/intel/iwlwifi/iwl-drv.c

+2 −1
Original line number Diff line number Diff line
@@ -1655,7 +1655,8 @@ MODULE_PARM_DESC(11n_disable, 
	"disable 11n functionality, bitmap: 1: full, 2: disable agg TX, 4: disable agg RX, 8 enable agg TX");

module_param_named(amsdu_size, iwlwifi_mod_params.amsdu_size,

		   int, S_IRUGO);

MODULE_PARM_DESC(amsdu_size, "amsdu size 0:4K 1:8K 2:12K (default 0)");

MODULE_PARM_DESC(amsdu_size,

		 "amsdu size 0: 12K for multi Rx queue devices, 4K for other devices 1:4K 2:8K 3:12K (default 0)");

module_param_named(fw_restart, iwlwifi_mod_params.restart_fw, bool, S_IRUGO);

MODULE_PARM_DESC(fw_restart, "restart firmware in case of error (default true)");

drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c

+3 −1
Original line number Diff line number Diff line
@@ -766,7 +766,9 @@ void iwl_init_ht_hw_capab(const struct iwl_cfg *cfg, 
	if (cfg->ht_params->ldpc)

		ht_info->cap |= IEEE80211_HT_CAP_LDPC_CODING;



	if (iwlwifi_mod_params.amsdu_size >= IWL_AMSDU_8K)

	if ((cfg->mq_rx_supported &&

	     iwlwifi_mod_params.amsdu_size != IWL_AMSDU_4K) ||

	     iwlwifi_mod_params.amsdu_size >= IWL_AMSDU_8K)

		ht_info->cap |= IEEE80211_HT_CAP_MAX_AMSDU;



	ht_info->ampdu_factor = cfg->max_ht_ampdu_exponent;

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

+5 −4
Original line number Diff line number Diff line
@@ -87,9 +87,10 @@ enum iwl_disable_11n { 
};



enum iwl_amsdu_size {

	IWL_AMSDU_4K = 0,

	IWL_AMSDU_8K = 1,

	IWL_AMSDU_12K = 2,

	IWL_AMSDU_DEF = 0,

	IWL_AMSDU_4K = 1,

	IWL_AMSDU_8K = 2,

	IWL_AMSDU_12K = 3,

};



enum iwl_uapsd_disable {
@@ -105,7 +106,7 @@ enum iwl_uapsd_disable { 
 * @sw_crypto: using hardware encryption, default = 0

 * @disable_11n: disable 11n capabilities, default = 0,

 *	use IWL_[DIS,EN]ABLE_HT_* constants

 * @amsdu_size: enable 8K amsdu size, default = 4K. enum iwl_amsdu_size.

 * @amsdu_size: See &enum iwl_amsdu_size.

 * @restart_fw: restart firmware, default = 1

 * @bt_coex_active: enable bt coex, default = true

 * @led_mode: system default, default = 0

drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c

+7 −0
Original line number Diff line number Diff line
@@ -397,6 +397,13 @@ static void iwl_init_vht_hw_capab(const struct iwl_cfg *cfg, 
		vht_cap->cap |= IEEE80211_VHT_CAP_TX_ANTENNA_PATTERN;



	switch (iwlwifi_mod_params.amsdu_size) {

	case IWL_AMSDU_DEF:

		if (cfg->mq_rx_supported)

			vht_cap->cap |=

				IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454;

		else

			vht_cap->cap |= IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_3895;

		break;

	case IWL_AMSDU_4K:

		vht_cap->cap |= IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_3895;

		break;