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

wifi: iwlwifi: support version C0 of BZ and GL devices 



Add support for C0 version of MAC and RF for BZ and GL 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/20230613155501.90ad8aab8a03.I86d1675095f0e4f5286d9b7c2b00a0220f524472@changeid


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

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

+27 −0
Original line number Diff line number Diff line
@@ -65,9 +65,12 @@ 
#define IWL_BZ_A_FM_A_FW_PRE		"iwlwifi-bz-a0-fm-a0-"

#define IWL_BZ_A_FM4_A_FW_PRE		"iwlwifi-bz-a0-fm4-a0-"

#define IWL_BZ_A_FM_B_FW_PRE		"iwlwifi-bz-a0-fm-b0-"

#define IWL_BZ_A_FM_C_FW_PRE		"iwlwifi-bz-a0-fm-c0-"

#define IWL_BZ_A_FM4_B_FW_PRE		"iwlwifi-bz-a0-fm4-b0-"

#define IWL_GL_A_FM_A_FW_PRE		"iwlwifi-gl-a0-fm-a0-"

#define IWL_GL_B_FM_B_FW_PRE		"iwlwifi-gl-b0-fm-b0-"

#define IWL_GL_C_FM_C_FW_PRE		"iwlwifi-gl-c0-fm-c0-"



#define IWL_BZ_Z_GF_A_FW_PRE		"iwlwifi-bz-z0-gf-a0-"

#define IWL_BNJ_A_FM_A_FW_PRE		"iwlwifi-BzBnj-a0-fm-a0-"

#define IWL_BNJ_A_FM4_A_FW_PRE		"iwlwifi-BzBnj-a0-fm4-a0-"
@@ -153,12 +156,16 @@ 
	IWL_BZ_A_FM4_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BZ_A_FM_B_MODULE_FIRMWARE(api) \

	IWL_BZ_A_FM_B_FW_PRE __stringify(api) ".ucode"

#define IWL_BZ_A_FM_C_MODULE_FIRMWARE(api) \

		IWL_BZ_A_FM_C_FW_PRE __stringify(api) ".ucode"

#define IWL_BZ_A_FM4_B_MODULE_FIRMWARE(api) \

	IWL_BZ_A_FM4_B_FW_PRE __stringify(api) ".ucode"

#define IWL_GL_A_FM_A_MODULE_FIRMWARE(api) \

	IWL_GL_A_FM_A_FW_PRE __stringify(api) ".ucode"

#define IWL_GL_B_FM_B_MODULE_FIRMWARE(api) \

	IWL_GL_B_FM_B_FW_PRE __stringify(api) ".ucode"

#define IWL_GL_C_FM_C_MODULE_FIRMWARE(api) \

	IWL_GL_C_FM_C_FW_PRE __stringify(api) ".ucode"

#define IWL_BNJ_A_FM_A_MODULE_FIRMWARE(api) \

	IWL_BNJ_A_FM_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BNJ_A_FM4_A_MODULE_FIRMWARE(api) \
@@ -173,6 +180,7 @@ 
	IWL_BNJ_A_GF4_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BNJ_B_GF4_A_MODULE_FIRMWARE(api) \

	IWL_BNJ_B_GF4_A_FW_PRE __stringify(api) ".ucode"



#define IWL_BNJ_A_HR_A_MODULE_FIRMWARE(api) \

	IWL_BNJ_A_HR_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BNJ_A_HR_B_MODULE_FIRMWARE(api) \
@@ -1053,6 +1061,14 @@ const struct iwl_cfg iwl_cfg_bz_a0_fm_b0 = { 
	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_bz_a0_fm_c0 = {

	.fw_name_pre = IWL_BZ_A_FM_C_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_BZ,

	.features = IWL_TX_CSUM_NETIF_FLAGS_BZ | NETIF_F_RXCSUM,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_bz_a0_fm4_b0 = {

	.fw_name_pre = IWL_BZ_A_FM4_B_FW_PRE,

	.uhb_supported = true,
@@ -1077,6 +1093,14 @@ const struct iwl_cfg iwl_cfg_gl_b0_fm_b0 = { 
	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_gl_c0_fm_c0 = {

	.fw_name_pre = IWL_GL_C_FM_C_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_BZ,

	.features = IWL_TX_CSUM_NETIF_FLAGS_BZ | NETIF_F_RXCSUM,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_bz_z0_gf_a0 = {

	.fw_name_pre = IWL_BZ_Z_GF_A_FW_PRE,

	.uhb_supported = true,
@@ -1180,6 +1204,7 @@ const struct iwl_cfg iwl_cfg_bnj_b0_fm_b0 = { 
	.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));
@@ -1214,6 +1239,7 @@ MODULE_FIRMWARE(IWL_BZ_A_GF4_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); 
MODULE_FIRMWARE(IWL_BZ_A_MR_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BZ_A_FM_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BZ_A_FM_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BZ_A_FM_C_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_GL_A_FM_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BNJ_A_FM_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BNJ_A_FM4_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
@@ -1228,4 +1254,5 @@ MODULE_FIRMWARE(IWL_BNJ_B_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); 
MODULE_FIRMWARE(IWL_BZ_A_FM4_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

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));

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

+2 −0
Original line number Diff line number Diff line
@@ -658,9 +658,11 @@ extern const struct iwl_cfg iwl_cfg_bz_a0_mr_a0; 
extern const struct iwl_cfg iwl_cfg_bz_a0_fm_a0;

extern const struct iwl_cfg iwl_cfg_bz_a0_fm4_a0;

extern const struct iwl_cfg iwl_cfg_bz_a0_fm_b0;

extern const struct iwl_cfg iwl_cfg_bz_a0_fm_c0;

extern const struct iwl_cfg iwl_cfg_bz_a0_fm4_b0;

extern const struct iwl_cfg iwl_cfg_gl_a0_fm_a0;

extern const struct iwl_cfg iwl_cfg_gl_b0_fm_b0;

extern const struct iwl_cfg iwl_cfg_gl_c0_fm_c0;

extern const struct iwl_cfg iwl_cfg_bz_z0_gf_a0;

extern const struct iwl_cfg iwl_cfg_bnj_a0_fm_a0;

extern const struct iwl_cfg iwl_cfg_bnj_a0_fm4_a0;

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

+12 −2
Original line number Diff line number Diff line
@@ -1198,12 +1198,17 @@ static const struct iwl_dev_info iwl_dev_info_table[] = { 
	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_BZ, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_FM, IWL_CFG_ANY, SILICON_B_STEP,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB, IWL_CFG_IS_JACKET,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB, IWL_CFG_NO_JACKET,

		      iwl_cfg_bz_a0_fm_b0, iwl_bz_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_BZ, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_FM, IWL_CFG_ANY, SILICON_C_STEP,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB, IWL_CFG_NO_JACKET,

		      iwl_cfg_bz_a0_fm_c0, iwl_bz_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_BZ, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_FM, IWL_CFG_ANY, SILICON_B_STEP,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_CDB, IWL_CFG_IS_JACKET,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_CDB, IWL_CFG_NO_JACKET,

		      iwl_cfg_bz_a0_fm4_b0, iwl_bz_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_GL, SILICON_A_STEP,
@@ -1215,6 +1220,11 @@ static const struct iwl_dev_info iwl_dev_info_table[] = { 
		      IWL_CFG_RF_TYPE_FM, IWL_CFG_ANY, SILICON_B_STEP,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB, IWL_CFG_NO_JACKET,

		      iwl_cfg_gl_b0_fm_b0, iwl_bz_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_GL, SILICON_C_STEP,

		      IWL_CFG_RF_TYPE_FM, IWL_CFG_ANY, SILICON_C_STEP,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB, IWL_CFG_NO_JACKET,

		      iwl_cfg_gl_c0_fm_c0, iwl_bz_name),



/* BZ Z step */

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,