Commit 62bee486 authored by Luca Coelho's avatar Luca Coelho
Browse files

iwlwifi: pcie: add new structs for So devices with long latency 



Some So devices have a longer wake latency.  To support this properly,
add new cfg structs for them so the driver will inform the FW about
the need to use another xtal and use a higher wait value during state
transitions.

Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20200418110539.daf515618f57.I80e60006b108e1586e3c56669635c670597fe08d@changeid
parent 9c9613f0

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

+20 −0
Original line number Diff line number Diff line
@@ -555,6 +555,16 @@ const struct iwl_cfg iwlax211_2ax_cfg_so_gf_a0 = { 
	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwlax211_2ax_cfg_so_gf_a0_long = {

	.name = "Intel(R) Wi-Fi 6 AX211 160MHz",

	.fw_name_pre = IWL_22000_SO_A_GF_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

	.trans.xtal_latency = 12000,

	.trans.low_latency_xtal = true,

};



const struct iwl_cfg iwlax210_2ax_cfg_ty_gf_a0 = {

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

	.fw_name_pre = IWL_22000_TY_A_GF_A_FW_PRE,
@@ -571,6 +581,16 @@ const struct iwl_cfg iwlax411_2ax_cfg_so_gf4_a0 = { 
	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwlax411_2ax_cfg_so_gf4_a0_long = {

	.name = "Intel(R) Wi-Fi 6 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,

	.trans.xtal_latency = 12000,

	.trans.low_latency_xtal = true,

};



const struct iwl_cfg iwlax411_2ax_cfg_sosnj_gf4_a0 = {

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

	.fw_name_pre = IWL_SNJ_A_GF4_A_FW_PRE,

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

+2 −0
Original line number Diff line number Diff line
@@ -630,8 +630,10 @@ extern const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_b0; 
extern const struct iwl_cfg iwlax210_2ax_cfg_so_jf_a0;

extern const struct iwl_cfg iwlax210_2ax_cfg_so_hr_a0;

extern const struct iwl_cfg iwlax211_2ax_cfg_so_gf_a0;

extern const struct iwl_cfg iwlax211_2ax_cfg_so_gf_a0_long;

extern const struct iwl_cfg iwlax210_2ax_cfg_ty_gf_a0;

extern const struct iwl_cfg iwlax411_2ax_cfg_so_gf4_a0;

extern const struct iwl_cfg iwlax411_2ax_cfg_so_gf4_a0_long;

extern const struct iwl_cfg iwlax411_2ax_cfg_sosnj_gf4_a0;

extern const struct iwl_cfg iwlax211_cfg_snj_gf_a0;

#endif /* CPTCFG_IWLMVM || CPTCFG_IWLFMAC */

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

+5 −5
Original line number Diff line number Diff line
@@ -545,11 +545,11 @@ static const struct pci_device_id iwl_hw_card_ids[] = { 
	{IWL_PCI_DEVICE(0x2726, 0x0090, iwlax211_cfg_snj_gf_a0)},

	{IWL_PCI_DEVICE(0x2726, 0x00B0, iwlax411_2ax_cfg_sosnj_gf4_a0)},

	{IWL_PCI_DEVICE(0x2726, 0x0510, iwlax211_cfg_snj_gf_a0)},

	{IWL_PCI_DEVICE(0x7A70, 0x0090, iwlax211_2ax_cfg_so_gf_a0)},

	{IWL_PCI_DEVICE(0x7A70, 0x00B0, iwlax411_2ax_cfg_so_gf4_a0)},

	{IWL_PCI_DEVICE(0x7A70, 0x0310, iwlax211_2ax_cfg_so_gf_a0)},

	{IWL_PCI_DEVICE(0x7A70, 0x0510, iwlax211_2ax_cfg_so_gf_a0)},

	{IWL_PCI_DEVICE(0x7A70, 0x0A10, iwlax211_2ax_cfg_so_gf_a0)},

	{IWL_PCI_DEVICE(0x7A70, 0x0090, iwlax211_2ax_cfg_so_gf_a0_long)},

	{IWL_PCI_DEVICE(0x7A70, 0x00B0, iwlax411_2ax_cfg_so_gf4_a0_long)},

	{IWL_PCI_DEVICE(0x7A70, 0x0310, iwlax211_2ax_cfg_so_gf_a0_long)},

	{IWL_PCI_DEVICE(0x7A70, 0x0510, iwlax211_2ax_cfg_so_gf_a0_long)},

	{IWL_PCI_DEVICE(0x7A70, 0x0A10, iwlax211_2ax_cfg_so_gf_a0_long)},

	{IWL_PCI_DEVICE(0x7AF0, 0x0090, iwlax211_2ax_cfg_so_gf_a0)},

	{IWL_PCI_DEVICE(0x7AF0, 0x00B0, iwlax411_2ax_cfg_so_gf4_a0)},

	{IWL_PCI_DEVICE(0x7AF0, 0x0310, iwlax211_2ax_cfg_so_gf_a0)},

CRA Git | Maintained and supported by SUSTech CRA and CCSE