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

Commit df429195 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2016-07-01' of... 

Merge tag 'iwlwifi-next-for-kalle-2016-07-01' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

* More work on the RX path for the 9000 device series
* Some more dynamic queue allocation work
* A few bugfixes and other improvements
parents 535633a5 58035432

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-9000.c

+1 −0
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ const struct iwl_cfg iwl5165_2ac_cfg = { 
		.nvm_ver = IWL9000_NVM_VERSION,

		.nvm_calib_ver = IWL9000_TX_POWER_VERSION,

		.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,

		.integrated = true,

};



MODULE_FIRMWARE(IWL9000_MODULE_FIRMWARE(IWL9000_UCODE_API_MAX));

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

+3 −1
Original line number Diff line number Diff line
@@ -319,6 +319,7 @@ struct iwl_pwr_tx_backoff { 
 * @mq_rx_supported: multi-queue rx support

 * @vht_mu_mimo_supported: VHT MU-MIMO support

 * @rf_id: need to read rf_id to determine the firmware image

 * @integrated: discrete or integrated

 *

 * We enable the driver to be backward compatible wrt. hardware features.

 * API differences in uCode shouldn't be handled here but through TLVs
@@ -362,7 +363,8 @@ struct iwl_cfg { 
	    apmg_not_supported:1,

	    mq_rx_supported:1,

	    vht_mu_mimo_supported:1,

	    rf_id:1;

	    rf_id:1,

	    integrated:1;

	u8 valid_tx_ant;

	u8 valid_rx_ant;

	u8 non_shared_ant;

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

+4 −2
Original line number Diff line number Diff line
@@ -146,7 +146,9 @@ 
#define CSR_LED_REG             (CSR_BASE+0x094)

#define CSR_DRAM_INT_TBL_REG	(CSR_BASE+0x0A0)

#define CSR_MAC_SHADOW_REG_CTRL		(CSR_BASE + 0x0A8) /* 6000 and up */



#define CSR_MAC_SHADOW_REG_CTRL_RX_WAKE	BIT(20)

#define CSR_MAC_SHADOW_REG_CTL2		(CSR_BASE + 0x0AC)

#define CSR_MAC_SHADOW_REG_CTL2_RX_WAKE	0xFFFF



/* GIO Chicken Bits (PCI Express bus link power management) */

#define CSR_GIO_CHICKEN_BITS    (CSR_BASE+0x100)

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

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