Commit 4bbf92b7 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2020-03-17' of... 

Merge tag 'iwlwifi-next-for-kalle-2020-03-17' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

First set of iwlwifi patches intended for v5.7

* Refactoring of the device selection algorithms;
parents 48346a95 5e003982

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

+17 −30
Original line number Diff line number Diff line
@@ -246,6 +246,23 @@ static const struct iwl_ht_params iwl_22000_ht_params = { 
#define IWL_NUM_RBDS_22000_HE		2048

#define IWL_NUM_RBDS_AX210_HE		4096



const struct iwl_cfg_trans_params iwl_ax200_trans_cfg = {

	.device_family = IWL_DEVICE_FAMILY_22000,

	.base_params = &iwl_22000_base_params,

	.mq_rx_supported = true,

	.use_tfh = true,

	.rf_id = true,

	.gen2 = true,

	.bisr_workaround = 1,

};



const char iwl_ax200_name[] = "Intel(R) Wi-Fi 6 AX200 160MHz";



const char iwl_ax200_killer_1650w_name[] =

	"Killer(R) Wi-Fi 6 AX1650w 160MHz Wireless Network Adapter (200D2W)";

const char iwl_ax200_killer_1650x_name[] =

	"Killer(R) Wi-Fi 6 AX1650x 160MHz Wireless Network Adapter (200NGW)";



const struct iwl_cfg iwl_ax101_cfg_qu_hr = {

	.name = "Intel(R) Wi-Fi 6 AX101",

	.fw_name_pre = IWL_22000_QU_B_HR_B_FW_PRE,
@@ -352,35 +369,6 @@ const struct iwl_cfg iwl_ax1650i_cfg_quz_hr = { 
};



const struct iwl_cfg iwl_ax200_cfg_cc = {

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

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

	.trans.bisr_workaround = 1,

	.num_rbds = IWL_NUM_RBDS_22000_HE,

};



const struct iwl_cfg killer1650x_2ax_cfg = {

	.name = "Killer(R) Wi-Fi 6 AX1650x 160MHz Wireless Network Adapter (200NGW)",

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

	.trans.bisr_workaround = 1,

	.num_rbds = IWL_NUM_RBDS_22000_HE,

};



const struct iwl_cfg killer1650w_2ax_cfg = {

	.name = "Killer(R) Wi-Fi 6 AX1650w 160MHz Wireless Network Adapter (200D2W)",

	.fw_name_pre = IWL_CC_A_FW_PRE,

	IWL_DEVICE_22500,

	/*
@@ -389,7 +377,6 @@ const struct iwl_cfg killer1650w_2ax_cfg = { 
	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.trans.bisr_workaround = 1,

	.num_rbds = IWL_NUM_RBDS_22000_HE,

};

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

+17 −144
Original line number Diff line number Diff line
@@ -123,8 +123,6 @@ static const struct iwl_tt_params iwl9000_tt_params = { 
#define IWL_DEVICE_9000							\

	.ucode_api_max = IWL9000_UCODE_API_MAX,				\

	.ucode_api_min = IWL9000_UCODE_API_MIN,				\

	.trans.device_family = IWL_DEVICE_FAMILY_9000,			\

	.trans.base_params = &iwl9000_base_params,			\

	.led_mode = IWL_LED_RF_STATE,					\

	.nvm_hw_section_num = 10,					\

	.non_shared_ant = ANT_B,					\
@@ -137,11 +135,9 @@ static const struct iwl_tt_params iwl9000_tt_params = { 
	.features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,		\

	.thermal_params = &iwl9000_tt_params,				\

	.apmg_not_supported = true,					\

	.trans.mq_rx_supported = true,					\

	.num_rbds = 512,						\

	.vht_mu_mimo_supported = true,					\

	.mac_addr_from_csr = true,					\

	.trans.rf_id = true,						\

	.nvm_type = IWL_NVM_EXT,					\

	.dbgc_supported = true,						\

	.min_umac_error_event_table = 0x800000,				\
@@ -178,168 +174,45 @@ const struct iwl_cfg_trans_params iwl9000_trans_cfg = { 
	.rf_id = true,

};



const struct iwl_cfg iwl9160_2ac_cfg = {

	.name = "Intel(R) Dual Band Wireless AC 9160",

	.fw_name_pre = IWL9260_FW_PRE,

	IWL_DEVICE_9000,

};



const struct iwl_cfg iwl9260_2ac_cfg = {

	.name = "Intel(R) Dual Band Wireless AC 9260",

	.fw_name_pre = IWL9260_FW_PRE,

	IWL_DEVICE_9000,

};



const char iwl9162_name[] = "Intel(R) Wireless-AC 9162";

const char iwl9260_name[] = "Intel(R) Wireless-AC 9260";

const char iwl9260_1_name[] = "Intel(R) Wireless-AC 9260-1";

const char iwl9270_name[] = "Intel(R) Wireless-AC 9270";

const char iwl9461_name[] = "Intel(R) Wireless-AC 9461";

const char iwl9462_name[] = "Intel(R) Wireless-AC 9462";

const char iwl9560_name[] = "Intel(R) Wireless-AC 9560";

const char iwl9162_160_name[] = "Intel(R) Wireless-AC 9162 160MHz";

const char iwl9260_160_name[] = "Intel(R) Wireless-AC 9260 160MHz";

const char iwl9270_160_name[] = "Intel(R) Wireless-AC 9270 160MHz";

const char iwl9461_160_name[] = "Intel(R) Wireless-AC 9461 160MHz";

const char iwl9462_160_name[] = "Intel(R) Wireless-AC 9462 160MHz";

const char iwl9560_160_name[] = "Intel(R) Wireless-AC 9560 160MHz";



const struct iwl_cfg iwl9260_2ac_160_cfg = {

	.fw_name_pre = IWL9260_FW_PRE,

	IWL_DEVICE_9000,

};



const struct iwl_cfg iwl9260_killer_2ac_cfg = {

	.name = "Killer (R) Wireless-AC 1550 Wireless Network Adapter (9260NGW)",

	.fw_name_pre = IWL9260_FW_PRE,

	IWL_DEVICE_9000,

};



const struct iwl_cfg iwl9270_2ac_cfg = {

	.name = "Intel(R) Dual Band Wireless AC 9270",

	.fw_name_pre = IWL9260_FW_PRE,

	IWL_DEVICE_9000,

};



const struct iwl_cfg iwl9460_2ac_cfg = {

	.name = "Intel(R) Dual Band Wireless AC 9460",

	.fw_name_pre = IWL9260_FW_PRE,

	IWL_DEVICE_9000,

};



const struct iwl_cfg iwl9460_2ac_cfg_soc = {

	.name = "Intel(R) Dual Band Wireless AC 9460",

	.fw_name_pre = IWL9000_FW_PRE,

	IWL_DEVICE_9000,

	.integrated = true,

	.soc_latency = 5000,

};



const struct iwl_cfg iwl9461_2ac_cfg_soc = {

	.name = "Intel(R) Dual Band Wireless AC 9461",

	.fw_name_pre = IWL9000_FW_PRE,

	IWL_DEVICE_9000,

	.integrated = true,

	.soc_latency = 5000,

};



const struct iwl_cfg iwl9462_2ac_cfg_soc = {

	.name = "Intel(R) Dual Band Wireless AC 9462",

	.fw_name_pre = IWL9000_FW_PRE,

	IWL_DEVICE_9000,

	.integrated = true,

	.soc_latency = 5000,

};

const char iwl9260_killer_1550_name[] =

	"Killer (R) Wireless-AC 1550 Wireless Network Adapter (9260NGW)";

const char iwl9560_killer_1550i_name[] =

	"Killer (R) Wireless-AC 1550i Wireless Network Adapter (9560NGW)";

const char iwl9560_killer_1550s_name[] =

	"Killer (R) Wireless-AC 1550s Wireless Network Adapter (9560NGW)";



const struct iwl_cfg iwl9560_2ac_cfg = {

	.name = "Intel(R) Dual Band Wireless AC 9560",

	.fw_name_pre = IWL9260_FW_PRE,

	IWL_DEVICE_9000,

};



const struct iwl_cfg iwl9560_2ac_160_cfg = {

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

	.fw_name_pre = IWL9260_FW_PRE,

	IWL_DEVICE_9000,

};



const struct iwl_cfg iwl9560_2ac_cfg_soc = {

	.name = "Intel(R) Dual Band Wireless AC 9560",

	.fw_name_pre = IWL9000_FW_PRE,

	IWL_DEVICE_9000,

	.integrated = true,

	.soc_latency = 5000,

};



const struct iwl_cfg iwl9560_2ac_160_cfg_soc = {

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

	.fw_name_pre = IWL9000_FW_PRE,

	IWL_DEVICE_9000,

	.integrated = true,

	.soc_latency = 5000,

};



const struct iwl_cfg iwl9560_killer_2ac_cfg_soc = {

	.name = "Killer (R) Wireless-AC 1550i Wireless Network Adapter (9560NGW)",

	.fw_name_pre = IWL9000_FW_PRE,

	IWL_DEVICE_9000,

	.integrated = true,

	.soc_latency = 5000,

};



const struct iwl_cfg iwl9560_killer_s_2ac_cfg_soc = {

	.name = "Killer (R) Wireless-AC 1550s Wireless Network Adapter (9560NGW)",

	.fw_name_pre = IWL9000_FW_PRE,

	IWL_DEVICE_9000,

	.integrated = true,

	.soc_latency = 5000,

};



const struct iwl_cfg iwl9460_2ac_cfg_shared_clk = {

	.name = "Intel(R) Dual Band Wireless AC 9460",

	.fw_name_pre = IWL9000_FW_PRE,

	IWL_DEVICE_9000,

	.integrated = true,

	.soc_latency = 5000,

	.extra_phy_cfg_flags = FW_PHY_CFG_SHARED_CLK

};



const struct iwl_cfg iwl9461_2ac_cfg_shared_clk = {

	.name = "Intel(R) Dual Band Wireless AC 9461",

	.fw_name_pre = IWL9000_FW_PRE,

	IWL_DEVICE_9000,

	.integrated = true,

	.soc_latency = 5000,

	.extra_phy_cfg_flags = FW_PHY_CFG_SHARED_CLK

};



const struct iwl_cfg iwl9462_2ac_cfg_shared_clk = {

	.name = "Intel(R) Dual Band Wireless AC 9462",

	.fw_name_pre = IWL9000_FW_PRE,

	IWL_DEVICE_9000,

	.integrated = true,

	.soc_latency = 5000,

	.extra_phy_cfg_flags = FW_PHY_CFG_SHARED_CLK

};



const struct iwl_cfg iwl9560_2ac_cfg_shared_clk = {

	.name = "Intel(R) Dual Band Wireless AC 9560",

	.fw_name_pre = IWL9000_FW_PRE,

	IWL_DEVICE_9000,

	.integrated = true,

	.soc_latency = 5000,

	.extra_phy_cfg_flags = FW_PHY_CFG_SHARED_CLK

};



const struct iwl_cfg iwl9560_2ac_160_cfg_shared_clk = {

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

	.fw_name_pre = IWL9000_FW_PRE,

	IWL_DEVICE_9000,

	.integrated = true,

	.soc_latency = 5000,

	.extra_phy_cfg_flags = FW_PHY_CFG_SHARED_CLK

};



const struct iwl_cfg iwl9560_killer_2ac_cfg_shared_clk = {

	.name = "Killer (R) Wireless-AC 1550i Wireless Network Adapter (9560NGW)",

	.fw_name_pre = IWL9000_FW_PRE,

	IWL_DEVICE_9000,

	.integrated = true,

	.soc_latency = 5000,

	.extra_phy_cfg_flags = FW_PHY_CFG_SHARED_CLK

};



const struct iwl_cfg iwl9560_killer_s_2ac_cfg_shared_clk = {

	.name = "Killer (R) Wireless-AC 1550s Wireless Network Adapter (9560NGW)",

	.fw_name_pre = IWL9000_FW_PRE,

	IWL_DEVICE_9000,

	.integrated = true,

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

+49 −10
Original line number Diff line number Diff line
@@ -454,9 +454,40 @@ struct iwl_cfg { 


#define IWL_CFG_ANY (~0)



#define IWL_CFG_MAC_TYPE_PU		0x31

#define IWL_CFG_MAC_TYPE_PNJ		0x32

#define IWL_CFG_MAC_TYPE_TH		0x32

#define IWL_CFG_MAC_TYPE_QU		0x33



#define IWL_CFG_RF_TYPE_TH		0x105

#define IWL_CFG_RF_TYPE_TH1		0x108

#define IWL_CFG_RF_TYPE_JF2		0x105

#define IWL_CFG_RF_TYPE_JF1		0x108



#define IWL_CFG_RF_ID_TH		0x1

#define IWL_CFG_RF_ID_TH1		0x1

#define IWL_CFG_RF_ID_JF		0x3

#define IWL_CFG_RF_ID_JF1		0x6

#define IWL_CFG_RF_ID_JF1_DIV		0xA



#define IWL_CFG_NO_160			0x0

#define IWL_CFG_160			0x1



#define IWL_CFG_CORES_BT		0x0

#define IWL_CFG_CORES_BT_GNSS		0x5



#define IWL_SUBDEVICE_RF_ID(subdevice)	((u16)((subdevice) & 0x00F0) >> 4)

#define IWL_SUBDEVICE_NO_160(subdevice)	((u16)((subdevice) & 0x0100) >> 9)

#define IWL_SUBDEVICE_CORES(subdevice)	((u16)((subdevice) & 0x1C00) >> 10)



struct iwl_dev_info {

	u16 device;

	u16 subdevice;

	u16 mac_type;

	u16 rf_type;

	u8 rf_id;

	u8 no_160;

	u8 cores;

	const struct iwl_cfg *cfg;

	const char *name;

};
@@ -465,8 +496,26 @@ struct iwl_dev_info { 
 * This list declares the config structures for all devices.

 */

extern const struct iwl_cfg_trans_params iwl9000_trans_cfg;

extern const struct iwl_cfg_trans_params iwl_ax200_trans_cfg;

extern const char iwl9162_name[];

extern const char iwl9260_name[];

extern const char iwl9260_1_name[];

extern const char iwl9270_name[];

extern const char iwl9461_name[];

extern const char iwl9462_name[];

extern const char iwl9560_name[];

extern const char iwl9162_160_name[];

extern const char iwl9260_160_name[];

extern const char iwl9270_160_name[];

extern const char iwl9461_160_name[];

extern const char iwl9462_160_name[];

extern const char iwl9560_160_name[];

extern const char iwl9260_killer_1550_name[];

extern const char iwl9560_killer_1550i_name[];

extern const char iwl9560_killer_1550s_name[];

extern const char iwl_ax200_name[];

extern const char iwl_ax200_killer_1650w_name[];

extern const char iwl_ax200_killer_1650x_name[];



#if IS_ENABLED(CONFIG_IWLDVM)

extern const struct iwl_cfg iwl5300_agn_cfg;
@@ -533,28 +582,18 @@ extern const struct iwl_cfg iwl8260_2ac_cfg; 
extern const struct iwl_cfg iwl8265_2ac_cfg;

extern const struct iwl_cfg iwl8275_2ac_cfg;

extern const struct iwl_cfg iwl4165_2ac_cfg;

extern const struct iwl_cfg iwl9160_2ac_cfg;

extern const struct iwl_cfg iwl9260_2ac_cfg;

extern const struct iwl_cfg iwl9260_2ac_160_cfg;

extern const struct iwl_cfg iwl9260_killer_2ac_cfg;

extern const struct iwl_cfg iwl9270_2ac_cfg;

extern const struct iwl_cfg iwl9460_2ac_cfg;

extern const struct iwl_cfg iwl9560_2ac_cfg;

extern const struct iwl_cfg iwl9560_2ac_cfg_quz_a0_jf_b0_soc;

extern const struct iwl_cfg iwl9560_2ac_160_cfg;

extern const struct iwl_cfg iwl9560_2ac_160_cfg_quz_a0_jf_b0_soc;

extern const struct iwl_cfg iwl9460_2ac_cfg_soc;

extern const struct iwl_cfg iwl9461_2ac_cfg_soc;

extern const struct iwl_cfg iwl9461_2ac_cfg_quz_a0_jf_b0_soc;

extern const struct iwl_cfg iwl9462_2ac_cfg_soc;

extern const struct iwl_cfg iwl9462_2ac_cfg_quz_a0_jf_b0_soc;

extern const struct iwl_cfg iwl9560_2ac_cfg_soc;

extern const struct iwl_cfg iwl9560_2ac_160_cfg_soc;

extern const struct iwl_cfg iwl9560_killer_2ac_cfg_soc;

extern const struct iwl_cfg iwl9560_killer_s_2ac_cfg_soc;

extern const struct iwl_cfg iwl9560_killer_i_2ac_cfg_quz_a0_jf_b0_soc;

extern const struct iwl_cfg iwl9560_killer_s_2ac_cfg_quz_a0_jf_b0_soc;

extern const struct iwl_cfg iwl9460_2ac_cfg_shared_clk;

extern const struct iwl_cfg iwl9461_2ac_cfg_shared_clk;

extern const struct iwl_cfg iwl9462_2ac_cfg_shared_clk;

extern const struct iwl_cfg iwl9560_2ac_cfg_shared_clk;

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

+158 −197

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE