Commit 647d2886 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2018-08-31' of... 

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

iwlwifi patches for 4.20

* One fix for channel-switch handling;
* Some improvements in the HE code;
* New FW API handling;
* Improvements in the debugging code;
* Some improvements in the PCI recovery mechanism;
* Support for a few FW API changes;
* Enable a new scanning feature;
* Continued work on HE (mostly radiotap);
* Some fixes in the FW rate-scaling implementation;
* Other clean-ups and small fixes and improvements;
parents 9cac6a9b ab27926d

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

+0 −4
Original line number Diff line number Diff line
@@ -12,10 +12,6 @@ 
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 * You should have received a copy of the GNU General Public License along with

 * this program; if not, write to the Free Software Foundation, Inc.,

 * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA

 *

 * The full GNU General Public License is included in this distribution in the

 * file called LICENSE.

 *

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

+0 −4
Original line number Diff line number Diff line
@@ -12,10 +12,6 @@ 
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 * You should have received a copy of the GNU General Public License along with

 * this program; if not, write to the Free Software Foundation, Inc.,

 * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA

 *

 * The full GNU General Public License is included in this distribution in the

 * file called LICENSE.

 *

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

+65 −4
Original line number Diff line number Diff line
@@ -77,10 +77,13 @@ 
#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_A_F0_FW_PRE	"iwlwifi-QuQnj-f0-hr-a0-"

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

#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_HR_B_FW_PRE		"iwlwifi-QuQnj-b0-hr-b0-"

#define IWL_22000_JF_B0_FW_PRE		"iwlwifi-QuQnj-a0-jf-b0-"

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

#define IWL_22000_SU_Z0_FW_PRE		"iwlwifi-su-z0-"

#define IWL_QU_B_JF_B_FW_PRE		"iwlwifi-Qu-b0-jf-b0-"



#define IWL_22000_HR_MODULE_FIRMWARE(api) \

	IWL_22000_HR_FW_PRE __stringify(api) ".ucode"
@@ -88,6 +91,10 @@ 
	IWL_22000_JF_FW_PRE __stringify(api) ".ucode"

#define IWL_22000_HR_A_F0_QNJ_MODULE_FIRMWARE(api) \

	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) \

	IWL_22000_QU_B_HR_B_FW_PRE __stringify(api) ".ucode"

#define IWL_22000_HR_B_QNJ_MODULE_FIRMWARE(api)	\

	IWL_22000_HR_B_FW_PRE __stringify(api) ".ucode"

#define IWL_22000_JF_B0_QNJ_MODULE_FIRMWARE(api) \
@@ -96,6 +103,8 @@ 
	IWL_22000_HR_A0_FW_PRE __stringify(api) ".ucode"

#define IWL_22000_SU_Z0_MODULE_FIRMWARE(api) \

	IWL_22000_SU_Z0_FW_PRE __stringify(api) ".ucode"

#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
@@ -155,7 +164,9 @@ static const struct iwl_ht_params iwl_22000_ht_params = { 
	.gen2 = true,							\

	.nvm_type = IWL_NVM_EXT,					\

	.dbgc_supported = true,						\

	.min_umac_error_event_table = 0x400000

	.min_umac_error_event_table = 0x400000,				\

	.d3_debug_data_base_addr = 0x401000,				\

	.d3_debug_data_length = 60 * 1024



#define IWL_DEVICE_22500						\

	IWL_DEVICE_22000_COMMON,					\
@@ -190,7 +201,54 @@ const struct iwl_cfg iwl22000_2ac_cfg_jf = { 


const struct iwl_cfg iwl22000_2ax_cfg_hr = {

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

	.fw_name_pre = IWL_22000_HR_FW_PRE,

	.fw_name_pre = IWL_22000_QU_B_HR_B_FW_PRE,

	IWL_DEVICE_22500,

	/*

	 * This device doesn't support receiving BlockAck with a large bitmap

	 * so we need to restrict the size of transmitted aggregation to the

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

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

};



/*

 * All JF radio modules are part of the 9000 series, but the MAC part

 * looks more like 22000.  That's why this device is here, but called

 * 9560 nevertheless.

 */

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,

};



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,

};



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,

};



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,

};



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,

};



const struct iwl_cfg iwl22000_2ax_cfg_jf = {

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

	.fw_name_pre = IWL_QU_B_JF_B_FW_PRE,

	IWL_DEVICE_22500,

	/*

	 * This device doesn't support receiving BlockAck with a large bitmap
@@ -264,7 +322,10 @@ const struct iwl_cfg iwl22560_2ax_cfg_su_cdb = { 
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_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_QU_B_HR_B_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_JF_B0_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_SU_Z0_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_QU_B_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

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

+0 −4
Original line number Diff line number Diff line
@@ -12,10 +12,6 @@ 
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 * You should have received a copy of the GNU General Public License along with

 * this program; if not, write to the Free Software Foundation, Inc.,

 * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA

 *

 * The full GNU General Public License is included in this distribution in the

 * file called LICENSE.

 *

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

+0 −4
Original line number Diff line number Diff line
@@ -12,10 +12,6 @@ 
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 * You should have received a copy of the GNU General Public License along with

 * this program; if not, write to the Free Software Foundation, Inc.,

 * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA

 *

 * The full GNU General Public License is included in this distribution in the

 * file called LICENSE.

 *

CRA Git | Maintained and supported by SUSTech CRA and CCSE