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

Commit ef16ea32 authored by John W. Linville's avatar John W. Linville
Browse files

Merge tag 'iwlwifi-next-for-john-2014-11-24' of... 

Merge tag 'iwlwifi-next-for-john-2014-11-24' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next



Emmanuel Grumbach <egrumbach@gmail.com> says:

"Major works are CSA and TDLS. On top of that I have a new
firmware API for scan and a few rate control improvements.
Johannes find a few tricks to improve our CPU utilization
and adds support for a new spin of 7265 called 7265D.
Along with this a few random things that don't stand out."

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parents 9e6f3f47 dcad8e42

drivers/net/wireless/iwlwifi/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ config IWLDVM 


config IWLMVM

	tristate "Intel Wireless WiFi MVM Firmware support"

	select BACKPORT_WANT_DEV_COREDUMP

	select WANT_DEV_COREDUMP

	help

	  This is the driver that supports the MVM firmware which is

	  currently only available for 7260 and 3160 devices.

drivers/net/wireless/iwlwifi/iwl-7000.c

+36 −2
Original line number Diff line number Diff line
@@ -102,6 +102,9 @@ 
#define IWL7265_FW_PRE "iwlwifi-7265-"

#define IWL7265_MODULE_FIRMWARE(api) IWL7265_FW_PRE __stringify(api) ".ucode"



#define IWL7265D_FW_PRE "iwlwifi-7265D-"

#define IWL7265D_MODULE_FIRMWARE(api) IWL7265_FW_PRE __stringify(api) ".ucode"



#define NVM_HW_SECTION_NUM_FAMILY_7000		0



static const struct iwl_base_params iwl7000_base_params = {
@@ -132,8 +135,8 @@ static const struct iwl_ht_params iwl7000_ht_params = { 
	.base_params = &iwl7000_base_params,			\

	.led_mode = IWL_LED_RF_STATE,				\

	.nvm_hw_section_num = NVM_HW_SECTION_NUM_FAMILY_7000,	\

	.non_shared_ant = ANT_A



	.non_shared_ant = ANT_A,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K



const struct iwl_cfg iwl7260_2ac_cfg = {

	.name = "Intel(R) Dual Band Wireless AC 7260",
@@ -267,7 +270,38 @@ const struct iwl_cfg iwl7265_n_cfg = { 
	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,

};



const struct iwl_cfg iwl7265d_2ac_cfg = {

	.name = "Intel(R) Dual Band Wireless AC 7265",

	.fw_name_pre = IWL7265D_FW_PRE,

	IWL_DEVICE_7000,

	.ht_params = &iwl7265_ht_params,

	.nvm_ver = IWL7265_NVM_VERSION,

	.nvm_calib_ver = IWL7265_TX_POWER_VERSION,

	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,

};



const struct iwl_cfg iwl7265d_2n_cfg = {

	.name = "Intel(R) Dual Band Wireless N 7265",

	.fw_name_pre = IWL7265D_FW_PRE,

	IWL_DEVICE_7000,

	.ht_params = &iwl7265_ht_params,

	.nvm_ver = IWL7265_NVM_VERSION,

	.nvm_calib_ver = IWL7265_TX_POWER_VERSION,

	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,

};



const struct iwl_cfg iwl7265d_n_cfg = {

	.name = "Intel(R) Wireless N 7265",

	.fw_name_pre = IWL7265D_FW_PRE,

	IWL_DEVICE_7000,

	.ht_params = &iwl7265_ht_params,

	.nvm_ver = IWL7265_NVM_VERSION,

	.nvm_calib_ver = IWL7265_TX_POWER_VERSION,

	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,

};



MODULE_FIRMWARE(IWL7260_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));

MODULE_FIRMWARE(IWL3160_MODULE_FIRMWARE(IWL3160_UCODE_API_OK));

MODULE_FIRMWARE(IWL3165_MODULE_FIRMWARE(IWL3160_UCODE_API_OK));

MODULE_FIRMWARE(IWL7265_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));

MODULE_FIRMWARE(IWL7265D_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));

drivers/net/wireless/iwlwifi/iwl-8000.c

+23 −0
Original line number Diff line number Diff line
@@ -91,6 +91,10 @@ 
/* Max SDIO RX aggregation size of the ADDBA request/response */

#define MAX_RX_AGG_SIZE_8260_SDIO	28



/* Max A-MPDU exponent for HT and VHT */

#define MAX_HT_AMPDU_EXPONENT_8260_SDIO	IEEE80211_HT_MAX_AMPDU_32K

#define MAX_VHT_AMPDU_EXPONENT_8260_SDIO	IEEE80211_VHT_MAX_AMPDU_32K



static const struct iwl_base_params iwl8000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE_FAMILY_8000,

	.num_of_queues = IWLAGN_NUM_QUEUES,
@@ -119,6 +123,7 @@ static const struct iwl_ht_params iwl8000_ht_params = { 
	.base_params = &iwl8000_base_params,			\

	.led_mode = IWL_LED_RF_STATE,				\

	.nvm_hw_section_num = NVM_HW_SECTION_NUM_FAMILY_8000,	\

	.d0i3 = true,						\

	.non_shared_ant = ANT_A



const struct iwl_cfg iwl8260_2n_cfg = {
@@ -137,6 +142,7 @@ const struct iwl_cfg iwl8260_2ac_cfg = { 
	.ht_params = &iwl8000_ht_params,

	.nvm_ver = IWL8000_NVM_VERSION,

	.nvm_calib_ver = IWL8000_TX_POWER_VERSION,

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,

};



const struct iwl_cfg iwl8260_2ac_sdio_cfg = {
@@ -149,6 +155,23 @@ const struct iwl_cfg iwl8260_2ac_sdio_cfg = { 
	.default_nvm_file = DEFAULT_NVM_FILE_FAMILY_8000,

	.max_rx_agg_size = MAX_RX_AGG_SIZE_8260_SDIO,

	.disable_dummy_notification = true,

	.max_ht_ampdu_exponent  = MAX_HT_AMPDU_EXPONENT_8260_SDIO,

	.max_vht_ampdu_exponent = MAX_VHT_AMPDU_EXPONENT_8260_SDIO,

};



const struct iwl_cfg iwl4265_2ac_sdio_cfg = {

	.name = "Intel(R) Dual Band Wireless-AC 4265",

	.fw_name_pre = IWL8000_FW_PRE,

	IWL_DEVICE_8000,

	.ht_params = &iwl8000_ht_params,

	.nvm_ver = IWL8000_NVM_VERSION,

	.nvm_calib_ver = IWL8000_TX_POWER_VERSION,

	.default_nvm_file = DEFAULT_NVM_FILE_FAMILY_8000,

	.max_rx_agg_size = MAX_RX_AGG_SIZE_8260_SDIO,

	.bt_shared_single_ant = true,

	.disable_dummy_notification = true,

	.max_ht_ampdu_exponent  = MAX_HT_AMPDU_EXPONENT_8260_SDIO,

	.max_vht_ampdu_exponent = MAX_VHT_AMPDU_EXPONENT_8260_SDIO,

};



MODULE_FIRMWARE(IWL8000_MODULE_FIRMWARE(IWL8000_UCODE_API_OK));

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

+10 −0
Original line number Diff line number Diff line
@@ -257,6 +257,10 @@ struct iwl_pwr_tx_backoff { 
 * @pwr_tx_backoffs: translation table between power limits and backoffs

 * @max_rx_agg_size: max RX aggregation size of the ADDBA request/response

 * @max_tx_agg_size: max TX aggregation size of the ADDBA request/response

 * @max_ht_ampdu_factor: the exponent of the max length of A-MPDU that the

 *	station can receive in HT

 * @max_vht_ampdu_exponent: the exponent of the max length of A-MPDU that the

 *	station can receive in VHT

 *

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

 * API differences in uCode shouldn't be handled here but through TLVs
@@ -297,6 +301,8 @@ struct iwl_cfg { 
	unsigned int max_rx_agg_size;

	bool disable_dummy_notification;

	unsigned int max_tx_agg_size;

	unsigned int max_ht_ampdu_exponent;

	unsigned int max_vht_ampdu_exponent;

};



/*
@@ -358,9 +364,13 @@ extern const struct iwl_cfg iwl3165_2ac_cfg; 
extern const struct iwl_cfg iwl7265_2ac_cfg;

extern const struct iwl_cfg iwl7265_2n_cfg;

extern const struct iwl_cfg iwl7265_n_cfg;

extern const struct iwl_cfg iwl7265d_2ac_cfg;

extern const struct iwl_cfg iwl7265d_2n_cfg;

extern const struct iwl_cfg iwl7265d_n_cfg;

extern const struct iwl_cfg iwl8260_2n_cfg;

extern const struct iwl_cfg iwl8260_2ac_cfg;

extern const struct iwl_cfg iwl8260_2ac_sdio_cfg;

extern const struct iwl_cfg iwl4265_2ac_sdio_cfg;

#endif /* CONFIG_IWLMVM */



#endif /* __IWL_CONFIG_H__ */

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

+22 −17
Original line number Diff line number Diff line
@@ -129,6 +129,8 @@ 
#define CSR_UCODE_DRV_GP1_CLR   (CSR_BASE+0x05c)

#define CSR_UCODE_DRV_GP2       (CSR_BASE+0x060)



#define CSR_MBOX_SET_REG	(CSR_BASE + 0x88)



#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 */
@@ -184,6 +186,8 @@ 
#define CSR_HW_IF_CONFIG_REG_PREPARE		  (0x08000000) /* WAKE_ME */

#define CSR_HW_IF_CONFIG_REG_PERSIST_MODE	  (0x40000000) /* PERSISTENCE */



#define CSR_MBOX_SET_REG_OS_ALIVE		BIT(5)



#define CSR_INT_PERIODIC_DIS			(0x00) /* disable periodic int*/

#define CSR_INT_PERIODIC_ENA			(0xFF) /* 255*32 usec ~ 8 msec*/
@@ -321,6 +325,7 @@ enum { 
#define CSR_HW_REV_TYPE_2x00		(0x0000100)

#define CSR_HW_REV_TYPE_105		(0x0000110)

#define CSR_HW_REV_TYPE_135		(0x0000120)

#define CSR_HW_REV_TYPE_7265D		(0x0000210)

#define CSR_HW_REV_TYPE_NONE		(0x00001F0)



/* EEPROM REG */