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

Merge tag 'iwlwifi-next-for-kalle-2020-01-11' of... 

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

First set of patches intended for v5.6

* Support new versions of the FTM FW APIs;
* Fix an old bug in D3 (WoWLAN);
* A couple of fixes/improvements in the receive-buffers code;
* Fix in the debugging where we were skipping one TXQ;
* Support new version of the beacon template FW API;
* Print some extra information when the driver is loaded;
* Some debugging infrastructure (aka. yoyo) updates;
* Support for a new HW version;
* Second phase of device configuration work started;
* Some clean-ups;
parents e07c5f2e 0b295a1e

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

+2 −4
Original line number Diff line number Diff line
@@ -77,8 +77,7 @@ static const struct iwl_eeprom_params iwl1000_eeprom_params = { 
	.trans.base_params = &iwl1000_base_params,		\

	.eeprom_params = &iwl1000_eeprom_params,		\

	.led_mode = IWL_LED_BLINK,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.trans.csr = &iwl_csr_v1

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K



const struct iwl_cfg iwl1000_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 1000 BGN",
@@ -104,8 +103,7 @@ const struct iwl_cfg iwl1000_bg_cfg = { 
	.eeprom_params = &iwl1000_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.rx_with_siso_diversity = true,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.trans.csr = &iwl_csr_v1

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K



const struct iwl_cfg iwl100_bgn_cfg = {

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

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

+4 −8
Original line number Diff line number Diff line
@@ -103,8 +103,7 @@ static const struct iwl_eeprom_params iwl20x0_eeprom_params = { 
	.trans.base_params = &iwl2000_base_params,		\

	.eeprom_params = &iwl20x0_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.trans.csr = &iwl_csr_v1

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K





const struct iwl_cfg iwl2000_2bgn_cfg = {
@@ -131,8 +130,7 @@ const struct iwl_cfg iwl2000_2bgn_d_cfg = { 
	.trans.base_params = &iwl2030_base_params,		\

	.eeprom_params = &iwl20x0_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.trans.csr = &iwl_csr_v1

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K



const struct iwl_cfg iwl2030_2bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 2230 BGN",
@@ -153,8 +151,7 @@ const struct iwl_cfg iwl2030_2bgn_cfg = { 
	.eeprom_params = &iwl20x0_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.rx_with_siso_diversity = true,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.trans.csr = &iwl_csr_v1

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K



const struct iwl_cfg iwl105_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 105 BGN",
@@ -181,8 +178,7 @@ const struct iwl_cfg iwl105_bgn_d_cfg = { 
	.eeprom_params = &iwl20x0_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.rx_with_siso_diversity = true,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.trans.csr = &iwl_csr_v1

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K



const struct iwl_cfg iwl135_bgn_cfg = {

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

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

+61 −20
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ 
#define IWL_22000_SO_A_GF_A_FW_PRE      "iwlwifi-so-a0-gf-a0-"

#define IWL_22000_TY_A_GF_A_FW_PRE      "iwlwifi-ty-a0-gf-a0-"

#define IWL_22000_SO_A_GF4_A_FW_PRE     "iwlwifi-so-a0-gf4-a0-"

#define IWL_22000_SOSNJ_A_GF4_A_FW_PRE  "iwlwifi-SoSnj-a0-gf4-a0-"



#define IWL_22000_HR_MODULE_FIRMWARE(api) \

	IWL_22000_HR_FW_PRE __stringify(api) ".ucode"
@@ -199,7 +200,6 @@ static const struct iwl_ht_params iwl_22000_ht_params = { 
	IWL_DEVICE_22000_COMMON,					\

	.trans.device_family = IWL_DEVICE_FAMILY_22000,			\

	.trans.base_params = &iwl_22000_base_params,			\

	.trans.csr = &iwl_csr_v1,					\

	.gp2_reg_addr = 0xa02c68,					\

	.mon_dram_regs = {						\

		.write_ptr = {						\
@@ -217,7 +217,6 @@ static const struct iwl_ht_params iwl_22000_ht_params = { 
	.trans.umac_prph_offset = 0x300000,				\

	.trans.device_family = IWL_DEVICE_FAMILY_AX210,			\

	.trans.base_params = &iwl_ax210_base_params,			\

	.trans.csr = &iwl_csr_v1,					\

	.min_txq_size = 128,						\

	.gp2_reg_addr = 0xd02c68,					\

	.min_256_ba_txq_size = 512,					\
@@ -236,24 +235,16 @@ static const struct iwl_ht_params iwl_22000_ht_params = { 
		},							\

	}



const struct iwl_cfg iwl22000_2ac_cfg_hr = {

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

	.fw_name_pre = IWL_22000_HR_FW_PRE,

	IWL_DEVICE_22500,

};



const struct iwl_cfg iwl22000_2ac_cfg_hr_cdb = {

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

	.fw_name_pre = IWL_22000_HR_CDB_FW_PRE,

	IWL_DEVICE_22500,

	.cdb = true,

};



const struct iwl_cfg iwl22000_2ac_cfg_jf = {

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

	.fw_name_pre = IWL_22000_JF_FW_PRE,

	IWL_DEVICE_22500,

};

/*

 * If the device doesn't support HE, no need to have that many buffers.

 * 22000 devices can split multiple frames into a single RB, so fewer are

 * needed; AX210 cannot (but use smaller RBs by default) - these sizes

 * were picked according to 8 MSDUs inside 256 A-MSDUs in an A-MPDU, with

 * additional overhead to account for processing time.

 */

#define IWL_NUM_RBDS_NON_HE		512

#define IWL_NUM_RBDS_22000_HE		2048

#define IWL_NUM_RBDS_AX210_HE		4096



const struct iwl_cfg iwl_ax101_cfg_qu_hr = {

	.name = "Intel(R) Wi-Fi 6 AX101",
@@ -266,6 +257,7 @@ const struct iwl_cfg iwl_ax101_cfg_qu_hr = { 
	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.tx_with_siso_diversity = true,

	.num_rbds = IWL_NUM_RBDS_22000_HE,

};



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

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.num_rbds = IWL_NUM_RBDS_22000_HE,

};



const struct iwl_cfg iwl_ax101_cfg_qu_c0_hr_b0 = {
@@ -290,6 +283,7 @@ const struct iwl_cfg iwl_ax101_cfg_qu_c0_hr_b0 = { 
	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.num_rbds = IWL_NUM_RBDS_22000_HE,

};



const struct iwl_cfg iwl_ax201_cfg_qu_c0_hr_b0 = {
@@ -302,6 +296,7 @@ const struct iwl_cfg iwl_ax201_cfg_qu_c0_hr_b0 = { 
	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.num_rbds = IWL_NUM_RBDS_22000_HE,

};



const struct iwl_cfg iwl_ax101_cfg_quz_hr = {
@@ -314,6 +309,7 @@ const struct iwl_cfg iwl_ax101_cfg_quz_hr = { 
	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.num_rbds = IWL_NUM_RBDS_22000_HE,

};



const struct iwl_cfg iwl_ax201_cfg_quz_hr = {
@@ -326,6 +322,7 @@ const struct iwl_cfg iwl_ax201_cfg_quz_hr = { 
         * HT size; mac80211 would otherwise pick the HE max (256) by default.

         */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.num_rbds = IWL_NUM_RBDS_22000_HE,

};



const struct iwl_cfg iwl_ax1650s_cfg_quz_hr = {
@@ -338,6 +335,7 @@ const struct iwl_cfg iwl_ax1650s_cfg_quz_hr = { 
         * HT size; mac80211 would otherwise pick the HE max (256) by default.

         */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.num_rbds = IWL_NUM_RBDS_22000_HE,

};



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

         */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.num_rbds = IWL_NUM_RBDS_22000_HE,

};



const struct iwl_cfg iwl_ax200_cfg_cc = {
@@ -363,6 +362,7 @@ const struct iwl_cfg iwl_ax200_cfg_cc = { 
	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.trans.bisr_workaround = 1,

	.num_rbds = IWL_NUM_RBDS_22000_HE,

};



const struct iwl_cfg killer1650x_2ax_cfg = {
@@ -376,6 +376,7 @@ const struct iwl_cfg killer1650x_2ax_cfg = { 
	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.trans.bisr_workaround = 1,

	.num_rbds = IWL_NUM_RBDS_22000_HE,

};



const struct iwl_cfg killer1650w_2ax_cfg = {
@@ -389,6 +390,7 @@ const struct iwl_cfg killer1650w_2ax_cfg = { 
	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.trans.bisr_workaround = 1,

	.num_rbds = IWL_NUM_RBDS_22000_HE,

};



/*
@@ -400,48 +402,56 @@ const struct iwl_cfg iwl9461_2ac_cfg_qu_b0_jf_b0 = { 
	.name = "Intel(R) Wireless-AC 9461",

	.fw_name_pre = IWL_QU_B_JF_B_FW_PRE,

	IWL_DEVICE_22500,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg iwl9462_2ac_cfg_qu_b0_jf_b0 = {

	.name = "Intel(R) Wireless-AC 9462",

	.fw_name_pre = IWL_QU_B_JF_B_FW_PRE,

	IWL_DEVICE_22500,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg iwl9560_2ac_cfg_qu_b0_jf_b0 = {

	.name = "Intel(R) Wireless-AC 9560",

	.fw_name_pre = IWL_QU_B_JF_B_FW_PRE,

	IWL_DEVICE_22500,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg iwl9560_2ac_160_cfg_qu_b0_jf_b0 = {

	.name = "Intel(R) Wireless-AC 9560 160MHz",

	.fw_name_pre = IWL_QU_B_JF_B_FW_PRE,

	IWL_DEVICE_22500,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg iwl9461_2ac_cfg_qu_c0_jf_b0 = {

	.name = "Intel(R) Wireless-AC 9461",

	.fw_name_pre = IWL_QU_C_JF_B_FW_PRE,

	IWL_DEVICE_22500,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg iwl9462_2ac_cfg_qu_c0_jf_b0 = {

	.name = "Intel(R) Wireless-AC 9462",

	.fw_name_pre = IWL_QU_C_JF_B_FW_PRE,

	IWL_DEVICE_22500,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg iwl9560_2ac_cfg_qu_c0_jf_b0 = {

	.name = "Intel(R) Wireless-AC 9560",

	.fw_name_pre = IWL_QU_C_JF_B_FW_PRE,

	IWL_DEVICE_22500,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg iwl9560_2ac_160_cfg_qu_c0_jf_b0 = {

	.name = "Intel(R) Wireless-AC 9560 160MHz",

	.fw_name_pre = IWL_QU_C_JF_B_FW_PRE,

	IWL_DEVICE_22500,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg iwl9560_2ac_cfg_qnj_jf_b0 = {
@@ -454,6 +464,7 @@ const struct iwl_cfg iwl9560_2ac_cfg_qnj_jf_b0 = { 
	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg iwl9560_2ac_cfg_quz_a0_jf_b0_soc = {
@@ -468,6 +479,7 @@ const struct iwl_cfg iwl9560_2ac_cfg_quz_a0_jf_b0_soc = { 
	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.integrated = true,

	.soc_latency = 5000,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg iwl9560_2ac_160_cfg_quz_a0_jf_b0_soc = {
@@ -482,6 +494,7 @@ const struct iwl_cfg iwl9560_2ac_160_cfg_quz_a0_jf_b0_soc = { 
	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.integrated = true,

	.soc_latency = 5000,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg iwl9461_2ac_cfg_quz_a0_jf_b0_soc = {
@@ -496,6 +509,7 @@ const struct iwl_cfg iwl9461_2ac_cfg_quz_a0_jf_b0_soc = { 
	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.integrated = true,

	.soc_latency = 5000,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg iwl9462_2ac_cfg_quz_a0_jf_b0_soc = {
@@ -510,6 +524,7 @@ const struct iwl_cfg iwl9462_2ac_cfg_quz_a0_jf_b0_soc = { 
	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.integrated = true,

	.soc_latency = 5000,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg iwl9560_killer_s_2ac_cfg_quz_a0_jf_b0_soc = {
@@ -524,6 +539,7 @@ const struct iwl_cfg iwl9560_killer_s_2ac_cfg_quz_a0_jf_b0_soc = { 
	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.integrated = true,

	.soc_latency = 5000,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg iwl9560_killer_i_2ac_cfg_quz_a0_jf_b0_soc = {
@@ -538,18 +554,21 @@ const struct iwl_cfg iwl9560_killer_i_2ac_cfg_quz_a0_jf_b0_soc = { 
	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.integrated = true,

	.soc_latency = 5000,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg killer1550i_2ac_cfg_qu_b0_jf_b0 = {

	.name = "Killer (R) Wireless-AC 1550i Wireless Network Adapter (9560NGW)",

	.fw_name_pre = IWL_QU_B_JF_B_FW_PRE,

	IWL_DEVICE_22500,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg killer1550s_2ac_cfg_qu_b0_jf_b0 = {

	.name = "Killer (R) Wireless-AC 1550s Wireless Network Adapter (9560NGW)",

	.fw_name_pre = IWL_QU_B_JF_B_FW_PRE,

	IWL_DEVICE_22500,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg killer1650s_2ax_cfg_qu_b0_hr_b0 = {
@@ -562,6 +581,7 @@ const struct iwl_cfg killer1650s_2ax_cfg_qu_b0_hr_b0 = { 
	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.num_rbds = IWL_NUM_RBDS_22000_HE,

};



const struct iwl_cfg killer1650i_2ax_cfg_qu_b0_hr_b0 = {
@@ -574,6 +594,7 @@ const struct iwl_cfg killer1650i_2ax_cfg_qu_b0_hr_b0 = { 
	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.num_rbds = IWL_NUM_RBDS_22000_HE,

};



const struct iwl_cfg killer1650s_2ax_cfg_qu_c0_hr_b0 = {
@@ -586,6 +607,7 @@ const struct iwl_cfg killer1650s_2ax_cfg_qu_c0_hr_b0 = { 
	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.num_rbds = IWL_NUM_RBDS_22000_HE,

};



const struct iwl_cfg killer1650i_2ax_cfg_qu_c0_hr_b0 = {
@@ -598,6 +620,7 @@ const struct iwl_cfg killer1650i_2ax_cfg_qu_c0_hr_b0 = { 
	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.num_rbds = IWL_NUM_RBDS_22000_HE,

};



const struct iwl_cfg iwl22000_2ax_cfg_jf = {
@@ -610,6 +633,7 @@ const struct iwl_cfg iwl22000_2ax_cfg_jf = { 
	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.num_rbds = IWL_NUM_RBDS_22000_HE,

};



const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_a0_f0 = {
@@ -622,6 +646,7 @@ const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_a0_f0 = { 
	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.num_rbds = IWL_NUM_RBDS_22000_HE,

};



const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_b0 = {
@@ -634,6 +659,7 @@ const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_b0 = { 
	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.num_rbds = IWL_NUM_RBDS_22000_HE,

};



const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_a0 = {
@@ -646,18 +672,21 @@ const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_a0 = { 
	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.num_rbds = IWL_NUM_RBDS_22000_HE,

};



const struct iwl_cfg iwlax210_2ax_cfg_so_jf_a0 = {

	.name = "Intel(R) Wireless-AC 9560 160MHz",

	.fw_name_pre = IWL_22000_SO_A_JF_B_FW_PRE,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg iwlax210_2ax_cfg_so_hr_a0 = {

	.name = "Intel(R) Wi-Fi 7 AX210 160MHz",

	.fw_name_pre = IWL_22000_SO_A_HR_B_FW_PRE,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwlax211_2ax_cfg_so_gf_a0 = {
@@ -665,6 +694,7 @@ const struct iwl_cfg iwlax211_2ax_cfg_so_gf_a0 = { 
	.fw_name_pre = IWL_22000_SO_A_GF_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwlax210_2ax_cfg_ty_gf_a0 = {
@@ -672,12 +702,23 @@ const struct iwl_cfg iwlax210_2ax_cfg_ty_gf_a0 = { 
	.fw_name_pre = IWL_22000_TY_A_GF_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwlax411_2ax_cfg_so_gf4_a0 = {

	.name = "Intel(R) Wi-Fi 7 AX411 160MHz",

	.fw_name_pre = IWL_22000_SO_A_GF4_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwlax411_2ax_cfg_sosnj_gf4_a0 = {

	.name = "Intel(R) Wi-Fi 7 AX411 160MHz",

	.fw_name_pre = IWL_22000_SOSNJ_A_GF4_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



MODULE_FIRMWARE(IWL_22000_HR_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

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

+2 −5
Original line number Diff line number Diff line
@@ -75,8 +75,7 @@ static const struct iwl_eeprom_params iwl5000_eeprom_params = { 
	.trans.base_params = &iwl5000_base_params,		\

	.eeprom_params = &iwl5000_eeprom_params,		\

	.led_mode = IWL_LED_BLINK,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.trans.csr = &iwl_csr_v1

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K



const struct iwl_cfg iwl5300_agn_cfg = {

	.name = "Intel(R) Ultimate N WiFi Link 5300 AGN",
@@ -125,7 +124,6 @@ const struct iwl_cfg iwl5350_agn_cfg = { 
	.ht_params = &iwl5000_ht_params,

	.led_mode = IWL_LED_BLINK,

	.internal_wimax_coex = true,

	.trans.csr = &iwl_csr_v1,

};



#define IWL_DEVICE_5150						\
@@ -141,8 +139,7 @@ const struct iwl_cfg iwl5350_agn_cfg = { 
	.eeprom_params = &iwl5000_eeprom_params,		\

	.led_mode = IWL_LED_BLINK,				\

	.internal_wimax_coex = true,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.trans.csr = &iwl_csr_v1

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K



const struct iwl_cfg iwl5150_agn_cfg = {

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

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

+6 −13
Original line number Diff line number Diff line
@@ -124,8 +124,7 @@ static const struct iwl_eeprom_params iwl6000_eeprom_params = { 
	.trans.base_params = &iwl6000_g2_base_params,		\

	.eeprom_params = &iwl6000_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.trans.csr = &iwl_csr_v1

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K



const struct iwl_cfg iwl6005_2agn_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6205 AGN",
@@ -179,8 +178,7 @@ const struct iwl_cfg iwl6005_2agn_mow2_cfg = { 
	.trans.base_params = &iwl6000_g2_base_params,		\

	.eeprom_params = &iwl6000_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.trans.csr = &iwl_csr_v1

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K



const struct iwl_cfg iwl6030_2agn_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6230 AGN",
@@ -216,8 +214,7 @@ const struct iwl_cfg iwl6030_2bg_cfg = { 
	.trans.base_params = &iwl6000_g2_base_params,		\

	.eeprom_params = &iwl6000_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.trans.csr = &iwl_csr_v1

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K



const struct iwl_cfg iwl6035_2agn_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6235 AGN",
@@ -272,8 +269,7 @@ const struct iwl_cfg iwl130_bg_cfg = { 
	.trans.base_params = &iwl6000_base_params,		\

	.eeprom_params = &iwl6000_eeprom_params,		\

	.led_mode = IWL_LED_BLINK,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.trans.csr = &iwl_csr_v1

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K



const struct iwl_cfg iwl6000i_2agn_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6200 AGN",
@@ -306,8 +302,7 @@ const struct iwl_cfg iwl6000i_2bg_cfg = { 
	.eeprom_params = &iwl6000_eeprom_params,		\

	.led_mode = IWL_LED_BLINK,				\

	.internal_wimax_coex = true,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.trans.csr = &iwl_csr_v1

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K



const struct iwl_cfg iwl6050_2agn_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N + WiMAX 6250 AGN",
@@ -333,8 +328,7 @@ const struct iwl_cfg iwl6050_2abg_cfg = { 
	.eeprom_params = &iwl6000_eeprom_params,		\

	.led_mode = IWL_LED_BLINK,				\

	.internal_wimax_coex = true,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.trans.csr = &iwl_csr_v1

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K



const struct iwl_cfg iwl6150_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N + WiMAX 6150 BGN",
@@ -361,7 +355,6 @@ const struct iwl_cfg iwl6000_3agn_cfg = { 
	.eeprom_params = &iwl6000_eeprom_params,

	.ht_params = &iwl6000_ht_params,

	.led_mode = IWL_LED_BLINK,

	.trans.csr = &iwl_csr_v1,

};



MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX));

CRA Git | Maintained and supported by SUSTech CRA and CCSE