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

Commit 67e974c3 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2019-09-06' of... 

Merge tag 'iwlwifi-next-for-kalle-2019-09-06' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

Patches intended for v5.4

* Remove (broken) d0i3 support;
* Debug infrastructure work continues;
* Bump support FW API version to 50;
* Fix for the SN value in certain suspend/resume situations;
* Some work on new FW scan APIs;
* Work on LTR FW APIs;
* New FW channel-switch support;
* Support new ACPI value for per-platform antenna gain;
* Support for single antenna diversity;
* Support for new WoWLAN FW API;
* Initial refactoring of the device selection code;
* A bunch of clean-ups;
* Other small fixes and improvements;
parents d13b12c3 787350ef

drivers/net/wireless/intel/iwlwifi/Kconfig

+0 −14
Original line number Original line Diff line number Diff line
@@ -92,20 +92,6 @@ config IWLWIFI_BCAST_FILTERING 
	  If unsure, don't enable this option, as some programs might

	  If unsure, don't enable this option, as some programs might

	  expect incoming broadcasts for their normal operations.

	  expect incoming broadcasts for their normal operations.





config IWLWIFI_PCIE_RTPM

       bool "Enable runtime power management mode for PCIe devices"

       depends on IWLMVM && PM && EXPERT

       help

         Say Y here to enable runtime power management for PCIe

         devices.  If enabled, the device will go into low power mode

         when idle for a short period of time, allowing for improved

         power saving during runtime. Note that this feature requires

         a tight integration with the platform. It is not recommended

         to enable this feature without proper validation with the

         specific target platform.



	 If unsure, say N.



menu "Debugging Options"

menu "Debugging Options"





config IWLWIFI_DEBUG

config IWLWIFI_DEBUG

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

+7 −7
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ 
/******************************************************************************

/******************************************************************************

 *

 *

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

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

 * Copyright(c) 2018 Intel Corporation

 * Copyright(c) 2018 - 2019 Intel Corporation

 *

 *

 * Contact Information:

 * Contact Information:

 *  Intel Linux Wireless <linuxwifi@intel.com>

 *  Intel Linux Wireless <linuxwifi@intel.com>
@@ -69,16 +69,16 @@ static const struct iwl_eeprom_params iwl1000_eeprom_params = { 
	.fw_name_pre = IWL1000_FW_PRE,				\

	.fw_name_pre = IWL1000_FW_PRE,				\

	.ucode_api_max = IWL1000_UCODE_API_MAX,			\

	.ucode_api_max = IWL1000_UCODE_API_MAX,			\

	.ucode_api_min = IWL1000_UCODE_API_MIN,			\

	.ucode_api_min = IWL1000_UCODE_API_MIN,			\

	.device_family = IWL_DEVICE_FAMILY_1000,		\

	.trans.device_family = IWL_DEVICE_FAMILY_1000,		\

	.max_inst_size = IWLAGN_RTC_INST_SIZE,			\

	.max_inst_size = IWLAGN_RTC_INST_SIZE,			\

	.max_data_size = IWLAGN_RTC_DATA_SIZE,			\

	.max_data_size = IWLAGN_RTC_DATA_SIZE,			\

	.nvm_ver = EEPROM_1000_EEPROM_VERSION,		\

	.nvm_ver = EEPROM_1000_EEPROM_VERSION,		\

	.nvm_calib_ver = EEPROM_1000_TX_POWER_VERSION,	\

	.nvm_calib_ver = EEPROM_1000_TX_POWER_VERSION,	\

	.base_params = &iwl1000_base_params,			\

	.trans.base_params = &iwl1000_base_params,		\

	.eeprom_params = &iwl1000_eeprom_params,		\

	.eeprom_params = &iwl1000_eeprom_params,		\

	.led_mode = IWL_LED_BLINK,				\

	.led_mode = IWL_LED_BLINK,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.csr = &iwl_csr_v1

	.trans.csr = &iwl_csr_v1





const struct iwl_cfg iwl1000_bgn_cfg = {

const struct iwl_cfg iwl1000_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 1000 BGN",

	.name = "Intel(R) Centrino(R) Wireless-N 1000 BGN",
@@ -95,17 +95,17 @@ const struct iwl_cfg iwl1000_bg_cfg = { 
	.fw_name_pre = IWL100_FW_PRE,				\

	.fw_name_pre = IWL100_FW_PRE,				\

	.ucode_api_max = IWL100_UCODE_API_MAX,			\

	.ucode_api_max = IWL100_UCODE_API_MAX,			\

	.ucode_api_min = IWL100_UCODE_API_MIN,			\

	.ucode_api_min = IWL100_UCODE_API_MIN,			\

	.device_family = IWL_DEVICE_FAMILY_100,			\

	.trans.device_family = IWL_DEVICE_FAMILY_100,		\

	.max_inst_size = IWLAGN_RTC_INST_SIZE,			\

	.max_inst_size = IWLAGN_RTC_INST_SIZE,			\

	.max_data_size = IWLAGN_RTC_DATA_SIZE,			\

	.max_data_size = IWLAGN_RTC_DATA_SIZE,			\

	.nvm_ver = EEPROM_1000_EEPROM_VERSION,		\

	.nvm_ver = EEPROM_1000_EEPROM_VERSION,		\

	.nvm_calib_ver = EEPROM_1000_TX_POWER_VERSION,	\

	.nvm_calib_ver = EEPROM_1000_TX_POWER_VERSION,	\

	.base_params = &iwl1000_base_params,			\

	.trans.base_params = &iwl1000_base_params,		\

	.eeprom_params = &iwl1000_eeprom_params,		\

	.eeprom_params = &iwl1000_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.led_mode = IWL_LED_RF_STATE,				\

	.rx_with_siso_diversity = true,				\

	.rx_with_siso_diversity = true,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.csr = &iwl_csr_v1

	.trans.csr = &iwl_csr_v1





const struct iwl_cfg iwl100_bgn_cfg = {

const struct iwl_cfg iwl100_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 100 BGN",

	.name = "Intel(R) Centrino(R) Wireless-N 100 BGN",

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

+13 −13
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ 
/******************************************************************************

/******************************************************************************

 *

 *

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

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

 * Copyright(c) 2018 Intel Corporation

 * Copyright(c) 2018 - 2019 Intel Corporation

 *

 *

 * Contact Information:

 * Contact Information:

 *  Intel Linux Wireless <linuxwifi@intel.com>

 *  Intel Linux Wireless <linuxwifi@intel.com>
@@ -95,16 +95,16 @@ static const struct iwl_eeprom_params iwl20x0_eeprom_params = { 
	.fw_name_pre = IWL2000_FW_PRE,				\

	.fw_name_pre = IWL2000_FW_PRE,				\

	.ucode_api_max = IWL2000_UCODE_API_MAX,			\

	.ucode_api_max = IWL2000_UCODE_API_MAX,			\

	.ucode_api_min = IWL2000_UCODE_API_MIN,			\

	.ucode_api_min = IWL2000_UCODE_API_MIN,			\

	.device_family = IWL_DEVICE_FAMILY_2000,		\

	.trans.device_family = IWL_DEVICE_FAMILY_2000,		\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\

	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.nvm_ver = EEPROM_2000_EEPROM_VERSION,			\

	.nvm_ver = EEPROM_2000_EEPROM_VERSION,			\

	.nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION,		\

	.nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION,		\

	.base_params = &iwl2000_base_params,			\

	.trans.base_params = &iwl2000_base_params,		\

	.eeprom_params = &iwl20x0_eeprom_params,		\

	.eeprom_params = &iwl20x0_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.led_mode = IWL_LED_RF_STATE,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.csr = &iwl_csr_v1

	.trans.csr = &iwl_csr_v1









const struct iwl_cfg iwl2000_2bgn_cfg = {

const struct iwl_cfg iwl2000_2bgn_cfg = {
@@ -123,16 +123,16 @@ const struct iwl_cfg iwl2000_2bgn_d_cfg = { 
	.fw_name_pre = IWL2030_FW_PRE,				\

	.fw_name_pre = IWL2030_FW_PRE,				\

	.ucode_api_max = IWL2030_UCODE_API_MAX,			\

	.ucode_api_max = IWL2030_UCODE_API_MAX,			\

	.ucode_api_min = IWL2030_UCODE_API_MIN,			\

	.ucode_api_min = IWL2030_UCODE_API_MIN,			\

	.device_family = IWL_DEVICE_FAMILY_2030,		\

	.trans.device_family = IWL_DEVICE_FAMILY_2030,		\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\

	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.nvm_ver = EEPROM_2000_EEPROM_VERSION,		\

	.nvm_ver = EEPROM_2000_EEPROM_VERSION,		\

	.nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\

	.nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\

	.base_params = &iwl2030_base_params,			\

	.trans.base_params = &iwl2030_base_params,		\

	.eeprom_params = &iwl20x0_eeprom_params,		\

	.eeprom_params = &iwl20x0_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.led_mode = IWL_LED_RF_STATE,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.csr = &iwl_csr_v1

	.trans.csr = &iwl_csr_v1





const struct iwl_cfg iwl2030_2bgn_cfg = {

const struct iwl_cfg iwl2030_2bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 2230 BGN",

	.name = "Intel(R) Centrino(R) Wireless-N 2230 BGN",
@@ -144,17 +144,17 @@ const struct iwl_cfg iwl2030_2bgn_cfg = { 
	.fw_name_pre = IWL105_FW_PRE,				\

	.fw_name_pre = IWL105_FW_PRE,				\

	.ucode_api_max = IWL105_UCODE_API_MAX,			\

	.ucode_api_max = IWL105_UCODE_API_MAX,			\

	.ucode_api_min = IWL105_UCODE_API_MIN,			\

	.ucode_api_min = IWL105_UCODE_API_MIN,			\

	.device_family = IWL_DEVICE_FAMILY_105,			\

	.trans.device_family = IWL_DEVICE_FAMILY_105,		\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\

	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.nvm_ver = EEPROM_2000_EEPROM_VERSION,		\

	.nvm_ver = EEPROM_2000_EEPROM_VERSION,		\

	.nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\

	.nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\

	.base_params = &iwl2000_base_params,			\

	.trans.base_params = &iwl2000_base_params,		\

	.eeprom_params = &iwl20x0_eeprom_params,		\

	.eeprom_params = &iwl20x0_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.led_mode = IWL_LED_RF_STATE,				\

	.rx_with_siso_diversity = true,				\

	.rx_with_siso_diversity = true,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.csr = &iwl_csr_v1

	.trans.csr = &iwl_csr_v1





const struct iwl_cfg iwl105_bgn_cfg = {

const struct iwl_cfg iwl105_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 105 BGN",

	.name = "Intel(R) Centrino(R) Wireless-N 105 BGN",
@@ -172,17 +172,17 @@ const struct iwl_cfg iwl105_bgn_d_cfg = { 
	.fw_name_pre = IWL135_FW_PRE,				\

	.fw_name_pre = IWL135_FW_PRE,				\

	.ucode_api_max = IWL135_UCODE_API_MAX,			\

	.ucode_api_max = IWL135_UCODE_API_MAX,			\

	.ucode_api_min = IWL135_UCODE_API_MIN,			\

	.ucode_api_min = IWL135_UCODE_API_MIN,			\

	.device_family = IWL_DEVICE_FAMILY_135,			\

	.trans.device_family = IWL_DEVICE_FAMILY_135,		\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\

	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.nvm_ver = EEPROM_2000_EEPROM_VERSION,		\

	.nvm_ver = EEPROM_2000_EEPROM_VERSION,		\

	.nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\

	.nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\

	.base_params = &iwl2030_base_params,			\

	.trans.base_params = &iwl2030_base_params,		\

	.eeprom_params = &iwl20x0_eeprom_params,		\

	.eeprom_params = &iwl20x0_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.led_mode = IWL_LED_RF_STATE,				\

	.rx_with_siso_diversity = true,				\

	.rx_with_siso_diversity = true,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.csr = &iwl_csr_v1

	.trans.csr = &iwl_csr_v1





const struct iwl_cfg iwl135_bgn_cfg = {

const struct iwl_cfg iwl135_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 135 BGN",

	.name = "Intel(R) Centrino(R) Wireless-N 135 BGN",

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

+20 −26
Original line number Original line Diff line number Diff line
@@ -56,7 +56,7 @@ 
#include "iwl-config.h"

#include "iwl-config.h"





/* Highest firmware API version supported */

/* Highest firmware API version supported */

#define IWL_22000_UCODE_API_MAX	48

#define IWL_22000_UCODE_API_MAX	50





/* Lowest firmware API version supported */

/* Lowest firmware API version supported */

#define IWL_22000_UCODE_API_MIN	39

#define IWL_22000_UCODE_API_MIN	39
@@ -76,7 +76,6 @@ 
#define IWL_22000_HR_FW_PRE		"iwlwifi-Qu-a0-hr-a0-"

#define IWL_22000_HR_FW_PRE		"iwlwifi-Qu-a0-hr-a0-"

#define IWL_22000_HR_CDB_FW_PRE		"iwlwifi-QuIcp-z0-hrcdb-a0-"

#define IWL_22000_HR_CDB_FW_PRE		"iwlwifi-QuIcp-z0-hrcdb-a0-"

#define IWL_22000_HR_A_F0_FW_PRE	"iwlwifi-QuQnj-f0-hr-a0-"

#define IWL_22000_HR_A_F0_FW_PRE	"iwlwifi-QuQnj-f0-hr-a0-"

#define IWL_22000_HR_B_F0_FW_PRE	"iwlwifi-Qu-b0-hr-b0-"

#define IWL_22000_QU_B_HR_B_FW_PRE	"iwlwifi-Qu-b0-hr-b0-"

#define IWL_22000_QU_B_HR_B_FW_PRE	"iwlwifi-Qu-b0-hr-b0-"

#define IWL_22000_HR_B_FW_PRE		"iwlwifi-QuQnj-b0-hr-b0-"

#define IWL_22000_HR_B_FW_PRE		"iwlwifi-QuQnj-b0-hr-b0-"

#define IWL_22000_HR_A0_FW_PRE		"iwlwifi-QuQnj-a0-hr-a0-"

#define IWL_22000_HR_A0_FW_PRE		"iwlwifi-QuQnj-a0-hr-a0-"
@@ -99,8 +98,6 @@ 
	IWL_22000_JF_FW_PRE __stringify(api) ".ucode"

	IWL_22000_JF_FW_PRE __stringify(api) ".ucode"

#define IWL_22000_HR_A_F0_QNJ_MODULE_FIRMWARE(api) \

#define IWL_22000_HR_A_F0_QNJ_MODULE_FIRMWARE(api) \

	IWL_22000_HR_A_F0_FW_PRE __stringify(api) ".ucode"

	IWL_22000_HR_A_F0_FW_PRE __stringify(api) ".ucode"

#define IWL_22000_HR_B_F0_QNJ_MODULE_FIRMWARE(api) \

	IWL_22000_HR_B_F0_FW_PRE __stringify(api) ".ucode"

#define IWL_22000_QU_B_HR_B_MODULE_FIRMWARE(api) \

#define IWL_22000_QU_B_HR_B_MODULE_FIRMWARE(api) \

	IWL_22000_QU_B_HR_B_FW_PRE __stringify(api) ".ucode"

	IWL_22000_QU_B_HR_B_FW_PRE __stringify(api) ".ucode"

#define IWL_22000_HR_B_QNJ_MODULE_FIRMWARE(api)	\

#define IWL_22000_HR_B_QNJ_MODULE_FIRMWARE(api)	\
@@ -172,15 +169,15 @@ static const struct iwl_ht_params iwl_22000_ht_params = { 
	.smem_len = IWL_22000_SMEM_LEN,					\

	.smem_len = IWL_22000_SMEM_LEN,					\

	.features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,		\

	.features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,		\

	.apmg_not_supported = true,					\

	.apmg_not_supported = true,					\

	.mq_rx_supported = true,					\

	.trans.mq_rx_supported = true,					\

	.vht_mu_mimo_supported = true,					\

	.vht_mu_mimo_supported = true,					\

	.mac_addr_from_csr = true,					\

	.mac_addr_from_csr = true,					\

	.ht_params = &iwl_22000_ht_params,				\

	.ht_params = &iwl_22000_ht_params,				\

	.nvm_ver = IWL_22000_NVM_VERSION,				\

	.nvm_ver = IWL_22000_NVM_VERSION,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,		\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,		\

	.use_tfh = true,						\

	.trans.use_tfh = true,						\

	.rf_id = true,							\

	.trans.rf_id = true,						\

	.gen2 = true,							\

	.trans.gen2 = true,						\

	.nvm_type = IWL_NVM_EXT,					\

	.nvm_type = IWL_NVM_EXT,					\

	.dbgc_supported = true,						\

	.dbgc_supported = true,						\

	.min_umac_error_event_table = 0x400000,				\

	.min_umac_error_event_table = 0x400000,				\
@@ -191,28 +188,25 @@ static const struct iwl_ht_params iwl_22000_ht_params = { 
	.fw_mon_smem_cycle_cnt_ptr_addr = 0xa0c174,			\

	.fw_mon_smem_cycle_cnt_ptr_addr = 0xa0c174,			\

	.fw_mon_smem_cycle_cnt_ptr_msk = 0xfffff

	.fw_mon_smem_cycle_cnt_ptr_msk = 0xfffff





#define IWL_DEVICE_AX200_COMMON						\

	IWL_DEVICE_22000_COMMON,					\

	.umac_prph_offset = 0x300000



#define IWL_DEVICE_22500						\

#define IWL_DEVICE_22500						\

	IWL_DEVICE_22000_COMMON,					\

	IWL_DEVICE_22000_COMMON,					\

	.device_family = IWL_DEVICE_FAMILY_22000,			\

	.trans.device_family = IWL_DEVICE_FAMILY_22000,			\

	.base_params = &iwl_22000_base_params,				\

	.trans.base_params = &iwl_22000_base_params,			\

	.csr = &iwl_csr_v1,						\

	.trans.csr = &iwl_csr_v1,					\

	.gp2_reg_addr = 0xa02c68

	.gp2_reg_addr = 0xa02c68





#define IWL_DEVICE_22560						\

#define IWL_DEVICE_22560						\

	IWL_DEVICE_22000_COMMON,					\

	IWL_DEVICE_22000_COMMON,					\

	.device_family = IWL_DEVICE_FAMILY_22560,			\

	.trans.device_family = IWL_DEVICE_FAMILY_22560,			\

	.base_params = &iwl_22560_base_params,				\

	.trans.base_params = &iwl_22560_base_params,			\

	.csr = &iwl_csr_v2

	.trans.csr = &iwl_csr_v2





#define IWL_DEVICE_AX210						\

#define IWL_DEVICE_AX210						\

	IWL_DEVICE_AX200_COMMON,					\

	IWL_DEVICE_22000_COMMON,					\

	.device_family = IWL_DEVICE_FAMILY_AX210,			\

	.trans.umac_prph_offset = 0x300000,				\

	.base_params = &iwl_22560_base_params,				\

	.trans.device_family = IWL_DEVICE_FAMILY_AX210,			\

	.csr = &iwl_csr_v1,						\

	.trans.base_params = &iwl_22560_base_params,			\

	.trans.csr = &iwl_csr_v1,					\

	.min_txq_size = 128,						\

	.min_txq_size = 128,						\

	.gp2_reg_addr = 0xd02c68,					\

	.gp2_reg_addr = 0xd02c68,					\

	.min_256_ba_txq_size = 512

	.min_256_ba_txq_size = 512
@@ -246,6 +240,7 @@ const struct iwl_cfg iwl_ax101_cfg_qu_hr = { 
	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.tx_with_siso_diversity = true,

};

};





const struct iwl_cfg iwl_ax201_cfg_qu_hr = {

const struct iwl_cfg iwl_ax201_cfg_qu_hr = {
@@ -342,7 +337,7 @@ const struct iwl_cfg iwl_ax200_cfg_cc = { 
	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.bisr_workaround = 1,

	.trans.bisr_workaround = 1,

};

};





const struct iwl_cfg killer1650x_2ax_cfg = {

const struct iwl_cfg killer1650x_2ax_cfg = {
@@ -355,7 +350,7 @@ const struct iwl_cfg killer1650x_2ax_cfg = { 
	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.bisr_workaround = 1,

	.trans.bisr_workaround = 1,

};

};





const struct iwl_cfg killer1650w_2ax_cfg = {

const struct iwl_cfg killer1650w_2ax_cfg = {
@@ -368,7 +363,7 @@ const struct iwl_cfg killer1650w_2ax_cfg = { 
	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.bisr_workaround = 1,

	.trans.bisr_workaround = 1,

};

};





/*

/*
@@ -663,7 +658,6 @@ const struct iwl_cfg iwlax411_2ax_cfg_so_gf4_a0 = { 
MODULE_FIRMWARE(IWL_22000_HR_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_HR_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_JF_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_JF_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_HR_A_F0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_HR_A_F0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_HR_B_F0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_HR_B_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_HR_B_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_HR_A0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_HR_A0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_QU_C_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_QU_C_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

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

+9 −9
Original line number Original line Diff line number Diff line
@@ -67,16 +67,16 @@ static const struct iwl_eeprom_params iwl5000_eeprom_params = { 
	.fw_name_pre = IWL5000_FW_PRE,				\

	.fw_name_pre = IWL5000_FW_PRE,				\

	.ucode_api_max = IWL5000_UCODE_API_MAX,			\

	.ucode_api_max = IWL5000_UCODE_API_MAX,			\

	.ucode_api_min = IWL5000_UCODE_API_MIN,			\

	.ucode_api_min = IWL5000_UCODE_API_MIN,			\

	.device_family = IWL_DEVICE_FAMILY_5000,		\

	.trans.device_family = IWL_DEVICE_FAMILY_5000,		\

	.max_inst_size = IWLAGN_RTC_INST_SIZE,			\

	.max_inst_size = IWLAGN_RTC_INST_SIZE,			\

	.max_data_size = IWLAGN_RTC_DATA_SIZE,			\

	.max_data_size = IWLAGN_RTC_DATA_SIZE,			\

	.nvm_ver = EEPROM_5000_EEPROM_VERSION,		\

	.nvm_ver = EEPROM_5000_EEPROM_VERSION,		\

	.nvm_calib_ver = EEPROM_5000_TX_POWER_VERSION,	\

	.nvm_calib_ver = EEPROM_5000_TX_POWER_VERSION,	\

	.base_params = &iwl5000_base_params,			\

	.trans.base_params = &iwl5000_base_params,		\

	.eeprom_params = &iwl5000_eeprom_params,		\

	.eeprom_params = &iwl5000_eeprom_params,		\

	.led_mode = IWL_LED_BLINK,				\

	.led_mode = IWL_LED_BLINK,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.csr = &iwl_csr_v1

	.trans.csr = &iwl_csr_v1





const struct iwl_cfg iwl5300_agn_cfg = {

const struct iwl_cfg iwl5300_agn_cfg = {

	.name = "Intel(R) Ultimate N WiFi Link 5300 AGN",

	.name = "Intel(R) Ultimate N WiFi Link 5300 AGN",
@@ -115,34 +115,34 @@ const struct iwl_cfg iwl5350_agn_cfg = { 
	.fw_name_pre = IWL5000_FW_PRE,

	.fw_name_pre = IWL5000_FW_PRE,

	.ucode_api_max = IWL5000_UCODE_API_MAX,

	.ucode_api_max = IWL5000_UCODE_API_MAX,

	.ucode_api_min = IWL5000_UCODE_API_MIN,

	.ucode_api_min = IWL5000_UCODE_API_MIN,

	.device_family = IWL_DEVICE_FAMILY_5000,

	.trans.device_family = IWL_DEVICE_FAMILY_5000,

	.max_inst_size = IWLAGN_RTC_INST_SIZE,

	.max_inst_size = IWLAGN_RTC_INST_SIZE,

	.max_data_size = IWLAGN_RTC_DATA_SIZE,

	.max_data_size = IWLAGN_RTC_DATA_SIZE,

	.nvm_ver = EEPROM_5050_EEPROM_VERSION,

	.nvm_ver = EEPROM_5050_EEPROM_VERSION,

	.nvm_calib_ver = EEPROM_5050_TX_POWER_VERSION,

	.nvm_calib_ver = EEPROM_5050_TX_POWER_VERSION,

	.base_params = &iwl5000_base_params,

	.trans.base_params = &iwl5000_base_params,

	.eeprom_params = &iwl5000_eeprom_params,

	.eeprom_params = &iwl5000_eeprom_params,

	.ht_params = &iwl5000_ht_params,

	.ht_params = &iwl5000_ht_params,

	.led_mode = IWL_LED_BLINK,

	.led_mode = IWL_LED_BLINK,

	.internal_wimax_coex = true,

	.internal_wimax_coex = true,

	.csr = &iwl_csr_v1,

	.trans.csr = &iwl_csr_v1,

};

};





#define IWL_DEVICE_5150						\

#define IWL_DEVICE_5150						\

	.fw_name_pre = IWL5150_FW_PRE,				\

	.fw_name_pre = IWL5150_FW_PRE,				\

	.ucode_api_max = IWL5150_UCODE_API_MAX,			\

	.ucode_api_max = IWL5150_UCODE_API_MAX,			\

	.ucode_api_min = IWL5150_UCODE_API_MIN,			\

	.ucode_api_min = IWL5150_UCODE_API_MIN,			\

	.device_family = IWL_DEVICE_FAMILY_5150,		\

	.trans.device_family = IWL_DEVICE_FAMILY_5150,		\

	.max_inst_size = IWLAGN_RTC_INST_SIZE,			\

	.max_inst_size = IWLAGN_RTC_INST_SIZE,			\

	.max_data_size = IWLAGN_RTC_DATA_SIZE,			\

	.max_data_size = IWLAGN_RTC_DATA_SIZE,			\

	.nvm_ver = EEPROM_5050_EEPROM_VERSION,		\

	.nvm_ver = EEPROM_5050_EEPROM_VERSION,		\

	.nvm_calib_ver = EEPROM_5050_TX_POWER_VERSION,	\

	.nvm_calib_ver = EEPROM_5050_TX_POWER_VERSION,	\

	.base_params = &iwl5000_base_params,			\

	.trans.base_params = &iwl5000_base_params,		\

	.eeprom_params = &iwl5000_eeprom_params,		\

	.eeprom_params = &iwl5000_eeprom_params,		\

	.led_mode = IWL_LED_BLINK,				\

	.led_mode = IWL_LED_BLINK,				\

	.internal_wimax_coex = true,				\

	.internal_wimax_coex = true,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.csr = &iwl_csr_v1

	.trans.csr = &iwl_csr_v1





const struct iwl_cfg iwl5150_agn_cfg = {

const struct iwl_cfg iwl5150_agn_cfg = {

	.name = "Intel(R) WiMAX/WiFi Link 5150 AGN",

	.name = "Intel(R) WiMAX/WiFi Link 5150 AGN",