Commit e1374ed2 authored by Mukesh Sisodiya's avatar Mukesh Sisodiya Committed by Johannes Berg
Browse files

wifi: iwlwifi: Add support for new CNVi (SC) 



Add support for the new Integrated Connectivity (CNVi)
and Companion RF (CRF) versions and their combinations
to handle new devices.

Signed-off-by: default avatarMukesh Sisodiya <mukesh.sisodiya@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230621130443.716fd707e847.I34f6ffd61e3210c926868a3e961b16d1742bba29@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 8a18d46b

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

+89 −0
Original line number Diff line number Diff line
@@ -89,6 +89,13 @@ 
#define IWL_BNJ_B_HR_B_FW_PRE		"iwlwifi-BzBnj-b0-hr-b0-"

#define IWL_BNJ_B_FM_B_FW_PRE		"iwlwifi-BzBnj-b0-fm-b0-"



#define IWL_SC_A_FM_B_FW_PRE		"iwlwifi-sc-a0-fm-b0-"

#define IWL_SC_A_FM_C_FW_PRE		"iwlwifi-sc-a0-fm-c0-"

#define IWL_SC_A_HR_A_FW_PRE		"iwlwifi-sc-a0-hr-b0-"

#define IWL_SC_A_HR_B_FW_PRE		"iwlwifi-sc-a0-hr-b0-"

#define IWL_SC_A_GF_A_FW_PRE		"iwlwifi-sc-a0-gf-a0-"

#define IWL_SC_A_GF4_A_FW_PRE		"iwlwifi-sc-a0-gf4-a0-"

#define IWL_SC_A_WH_A_FW_PRE		"iwlwifi-sc-a0-wh-a0-"



#define IWL_QU_B_HR_B_MODULE_FIRMWARE(api) \

	IWL_QU_B_HR_B_FW_PRE __stringify(api) ".ucode"
@@ -203,6 +210,20 @@ 
	IWL_BNJ_B_HR_B_FW_PRE __stringify(api) ".ucode"

#define IWL_BNJ_B_FM_B_MODULE_FIRMWARE(api) \

	IWL_BNJ_B_FM_B_FW_PRE __stringify(api) ".ucode"

#define IWL_SC_A_FM_B_FW_MODULE_FIRMWARE(api) \

	IWL_SC_A_FM_B_FW_PRE __stringify(api) ".ucode"

#define IWL_SC_A_FM_C_FW_MODULE_FIRMWARE(api) \

	IWL_SC_A_FM_C_FW_PRE __stringify(api) ".ucode"

#define IWL_SC_A_HR_A_FW_MODULE_FIRMWARE(api) \

	IWL_SC_A_HR_A_FW_PRE __stringify(api) ".ucode"

#define IWL_SC_A_HR_B_FW_MODULE_FIRMWARE(api) \

	IWL_SC_A_HR_B_FW_PRE __stringify(api) ".ucode"

#define IWL_SC_A_GF_A_FW_MODULE_FIRMWARE(api) \

	IWL_SC_A_GF_A_FW_PRE __stringify(api) ".ucode"

#define IWL_SC_A_GF4_A_FW_MODULE_FIRMWARE(api) \

	IWL_SC_A_GF4_A_FW_PRE __stringify(api) ".ucode"

#define IWL_SC_A_WH_A_FW_MODULE_FIRMWARE(api) \

	IWL_SC_A_WH_A_FW_PRE __stringify(api) ".ucode"



static const struct iwl_base_params iwl_22000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE_32K,
@@ -390,6 +411,10 @@ static const struct iwl_ht_params iwl_gl_a_ht_params = { 
	IWL_DEVICE_BZ_COMMON,						\

	.ht_params = &iwl_gl_a_ht_params



#define IWL_DEVICE_SC							\

	IWL_DEVICE_BZ_COMMON,						\

	.ht_params = &iwl_22000_ht_params



const struct iwl_cfg_trans_params iwl_qnj_trans_cfg = {

	.mq_rx_supported = true,

	.use_tfh = true,
@@ -586,6 +611,7 @@ const char iwl_ax221_name[] = "Intel(R) Wi-Fi 6E AX221 160MHz"; 
const char iwl_ax231_name[] = "Intel(R) Wi-Fi 6E AX231 160MHz";

const char iwl_ax411_name[] = "Intel(R) Wi-Fi 6E AX411 160MHz";

const char iwl_bz_name[] = "Intel(R) TBD Bz device";

const char iwl_sc_name[] = "Intel(R) TBD Sc device";



const char iwl_ax200_killer_1650w_name[] =

	"Killer(R) Wi-Fi 6 AX1650w 160MHz Wireless Network Adapter (200D2W)";
@@ -1249,6 +1275,62 @@ const struct iwl_cfg iwl_cfg_bnj_b0_fm_b0 = { 
	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_sc_a0_fm_b0 = {

	.fw_name_pre = IWL_SC_A_FM_B_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_SC,

	.features = IWL_TX_CSUM_NETIF_FLAGS_BZ | NETIF_F_RXCSUM,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_sc_a0_fm_c0 = {

	.fw_name_pre = IWL_SC_A_FM_C_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_SC,

	.features = IWL_TX_CSUM_NETIF_FLAGS_BZ | NETIF_F_RXCSUM,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_sc_a0_hr_a0 = {

	.fw_name_pre = IWL_SC_A_HR_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_SC,

	.features = IWL_TX_CSUM_NETIF_FLAGS_BZ | NETIF_F_RXCSUM,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_sc_a0_hr_b0 = {

	.fw_name_pre = IWL_SC_A_HR_B_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_SC,

	.features = IWL_TX_CSUM_NETIF_FLAGS_BZ | NETIF_F_RXCSUM,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_sc_a0_gf_a0 = {

	.fw_name_pre = IWL_SC_A_GF_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_SC,

	.features = IWL_TX_CSUM_NETIF_FLAGS_BZ | NETIF_F_RXCSUM,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_sc_a0_gf4_a0 = {

	.fw_name_pre = IWL_SC_A_GF4_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_SC,

	.features = IWL_TX_CSUM_NETIF_FLAGS_BZ | NETIF_F_RXCSUM,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_sc_a0_wh_a0 = {

	.fw_name_pre = IWL_SC_A_WH_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_SC,

	.features = IWL_TX_CSUM_NETIF_FLAGS_BZ | NETIF_F_RXCSUM,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



MODULE_FIRMWARE(IWL_QU_B_HR_B_MODULE_FIRMWARE(IWL_22500_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_QNJ_B_HR_B_MODULE_FIRMWARE(IWL_22500_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_QU_C_HR_B_MODULE_FIRMWARE(IWL_22500_UCODE_API_MAX));
@@ -1300,3 +1382,10 @@ MODULE_FIRMWARE(IWL_BZ_A_FM4_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); 
MODULE_FIRMWARE(IWL_GL_B_FM_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_GL_C_FM_C_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BNJ_B_FM_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_SC_A_FM_B_FW_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_SC_A_FM_C_FW_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_SC_A_HR_A_FW_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_SC_A_HR_B_FW_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_SC_A_GF_A_FW_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_SC_A_GF4_A_FW_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_SC_A_WH_A_FW_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

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

+11 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
/*

 * Copyright (C) 2005-2014, 2018-2021 Intel Corporation

 * Copyright (C) 2016-2017 Intel Deutschland GmbH

 * Copyright (C) 2018-2023 Intel Corporation

 */

#ifndef __IWL_CONFIG_H__

#define __IWL_CONFIG_H__
@@ -426,6 +427,7 @@ struct iwl_cfg { 
#define IWL_CFG_MAC_TYPE_MA		0x44

#define IWL_CFG_MAC_TYPE_BZ		0x46

#define IWL_CFG_MAC_TYPE_GL		0x47

#define IWL_CFG_MAC_TYPE_SC		0x48



#define IWL_CFG_RF_TYPE_TH		0x105

#define IWL_CFG_RF_TYPE_TH1		0x108
@@ -437,6 +439,7 @@ struct iwl_cfg { 
#define IWL_CFG_RF_TYPE_MR		0x110

#define IWL_CFG_RF_TYPE_MS		0x111

#define IWL_CFG_RF_TYPE_FM		0x112

#define IWL_CFG_RF_TYPE_WH		0x113



#define IWL_CFG_RF_ID_TH		0x1

#define IWL_CFG_RF_ID_TH1		0x1
@@ -534,6 +537,7 @@ extern const char iwl_ax221_name[]; 
extern const char iwl_ax231_name[];

extern const char iwl_ax411_name[];

extern const char iwl_bz_name[];

extern const char iwl_sc_name[];

#if IS_ENABLED(CONFIG_IWLDVM)

extern const struct iwl_cfg iwl5300_agn_cfg;

extern const struct iwl_cfg iwl5100_agn_cfg;
@@ -679,6 +683,13 @@ extern const struct iwl_cfg iwl_cfg_bnj_b0_hr_a0; 
extern const struct iwl_cfg iwl_cfg_bnj_b0_hr_b0;

extern const struct iwl_cfg iwl_cfg_bnj_b0_fm_b0;

extern const struct iwl_cfg iwl_cfg_bnj_b0_fm4_b0;

extern const struct iwl_cfg iwl_cfg_sc_a0_fm_b0;

extern const struct iwl_cfg iwl_cfg_sc_a0_fm_c0;

extern const struct iwl_cfg iwl_cfg_sc_a0_hr_a0;

extern const struct iwl_cfg iwl_cfg_sc_a0_hr_b0;

extern const struct iwl_cfg iwl_cfg_sc_a0_gf_a0;

extern const struct iwl_cfg iwl_cfg_sc_a0_gf4_a0;

extern const struct iwl_cfg iwl_cfg_sc_a0_wh_a0;

#endif /* CONFIG_IWLMVM */



#endif /* __IWL_CONFIG_H__ */

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

+37 −1
Original line number Diff line number Diff line
@@ -1419,8 +1419,44 @@ static const struct iwl_dev_info iwl_dev_info_table[] = { 
		      IWL_CFG_MAC_TYPE_SNJ, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_MS, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_160, IWL_CFG_ANY, IWL_CFG_NO_CDB, IWL_CFG_ANY,

		      iwl_cfg_snj_a0_ms_a0, iwl_ax204_name)

		      iwl_cfg_snj_a0_ms_a0, iwl_ax204_name),



/* Sc */

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SC, SILICON_A_STEP,

		      IWL_CFG_RF_TYPE_FM, IWL_CFG_ANY, SILICON_B_STEP,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB, IWL_CFG_ANY,

		      iwl_cfg_sc_a0_fm_b0, iwl_sc_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SC, SILICON_A_STEP,

		      IWL_CFG_RF_TYPE_FM, IWL_CFG_ANY, SILICON_C_STEP,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB, IWL_CFG_ANY,

		      iwl_cfg_sc_a0_fm_c0, iwl_sc_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SC, SILICON_A_STEP,

		      IWL_CFG_RF_TYPE_HR1, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB, IWL_CFG_ANY,

		      iwl_cfg_sc_a0_hr_a0, iwl_sc_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SC, SILICON_A_STEP,

		      IWL_CFG_RF_TYPE_HR2, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB, IWL_CFG_ANY,

		      iwl_cfg_sc_a0_hr_b0, iwl_sc_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SC, SILICON_A_STEP,

		      IWL_CFG_RF_TYPE_GF, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB, IWL_CFG_ANY,

		      iwl_cfg_sc_a0_gf_a0, iwl_sc_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SC, SILICON_A_STEP,

		      IWL_CFG_RF_TYPE_GF, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_CDB, IWL_CFG_ANY,

		      iwl_cfg_sc_a0_gf4_a0, iwl_sc_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SC, SILICON_A_STEP,

		      IWL_CFG_RF_TYPE_WH, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB, IWL_CFG_ANY,

		      iwl_cfg_sc_a0_wh_a0, iwl_sc_name),

#endif /* CONFIG_IWLMVM */

};