Commit 32ed101a authored by Luca Coelho's avatar Luca Coelho
Browse files

iwlwifi: convert all Qu with Jf devices to the new config table 



Add new generic iwl_trans structures for these devices and apply the
correct cfg depending on the device characteristics.

Since we have to match Qu with IWL_CONFIG_ANY, we also need to move
the Hr devices to the new table, but for now we keep matching on PCI
device and subsystem device IDs.

Change-Id: I14e9146a99621ff11ce50bc746a4b88af508fee0
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent be2f6886

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

+35 −0
Original line number Original line Diff line number Diff line
@@ -235,6 +235,17 @@ static const struct iwl_ht_params iwl_22000_ht_params = { 
		},							\

		},							\

	}

	}





const struct iwl_cfg_trans_params iwl_qu_trans_cfg = {

	.mq_rx_supported = true,

	.use_tfh = true,

	.rf_id = true,

	.gen2 = true,

	.device_family = IWL_DEVICE_FAMILY_22000,

	.base_params = &iwl_22000_base_params,

	.integrated = true,

	.xtal_latency = 5000,

};



/*

/*

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

 * 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

 * 22000 devices can split multiple frames into a single RB, so fewer are
@@ -246,6 +257,30 @@ static const struct iwl_ht_params iwl_22000_ht_params = { 
#define IWL_NUM_RBDS_22000_HE		2048

#define IWL_NUM_RBDS_22000_HE		2048

#define IWL_NUM_RBDS_AX210_HE		4096

#define IWL_NUM_RBDS_AX210_HE		4096





const struct iwl_cfg iwl9560_qu_b0_jf_b0_cfg = {

	.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_qu_c0_jf_b0_cfg = {

	.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_quz_a0_jf_b0_cfg = {

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

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg_trans_params iwl_ax200_trans_cfg = {

const struct iwl_cfg_trans_params iwl_ax200_trans_cfg = {

	.device_family = IWL_DEVICE_FAMILY_22000,

	.device_family = IWL_DEVICE_FAMILY_22000,

	.base_params = &iwl_22000_base_params,

	.base_params = &iwl_22000_base_params,

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

+5 −0
Original line number Original line Diff line number Diff line
@@ -461,6 +461,7 @@ struct iwl_cfg { 
#define IWL_CFG_MAC_TYPE_PNJ		0x32

#define IWL_CFG_MAC_TYPE_PNJ		0x32

#define IWL_CFG_MAC_TYPE_TH		0x32

#define IWL_CFG_MAC_TYPE_TH		0x32

#define IWL_CFG_MAC_TYPE_QU		0x33

#define IWL_CFG_MAC_TYPE_QU		0x33

#define IWL_CFG_MAC_TYPE_QUZ		0x35





#define IWL_CFG_RF_TYPE_TH		0x105

#define IWL_CFG_RF_TYPE_TH		0x105

#define IWL_CFG_RF_TYPE_TH1		0x108

#define IWL_CFG_RF_TYPE_TH1		0x108
@@ -502,6 +503,7 @@ struct iwl_dev_info { 
extern const struct iwl_cfg_trans_params iwl9000_trans_cfg;

extern const struct iwl_cfg_trans_params iwl9000_trans_cfg;

extern const struct iwl_cfg_trans_params iwl9560_trans_cfg;

extern const struct iwl_cfg_trans_params iwl9560_trans_cfg;

extern const struct iwl_cfg_trans_params iwl9560_shared_clk_trans_cfg;

extern const struct iwl_cfg_trans_params iwl9560_shared_clk_trans_cfg;

extern const struct iwl_cfg_trans_params iwl_qu_trans_cfg;

extern const struct iwl_cfg_trans_params iwl_ax200_trans_cfg;

extern const struct iwl_cfg_trans_params iwl_ax200_trans_cfg;

extern const char iwl9162_name[];

extern const char iwl9162_name[];

extern const char iwl9260_name[];

extern const char iwl9260_name[];
@@ -589,6 +591,9 @@ extern const struct iwl_cfg iwl8265_2ac_cfg; 
extern const struct iwl_cfg iwl8275_2ac_cfg;

extern const struct iwl_cfg iwl8275_2ac_cfg;

extern const struct iwl_cfg iwl4165_2ac_cfg;

extern const struct iwl_cfg iwl4165_2ac_cfg;

extern const struct iwl_cfg iwl9260_2ac_cfg;

extern const struct iwl_cfg iwl9260_2ac_cfg;

extern const struct iwl_cfg iwl9560_qu_b0_jf_b0_cfg;

extern const struct iwl_cfg iwl9560_qu_c0_jf_b0_cfg;

extern const struct iwl_cfg iwl9560_quz_a0_jf_b0_cfg;

extern const struct iwl_cfg iwl9560_2ac_cfg_quz_a0_jf_b0_soc;

extern const struct iwl_cfg iwl9560_2ac_cfg_quz_a0_jf_b0_soc;

extern const struct iwl_cfg iwl9560_2ac_160_cfg_quz_a0_jf_b0_soc;

extern const struct iwl_cfg iwl9560_2ac_160_cfg_quz_a0_jf_b0_soc;

extern const struct iwl_cfg iwl9461_2ac_cfg_quz_a0_jf_b0_soc;

extern const struct iwl_cfg iwl9461_2ac_cfg_quz_a0_jf_b0_soc;

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

+243 −250

File changed.

Preview size limit exceeded, changes collapsed.