Commit 9c9613f0 authored by Luca Coelho's avatar Luca Coelho
Browse files

iwlwifi: pcie: add new structure for Qu devices with medium latency 



Some Qu devices require an intermediate amount of time to wake up and
for LTR notifications, so add a new structure with the correct values
for them and change the corresponding devices to use it.

Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20200418110539.d6df2bcee78f.Ie008b0c8f03340a466c1ef981bfd25359c9de90d@changeid
parent 0928df0a

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

+17 −5
Original line number Diff line number Diff line
@@ -234,6 +234,15 @@ static const struct iwl_ht_params iwl_22000_ht_params = { 
		},							\

	}



const struct iwl_cfg_trans_params iwl_qnj_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,

};



const struct iwl_cfg_trans_params iwl_qu_trans_cfg = {

	.mq_rx_supported = true,

	.use_tfh = true,
@@ -246,7 +255,7 @@ const struct iwl_cfg_trans_params iwl_qu_trans_cfg = { 
	.ltr_delay = IWL_CFG_TRANS_LTR_DELAY_200US,

};



const struct iwl_cfg_trans_params iwl_qu_long_latency_trans_cfg = {

const struct iwl_cfg_trans_params iwl_qu_medium_latency_trans_cfg = {

	.mq_rx_supported = true,

	.use_tfh = true,

	.rf_id = true,
@@ -254,18 +263,21 @@ const struct iwl_cfg_trans_params iwl_qu_long_latency_trans_cfg = { 
	.device_family = IWL_DEVICE_FAMILY_22000,

	.base_params = &iwl_22000_base_params,

	.integrated = true,

	.xtal_latency = 12000,

	.low_latency_xtal = true,

	.ltr_delay = IWL_CFG_TRANS_LTR_DELAY_2500US,

	.xtal_latency = 1820,

	.ltr_delay = IWL_CFG_TRANS_LTR_DELAY_1820US,

};



const struct iwl_cfg_trans_params iwl_qnj_trans_cfg = {

const struct iwl_cfg_trans_params iwl_qu_long_latency_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 = 12000,

	.low_latency_xtal = true,

	.ltr_delay = IWL_CFG_TRANS_LTR_DELAY_2500US,

};



/*

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

+2 −1
Original line number Diff line number Diff line
@@ -513,9 +513,10 @@ struct iwl_dev_info { 
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_shared_clk_trans_cfg;

extern const struct iwl_cfg_trans_params iwl_qnj_trans_cfg;

extern const struct iwl_cfg_trans_params iwl_qu_trans_cfg;

extern const struct iwl_cfg_trans_params iwl_qu_medium_latency_trans_cfg;

extern const struct iwl_cfg_trans_params iwl_qu_long_latency_trans_cfg;

extern const struct iwl_cfg_trans_params iwl_qnj_trans_cfg;

extern const struct iwl_cfg_trans_params iwl_ax200_trans_cfg;

extern const char iwl9162_name[];

extern const char iwl9260_name[];

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

+4 −3
Original line number Diff line number Diff line
@@ -524,9 +524,10 @@ static const struct pci_device_id iwl_hw_card_ids[] = { 
/* Qu devices */

	{IWL_PCI_DEVICE(0x02F0, PCI_ANY_ID, iwl_qu_trans_cfg)},

	{IWL_PCI_DEVICE(0x06F0, PCI_ANY_ID, iwl_qu_trans_cfg)},

	{IWL_PCI_DEVICE(0x34F0, PCI_ANY_ID, iwl_qu_trans_cfg)},

	{IWL_PCI_DEVICE(0x3DF0, PCI_ANY_ID, iwl_qu_trans_cfg)},

	{IWL_PCI_DEVICE(0x4DF0, PCI_ANY_ID, iwl_qu_trans_cfg)},



	{IWL_PCI_DEVICE(0x34F0, PCI_ANY_ID, iwl_qu_medium_latency_trans_cfg)},

	{IWL_PCI_DEVICE(0x3DF0, PCI_ANY_ID, iwl_qu_medium_latency_trans_cfg)},

	{IWL_PCI_DEVICE(0x4DF0, PCI_ANY_ID, iwl_qu_medium_latency_trans_cfg)},



	{IWL_PCI_DEVICE(0x43F0, PCI_ANY_ID, iwl_qu_long_latency_trans_cfg)},

	{IWL_PCI_DEVICE(0xA0F0, PCI_ANY_ID, iwl_qu_long_latency_trans_cfg)},

CRA Git | Maintained and supported by SUSTech CRA and CCSE