Commit 30ed3c6c authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2018-12-14' of... 

Merge tag 'iwlwifi-next-for-kalle-2018-12-14' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

Third batch of iwlwifi patches intended for v4.21

* Some cleanups in the HW configuration structures;
* More work on the debugging infrastructure;
* Fixes related to 802.11ax;
* Other cleanups and small fixes;
parents e3e454b7 55ed14cd

drivers/net/wireless/intel/iwlwifi/cfg/1000.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
static const struct iwl_base_params iwl1000_base_params = {

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.max_tfd_queue_size = 256,

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_size = OTP_LOW_IMAGE_SIZE_2K,

	.pll_cfg = true,

	.max_ll_items = OTP_MAX_LL_ITEMS_1000,

	.shadow_ram_support = false,

drivers/net/wireless/intel/iwlwifi/cfg/2000.c

+2 −2
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 
#define IWL135_MODULE_FIRMWARE(api) IWL135_FW_PRE __stringify(api) ".ucode"



static const struct iwl_base_params iwl2000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_size = OTP_LOW_IMAGE_SIZE_2K,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.max_tfd_queue_size = 256,

	.max_ll_items = OTP_MAX_LL_ITEMS_2x00,
@@ -71,7 +71,7 @@ static const struct iwl_base_params iwl2000_base_params = { 




static const struct iwl_base_params iwl2030_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_size = OTP_LOW_IMAGE_SIZE_2K,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.max_tfd_queue_size = 256,

	.max_ll_items = OTP_MAX_LL_ITEMS_2x00,

drivers/net/wireless/intel/iwlwifi/cfg/22000.c

+3 −7
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ 


/* NVM versions */

#define IWL_22000_NVM_VERSION		0x0a1d

#define IWL_22000_TX_POWER_VERSION	0xffff /* meaningless */



/* Memory offsets and lengths */

#define IWL_22000_DCCM_OFFSET		0x800000 /* LMAC1 */
@@ -106,10 +105,8 @@ 
#define IWL_QU_B_JF_B_MODULE_FIRMWARE(api) \

	IWL_QU_B_JF_B_FW_PRE __stringify(api) ".ucode"



#define NVM_HW_SECTION_NUM_FAMILY_22000		10



static const struct iwl_base_params iwl_22000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE_FAMILY_22000,

	.eeprom_size = OTP_LOW_IMAGE_SIZE_32K,

	.num_of_queues = 512,

	.max_tfd_queue_size = 256,

	.shadow_ram_support = true,
@@ -121,7 +118,7 @@ static const struct iwl_base_params iwl_22000_base_params = { 
};



static const struct iwl_base_params iwl_22560_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE_FAMILY_22000,

	.eeprom_size = OTP_LOW_IMAGE_SIZE_32K,

	.num_of_queues = 512,

	.max_tfd_queue_size = 65536,

	.shadow_ram_support = true,
@@ -142,7 +139,7 @@ static const struct iwl_ht_params iwl_22000_ht_params = { 
	.ucode_api_max = IWL_22000_UCODE_API_MAX,			\

	.ucode_api_min = IWL_22000_UCODE_API_MIN,			\

	.led_mode = IWL_LED_RF_STATE,					\

	.nvm_hw_section_num = NVM_HW_SECTION_NUM_FAMILY_22000,		\

	.nvm_hw_section_num = 10,					\

	.non_shared_ant = ANT_B,					\

	.dccm_offset = IWL_22000_DCCM_OFFSET,				\

	.dccm_len = IWL_22000_DCCM_LEN,					\
@@ -157,7 +154,6 @@ static const struct iwl_ht_params iwl_22000_ht_params = { 
	.mac_addr_from_csr = true,					\

	.ht_params = &iwl_22000_ht_params,				\

	.nvm_ver = IWL_22000_NVM_VERSION,				\

	.nvm_calib_ver = IWL_22000_TX_POWER_VERSION,			\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,		\

	.use_tfh = true,						\

	.rf_id = true,							\

drivers/net/wireless/intel/iwlwifi/cfg/6000.c

+3 −3
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ 
#define IWL6030_MODULE_FIRMWARE(api) IWL6030_FW_PRE __stringify(api) ".ucode"



static const struct iwl_base_params iwl6000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_size = OTP_LOW_IMAGE_SIZE_2K,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.max_tfd_queue_size = 256,

	.max_ll_items = OTP_MAX_LL_ITEMS_6x00,
@@ -79,7 +79,7 @@ static const struct iwl_base_params iwl6000_base_params = { 
};



static const struct iwl_base_params iwl6050_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_size = OTP_LOW_IMAGE_SIZE_2K,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.max_tfd_queue_size = 256,

	.max_ll_items = OTP_MAX_LL_ITEMS_6x50,
@@ -92,7 +92,7 @@ static const struct iwl_base_params iwl6050_base_params = { 
};



static const struct iwl_base_params iwl6000_g2_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_size = OTP_LOW_IMAGE_SIZE_2K,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.max_tfd_queue_size = 256,

	.max_ll_items = OTP_MAX_LL_ITEMS_6x00,

drivers/net/wireless/intel/iwlwifi/cfg/7000.c

+2 −25
Original line number Diff line number Diff line
@@ -80,17 +80,11 @@ 


/* NVM versions */

#define IWL7260_NVM_VERSION		0x0a1d

#define IWL7260_TX_POWER_VERSION	0xffff /* meaningless */

#define IWL3160_NVM_VERSION		0x709

#define IWL3160_TX_POWER_VERSION	0xffff /* meaningless */

#define IWL3165_NVM_VERSION		0x709

#define IWL3165_TX_POWER_VERSION	0xffff /* meaningless */

#define IWL3168_NVM_VERSION		0xd01

#define IWL3168_TX_POWER_VERSION	0xffff /* meaningless */

#define IWL7265_NVM_VERSION		0x0a1d

#define IWL7265_TX_POWER_VERSION	0xffff /* meaningless */

#define IWL7265D_NVM_VERSION		0x0c11

#define IWL7265_TX_POWER_VERSION	0xffff /* meaningless */



/* DCCM offsets and lengths */

#define IWL7000_DCCM_OFFSET		0x800000
@@ -113,10 +107,8 @@ 
#define IWL7265D_FW_PRE "iwlwifi-7265D-"

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



#define NVM_HW_SECTION_NUM_FAMILY_7000		0



static const struct iwl_base_params iwl7000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE_FAMILY_7000,

	.eeprom_size = OTP_LOW_IMAGE_SIZE_16K,

	.num_of_queues = 31,

	.max_tfd_queue_size = 256,

	.shadow_ram_support = true,
@@ -159,7 +151,7 @@ static const struct iwl_ht_params iwl7000_ht_params = { 
	.device_family = IWL_DEVICE_FAMILY_7000,		\

	.base_params = &iwl7000_base_params,			\

	.led_mode = IWL_LED_RF_STATE,				\

	.nvm_hw_section_num = NVM_HW_SECTION_NUM_FAMILY_7000,	\

	.nvm_hw_section_num = 0,				\

	.non_shared_ant = ANT_A,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.dccm_offset = IWL7000_DCCM_OFFSET,			\
@@ -191,7 +183,6 @@ const struct iwl_cfg iwl7260_2ac_cfg = { 
	IWL_DEVICE_7000,

	.ht_params = &iwl7000_ht_params,

	.nvm_ver = IWL7260_NVM_VERSION,

	.nvm_calib_ver = IWL7260_TX_POWER_VERSION,

	.host_interrupt_operation_mode = true,

	.lp_xtal_workaround = true,

	.dccm_len = IWL7260_DCCM_LEN,
@@ -203,7 +194,6 @@ const struct iwl_cfg iwl7260_2ac_cfg_high_temp = { 
	IWL_DEVICE_7000,

	.ht_params = &iwl7000_ht_params,

	.nvm_ver = IWL7260_NVM_VERSION,

	.nvm_calib_ver = IWL7260_TX_POWER_VERSION,

	.high_temp = true,

	.host_interrupt_operation_mode = true,

	.lp_xtal_workaround = true,
@@ -217,7 +207,6 @@ const struct iwl_cfg iwl7260_2n_cfg = { 
	IWL_DEVICE_7000,

	.ht_params = &iwl7000_ht_params,

	.nvm_ver = IWL7260_NVM_VERSION,

	.nvm_calib_ver = IWL7260_TX_POWER_VERSION,

	.host_interrupt_operation_mode = true,

	.lp_xtal_workaround = true,

	.dccm_len = IWL7260_DCCM_LEN,
@@ -229,7 +218,6 @@ const struct iwl_cfg iwl7260_n_cfg = { 
	IWL_DEVICE_7000,

	.ht_params = &iwl7000_ht_params,

	.nvm_ver = IWL7260_NVM_VERSION,

	.nvm_calib_ver = IWL7260_TX_POWER_VERSION,

	.host_interrupt_operation_mode = true,

	.lp_xtal_workaround = true,

	.dccm_len = IWL7260_DCCM_LEN,
@@ -241,7 +229,6 @@ const struct iwl_cfg iwl3160_2ac_cfg = { 
	IWL_DEVICE_7000,

	.ht_params = &iwl7000_ht_params,

	.nvm_ver = IWL3160_NVM_VERSION,

	.nvm_calib_ver = IWL3160_TX_POWER_VERSION,

	.host_interrupt_operation_mode = true,

	.dccm_len = IWL3160_DCCM_LEN,

};
@@ -252,7 +239,6 @@ const struct iwl_cfg iwl3160_2n_cfg = { 
	IWL_DEVICE_7000,

	.ht_params = &iwl7000_ht_params,

	.nvm_ver = IWL3160_NVM_VERSION,

	.nvm_calib_ver = IWL3160_TX_POWER_VERSION,

	.host_interrupt_operation_mode = true,

	.dccm_len = IWL3160_DCCM_LEN,

};
@@ -263,7 +249,6 @@ const struct iwl_cfg iwl3160_n_cfg = { 
	IWL_DEVICE_7000,

	.ht_params = &iwl7000_ht_params,

	.nvm_ver = IWL3160_NVM_VERSION,

	.nvm_calib_ver = IWL3160_TX_POWER_VERSION,

	.host_interrupt_operation_mode = true,

	.dccm_len = IWL3160_DCCM_LEN,

};
@@ -291,7 +276,6 @@ const struct iwl_cfg iwl3165_2ac_cfg = { 
	IWL_DEVICE_7005D,

	.ht_params = &iwl7000_ht_params,

	.nvm_ver = IWL3165_NVM_VERSION,

	.nvm_calib_ver = IWL3165_TX_POWER_VERSION,

	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,

	.dccm_len = IWL7265_DCCM_LEN,

};
@@ -302,7 +286,6 @@ const struct iwl_cfg iwl3168_2ac_cfg = { 
	IWL_DEVICE_3008,

	.ht_params = &iwl7000_ht_params,

	.nvm_ver = IWL3168_NVM_VERSION,

	.nvm_calib_ver = IWL3168_TX_POWER_VERSION,

	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,

	.dccm_len = IWL7265_DCCM_LEN,

	.nvm_type = IWL_NVM_SDP,
@@ -314,7 +297,6 @@ const struct iwl_cfg iwl7265_2ac_cfg = { 
	IWL_DEVICE_7005,

	.ht_params = &iwl7265_ht_params,

	.nvm_ver = IWL7265_NVM_VERSION,

	.nvm_calib_ver = IWL7265_TX_POWER_VERSION,

	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,

	.dccm_len = IWL7265_DCCM_LEN,

};
@@ -325,7 +307,6 @@ const struct iwl_cfg iwl7265_2n_cfg = { 
	IWL_DEVICE_7005,

	.ht_params = &iwl7265_ht_params,

	.nvm_ver = IWL7265_NVM_VERSION,

	.nvm_calib_ver = IWL7265_TX_POWER_VERSION,

	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,

	.dccm_len = IWL7265_DCCM_LEN,

};
@@ -336,7 +317,6 @@ const struct iwl_cfg iwl7265_n_cfg = { 
	IWL_DEVICE_7005,

	.ht_params = &iwl7265_ht_params,

	.nvm_ver = IWL7265_NVM_VERSION,

	.nvm_calib_ver = IWL7265_TX_POWER_VERSION,

	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,

	.dccm_len = IWL7265_DCCM_LEN,

};
@@ -347,7 +327,6 @@ const struct iwl_cfg iwl7265d_2ac_cfg = { 
	IWL_DEVICE_7005D,

	.ht_params = &iwl7265_ht_params,

	.nvm_ver = IWL7265D_NVM_VERSION,

	.nvm_calib_ver = IWL7265_TX_POWER_VERSION,

	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,

	.dccm_len = IWL7265_DCCM_LEN,

};
@@ -358,7 +337,6 @@ const struct iwl_cfg iwl7265d_2n_cfg = { 
	IWL_DEVICE_7005D,

	.ht_params = &iwl7265_ht_params,

	.nvm_ver = IWL7265D_NVM_VERSION,

	.nvm_calib_ver = IWL7265_TX_POWER_VERSION,

	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,

	.dccm_len = IWL7265_DCCM_LEN,

};
@@ -369,7 +347,6 @@ const struct iwl_cfg iwl7265d_n_cfg = { 
	IWL_DEVICE_7005D,

	.ht_params = &iwl7265_ht_params,

	.nvm_ver = IWL7265D_NVM_VERSION,

	.nvm_calib_ver = IWL7265_TX_POWER_VERSION,

	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,

	.dccm_len = IWL7265_DCCM_LEN,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE