Commit 81edb6ad authored by Luca Coelho's avatar Luca Coelho
Browse files

iwlwifi: start using B-step for some 9000 devices 



We don't support A-step for some device combinations anymore.  So
change them to use B-step, renaming and reorganizing the config
structures.  Additionally, fix one device that was using the wrong
configuration.

Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 937b10c0

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

+19 −17
Original line number Diff line number Diff line
@@ -79,10 +79,10 @@ 
#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_QNJ_B_JF_B_FW_PRE		"iwlwifi-QuQnj-b0-jf-b0-"

#define IWL_CC_A_FW_PRE			"iwlwifi-cc-a0-"

#define IWL_22000_SO_A_JF_B_FW_PRE	"iwlwifi-so-a0-jf-b0-"

#define IWL_22000_SO_A_HR_B_FW_PRE      "iwlwifi-so-a0-hr-b0-"
@@ -101,14 +101,16 @@ 
	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) \

	IWL_22000_JF_B0_FW_PRE __stringify(api) ".ucode"

#define IWL_22000_HR_A0_QNJ_MODULE_FIRMWARE(api) \

	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 IWL_QU_B_JF_B_MODULE_FIRMWARE(api) \

	IWL_QU_B_JF_B_FW_PRE __stringify(api) ".ucode"

#define IWL_QNJ_B_JF_B_MODULE_FIRMWARE(api)		\

	IWL_QNJ_B_JF_B_FW_PRE __stringify(api) ".ucode"

#define IWL_CC_A_MODULE_FIRMWARE(api)			\

	IWL_CC_A_FW_PRE __stringify(api) ".ucode"

#define IWL_22000_SO_A_JF_B_MODULE_FIRMWARE(api) \
@@ -301,6 +303,18 @@ const struct iwl_cfg iwl9560_2ac_160_cfg_qu_b0_jf_b0 = { 
	IWL_DEVICE_22500,

};



const struct iwl_cfg iwl9560_2ac_cfg_qnj_jf_b0 = {

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

	.fw_name_pre = IWL_QNJ_B_JF_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,

};



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,
@@ -373,18 +387,6 @@ const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_b0 = { 
	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

};



const struct iwl_cfg iwl22000_2ax_cfg_qnj_jf_b0 = {

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

	.fw_name_pre = IWL_22000_JF_B0_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,

};



const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_a0 = {

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

	.fw_name_pre = IWL_22000_HR_A0_FW_PRE,
@@ -439,10 +441,10 @@ 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_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));

MODULE_FIRMWARE(IWL_QNJ_B_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_CC_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_SO_A_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_SO_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

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

+1 −1
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ extern const struct iwl_cfg iwl22000_2ax_cfg_jf; 
extern const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_a0_f0;

extern const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_b0_f0;

extern const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_b0;

extern const struct iwl_cfg iwl22000_2ax_cfg_qnj_jf_b0;

extern const struct iwl_cfg iwl9560_2ac_cfg_qnj_jf_b0;

extern const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_a0;

extern const struct iwl_cfg iwl22560_2ax_cfg_su_cdb;

extern const struct iwl_cfg iwlax210_2ax_cfg_so_jf_a0;

drivers/net/wireless/intel/iwlwifi/pcie/drv.c

+4 −4
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
 * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2016-2017 Intel Deutschland GmbH

 * Copyright(c) 2018        Intel Corporation

 * Copyright(c) 2018 - 2019 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -32,7 +32,7 @@ 
 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * All rights reserved.

 * Copyright(c) 2017 Intel Deutschland GmbH

 * Copyright(c) 2018        Intel Corporation

 * Copyright(c) 2018 - 2019 Intel Corporation

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions
@@ -872,6 +872,7 @@ static const struct pci_device_id iwl_hw_card_ids[] = { 
	{IWL_PCI_DEVICE(0xA370, 0x40A4, iwl9462_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0xA370, 0x4234, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0xA370, 0x42A4, iwl9462_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x2720, 0x0030, iwl9560_2ac_cfg_qnj_jf_b0)},



/* 22000 Series */

	{IWL_PCI_DEVICE(0x02F0, 0x0070, iwl22560_2ax_cfg_hr)},
@@ -891,7 +892,6 @@ static const struct pci_device_id iwl_hw_card_ids[] = { 
	{IWL_PCI_DEVICE(0x06F0, 0x1652, killer1650i_2ax_cfg_qu_b0_hr_b0)},

	{IWL_PCI_DEVICE(0x06F0, 0x4070, iwl22560_2ax_cfg_hr)},

	{IWL_PCI_DEVICE(0x2720, 0x0000, iwl22560_2ax_cfg_hr)},

	{IWL_PCI_DEVICE(0x2720, 0x0030, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x2720, 0x0040, iwl22560_2ax_cfg_hr)},

	{IWL_PCI_DEVICE(0x2720, 0x0070, iwl22000_2ac_cfg_hr_cdb)},

	{IWL_PCI_DEVICE(0x2720, 0x0074, iwl22560_2ax_cfg_hr)},
@@ -1007,7 +1007,7 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


		if (rf_id_chp == jf_chp_id) {

			if (iwl_trans->hw_rev == CSR_HW_REV_TYPE_QNJ)

				cfg = &iwl22000_2ax_cfg_qnj_jf_b0;

				cfg = &iwl9560_2ac_cfg_qnj_jf_b0;

			else

				cfg = &iwl22000_2ac_cfg_jf;

		} else if (rf_id_chp == hr_chp_id) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE