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

Commit 1a4968d1 authored by Golan Ben Ami's avatar Golan Ben Ami Committed by Luca Coelho
Browse files

iwlwifi: pcie: support 2k rx buffers 



The smallest rb size supported today is 4k rx buffers.
22560 devices use 2k rxb's, so allow using 2k buffers.

Signed-off-by: default avatarGolan Ben Ami <golan.ben.ami@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent d0158235

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

+2 −1
Original line number Diff line number Diff line
@@ -1787,7 +1787,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, 0444);

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)");

		 "amsdu size 0: 12K for multi Rx queue devices, 2K for 22560 devices, "

		 "4K for other devices 1:4K 2:8K 3:12K 4: 2K (default 0)");

module_param_named(fw_restart, iwlwifi_mod_params.fw_restart, bool, 0444);

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

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

+4 −4
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 *

 * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2018 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -18,9 +19,7 @@ 
 * General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,

 * USA

 * along with this program;

 *

 * The full GNU General Public License is included in this distribution

 * in the file called COPYING.
@@ -33,6 +32,7 @@ 
 *

 * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2018 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -767,7 +767,7 @@ void iwl_init_ht_hw_capab(const struct iwl_cfg *cfg, 
		ht_info->cap |= IEEE80211_HT_CAP_LDPC_CODING;



	if ((cfg->mq_rx_supported &&

	     iwlwifi_mod_params.amsdu_size != IWL_AMSDU_4K) ||

	     iwlwifi_mod_params.amsdu_size == IWL_AMSDU_DEF) ||

	     iwlwifi_mod_params.amsdu_size >= IWL_AMSDU_8K)

		ht_info->cap |= IEEE80211_HT_CAP_MAX_AMSDU;

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

+5 −3
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2018 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -17,9 +18,7 @@ 
 * General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,

 * USA

 * along with this program;

 *

 * The full GNU General Public License is included in this distribution

 * in the file called COPYING.
@@ -31,6 +30,7 @@ 
 * BSD LICENSE

 *

 * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2018 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -90,6 +90,8 @@ enum iwl_amsdu_size { 
	IWL_AMSDU_4K = 1,

	IWL_AMSDU_8K = 2,

	IWL_AMSDU_12K = 3,

	/* Add 2K at the end to avoid breaking current API */

	IWL_AMSDU_2K = 4,

};



enum iwl_uapsd_disable {

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

+7 −0
Original line number Diff line number Diff line
@@ -430,6 +430,13 @@ static void iwl_init_vht_hw_capab(const struct iwl_cfg *cfg, 
		else

			vht_cap->cap |= IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_3895;

		break;

	case IWL_AMSDU_2K:

		if (cfg->mq_rx_supported)

			vht_cap->cap |=

				IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454;

		else

			WARN(1, "RB size of 2K is not supported by this device\n");

		break;

	case IWL_AMSDU_4K:

		vht_cap->cap |= IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_3895;

		break;

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

+2 −0
Original line number Diff line number Diff line
@@ -350,6 +350,8 @@ static inline int 
iwl_trans_get_rb_size_order(enum iwl_amsdu_size rb_size)

{

	switch (rb_size) {

	case IWL_AMSDU_2K:

		return get_order(2 * 1024);

	case IWL_AMSDU_4K:

		return get_order(4 * 1024);

	case IWL_AMSDU_8K: