Commit af82c007 authored by Matti Gottlieb's avatar Matti Gottlieb Committed by Luca Coelho
Browse files

iwlwifi: Add support for more BZ HWs 



Add support for GA and for BZ with FM rf.

Signed-off-by: default avatarMatti Gottlieb <matti.gottlieb@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20210826224715.64ab5278fb9f.I4f2a547dc04c3d14cacdbc739da0b056fc04923d@changeid


Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 1f171f4f

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

+23 −0
Original line number Diff line number Diff line
@@ -53,6 +53,9 @@ 
#define IWL_BZ_A_GF_A_FW_PRE		"iwlwifi-bz-a0-gf-a0-"

#define IWL_BZ_A_GF4_A_FW_PRE		"iwlwifi-bz-a0-gf4-a0-"

#define IWL_BZ_A_MR_A_FW_PRE		"iwlwifi-bz-a0-mr-a0-"

#define IWL_BZ_A_FM_A_FW_PRE		"iwlwifi-bz-a0-fm-a0-"

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





#define IWL_QU_B_HR_B_MODULE_FIRMWARE(api) \

	IWL_QU_B_HR_B_FW_PRE __stringify(api) ".ucode"
@@ -106,6 +109,10 @@ 
	IWL_BZ_A_GF4_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BZ_A_MR_A_MODULE_FIRMWARE(api) \

	IWL_BZ_A_MR_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BZ_A_FM_A_MODULE_FIRMWARE(api) \

		IWL_BZ_A_FM_A_FW_PRE __stringify(api) ".ucode"

#define IWL_GL_A_FM_A_MODULE_FIRMWARE(api) \

		IWL_GL_A_FM_A_FW_PRE __stringify(api) ".ucode"



static const struct iwl_base_params iwl_22000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE_32K,
@@ -850,6 +857,20 @@ const struct iwl_cfg iwl_cfg_bz_a0_mr_a0 = { 
	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_bz_a0_fm_a0 = {

	.fw_name_pre = IWL_BZ_A_FM_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_BZ,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_gl_a0_fm_a0 = {

	.fw_name_pre = IWL_GL_A_FM_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_BZ,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



MODULE_FIRMWARE(IWL_QU_B_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_QNJ_B_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_QU_C_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
@@ -876,3 +897,5 @@ MODULE_FIRMWARE(IWL_BZ_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); 
MODULE_FIRMWARE(IWL_BZ_A_GF_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

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_GL_A_FM_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

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

+3 −0
Original line number Diff line number Diff line
@@ -420,6 +420,7 @@ struct iwl_cfg { 
#define IWL_CFG_MAC_TYPE_SOF		0x43

#define IWL_CFG_MAC_TYPE_MA		0x44

#define IWL_CFG_MAC_TYPE_BZ		0x46

#define IWL_CFG_MAC_TYPE_GL		0x47



#define IWL_CFG_RF_TYPE_TH		0x105

#define IWL_CFG_RF_TYPE_TH1		0x108
@@ -628,6 +629,8 @@ extern const struct iwl_cfg iwl_cfg_bz_a0_hr_b0; 
extern const struct iwl_cfg iwl_cfg_bz_a0_gf_a0;

extern const struct iwl_cfg iwl_cfg_bz_a0_gf4_a0;

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

#endif /* CONFIG_IWLMVM */



#endif /* __IWL_CONFIG_H__ */

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

+1 −0
Original line number Diff line number Diff line
@@ -437,6 +437,7 @@ enum { 
#define REG_CRF_ID_TYPE_GF			0x410

#define REG_CRF_ID_TYPE_GF_TC			0xF08

#define REG_CRF_ID_TYPE_MR			0x810

#define REG_CRF_ID_TYPE_FM			0x910



#define HPM_DEBUG			0xA03440

#define PERSISTENCE_BIT			BIT(12)

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

+14 −0
Original line number Diff line number Diff line
@@ -1112,6 +1112,17 @@ static const struct iwl_dev_info iwl_dev_info_table[] = { 
		      IWL_CFG_RF_TYPE_MR, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB,

		      iwl_cfg_bz_a0_mr_a0, 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,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB,

		      iwl_cfg_bz_a0_fm_a0, iwl_bz_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_GL, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_FM, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB,

		      iwl_cfg_gl_a0_fm_a0, iwl_bz_name),





/* SoF with JF2 */

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
@@ -1252,6 +1263,9 @@ static int get_crf_id(struct iwl_trans *iwl_trans) 
	case REG_CRF_ID_TYPE_MR:

		iwl_trans->hw_rf_id = (IWL_CFG_RF_TYPE_MR << 12);

		break;

		case REG_CRF_ID_TYPE_FM:

			iwl_trans->hw_rf_id = (IWL_CFG_RF_TYPE_FM << 12);

			break;

	default:

		ret = -EIO;

		IWL_ERR(iwl_trans,