Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff911dca authored by Shaul Triebitz's avatar Shaul Triebitz Committed by Luca Coelho
Browse files

iwlwifi: introduce device family AX210 



Add new device family AX210.
Make the needed changes for this family.

Signed-off-by: default avatarShaul Triebitz <shaul.triebitz@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent b61a6610

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

+47 −0
Original line number Diff line number Diff line
@@ -84,6 +84,10 @@ 
#define IWL_22000_SU_Z0_FW_PRE		"iwlwifi-su-z0-"

#define IWL_QU_B_JF_B_FW_PRE		"iwlwifi-Qu-b0-jf-b0-"

#define IWL_CC_A_FW_PRE			"iwlwifi-cc-a0-"

#define IWL_22000_SO_A_JF_B_FW_PRE	"iwlwifi-so-a0-jf-b0-"

#define IWL_22000_SO_A_HR_B_FW_PRE      "iwlwifi-so-a0-hr-b0-"

#define IWL_22000_SO_A_GF_A_FW_PRE      "iwlwifi-so-a0-gf-a0-"

#define IWL_22000_TY_A_GF_A_FW_PRE      "iwlwifi-ty-a0-gf-a0-"



#define IWL_22000_HR_MODULE_FIRMWARE(api) \

	IWL_22000_HR_FW_PRE __stringify(api) ".ucode"
@@ -107,6 +111,14 @@ 
	IWL_QU_B_JF_B_FW_PRE __stringify(api) ".ucode"

#define IWL_CC_A_MODULE_FIRMWARE(api) \

	IWL_CC_A_FW_PRE __stringify(api) ".ucode"

#define IWL_22000_SO_A_JF_B_MODULE_FIRMWARE(api) \

	IWL_22000_SO_A_JF_B_FW_PRE __stringify(api) ".ucode"

#define IWL_22000_SO_A_HR_B_MODULE_FIRMWARE(api) \

	IWL_22000_SO_A_HR_B_FW_PRE __stringify(api) ".ucode"

#define IWL_22000_SO_A_GF_A_MODULE_FIRMWARE(api) \

	IWL_22000_SO_A_GF_A_FW_PRE __stringify(api) ".ucode"

#define IWL_22000_TY_A_GF_A_MODULE_FIRMWARE(api) \

	IWL_22000_TY_A_GF_A_FW_PRE __stringify(api) ".ucode"



static const struct iwl_base_params iwl_22000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE_32K,
@@ -179,6 +191,13 @@ static const struct iwl_ht_params iwl_22000_ht_params = { 
	.base_params = &iwl_22560_base_params,				\

	.csr = &iwl_csr_v2



#define IWL_DEVICE_AX210						\

	IWL_DEVICE_22000_COMMON,					\

	.device_family = IWL_DEVICE_FAMILY_AX210,			\

	.base_params = &iwl_22000_base_params,				\

	.csr = &iwl_csr_v1,						\

	.min_txq_size = 128



const struct iwl_cfg iwl22000_2ac_cfg_hr = {

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

	.fw_name_pre = IWL_22000_HR_FW_PRE,
@@ -387,6 +406,30 @@ const struct iwl_cfg iwl22560_2ax_cfg_su_cdb = { 
	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

};



const struct iwl_cfg iwlax210_2ax_cfg_so_jf_a0 = {

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

	.fw_name_pre = IWL_22000_SO_A_JF_B_FW_PRE,

	IWL_DEVICE_AX210,

};



const struct iwl_cfg iwlax210_2ax_cfg_so_hr_a0 = {

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

	.fw_name_pre = IWL_22000_SO_A_HR_B_FW_PRE,

	IWL_DEVICE_AX210,

};



const struct iwl_cfg iwlax210_2ax_cfg_so_gf_a0 = {

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

	.fw_name_pre = IWL_22000_SO_A_GF_A_FW_PRE,

	IWL_DEVICE_AX210,

};



const struct iwl_cfg iwlax210_2ax_cfg_ty_gf_a0 = {

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

	.fw_name_pre = IWL_22000_TY_A_GF_A_FW_PRE,

	IWL_DEVICE_AX210,

};



MODULE_FIRMWARE(IWL_22000_HR_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_JF_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_HR_A_F0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
@@ -397,3 +440,7 @@ MODULE_FIRMWARE(IWL_22000_HR_A0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); 
MODULE_FIRMWARE(IWL_22000_SU_Z0_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_QU_B_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_CC_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_SO_A_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_SO_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_SO_A_GF_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_TY_A_GF_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

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

+7 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ enum iwl_device_family { 
	IWL_DEVICE_FAMILY_9000,

	IWL_DEVICE_FAMILY_22000,

	IWL_DEVICE_FAMILY_22560,

	IWL_DEVICE_FAMILY_AX210,

};



/*
@@ -380,6 +381,7 @@ struct iwl_csr_params { 
 * @d3_debug_data_base_addr: base address where D3 debug data is stored

 * @d3_debug_data_length: length of the D3 debug data

 * @bisr_workaround: BISR hardware workaround (for 22260 series devices)

 * @min_txq_size: minimum number of slots required in a TX queue

 *

 * We enable the driver to be backward compatible wrt. hardware features.

 * API differences in uCode shouldn't be handled here but through TLVs
@@ -445,6 +447,7 @@ struct iwl_cfg { 
	u32 extra_phy_cfg_flags;

	u32 d3_debug_data_base_addr;

	u32 d3_debug_data_length;

	u32 min_txq_size;

};



extern const struct iwl_csr_params iwl_csr_v1;
@@ -563,6 +566,10 @@ extern const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_b0; 
extern const struct iwl_cfg iwl22000_2ax_cfg_qnj_jf_b0;

extern const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_a0;

extern const struct iwl_cfg iwl22560_2ax_cfg_su_cdb;

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

extern const struct iwl_cfg iwlax210_2ax_cfg_ty_gf_a0;

#endif /* CPTCFG_IWLMVM || CPTCFG_IWLFMAC */



#endif /* __IWL_CONFIG_H__ */

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

+4 −0
Original line number Diff line number Diff line
@@ -328,11 +328,14 @@ enum { 
#define CSR_HW_REV_TYPE_QNJ		(0x0000360)

#define CSR_HW_REV_TYPE_QNJ_B0		(0x0000364)

#define CSR_HW_REV_TYPE_HR_CDB		(0x0000340)

#define CSR_HW_REV_TYPE_SO		(0x0000370)

#define CSR_HW_REV_TYPE_TY		(0x0000420)



/* RF_ID value */

#define CSR_HW_RF_ID_TYPE_JF		(0x00105100)

#define CSR_HW_RF_ID_TYPE_HR		(0x0010A000)

#define CSR_HW_RF_ID_TYPE_HRCDB		(0x00109F00)

#define CSR_HW_RF_ID_TYPE_GF		(0x0010D000)



/* HW_RF CHIP ID  */

#define CSR_HW_RF_ID_TYPE_CHIP_ID(_val) (((_val) >> 12) & 0xFFF)
@@ -594,6 +597,7 @@ enum msix_hw_int_causes { 
	MSIX_HW_INT_CAUSES_REG_ALIVE		= BIT(0),

	MSIX_HW_INT_CAUSES_REG_WAKEUP		= BIT(1),

	MSIX_HW_INT_CAUSES_REG_IPC		= BIT(1),

	MSIX_HW_INT_CAUSES_REG_IML              = BIT(2),

	MSIX_HW_INT_CAUSES_REG_SW_ERR_V2	= BIT(5),

	MSIX_HW_INT_CAUSES_REG_CT_KILL		= BIT(6),

	MSIX_HW_INT_CAUSES_REG_RF_KILL		= BIT(7),

drivers/net/wireless/intel/iwlwifi/mvm/sta.c

+2 −1
Original line number Diff line number Diff line
@@ -750,7 +750,8 @@ static int iwl_mvm_tvqm_enable_txq(struct iwl_mvm *mvm, 


	if (tid == IWL_MAX_TID_COUNT) {

		tid = IWL_MGMT_TID;

		size = IWL_MGMT_QUEUE_SIZE;

		size = max_t(u32, IWL_MGMT_QUEUE_SIZE,

			     mvm->trans->cfg->min_txq_size);

	}

	queue = iwl_trans_txq_alloc(mvm->trans,

				    cpu_to_le16(TX_QUEUE_CFG_ENABLE_QUEUE),

drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c

+10 −3
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ int iwl_pcie_ctxt_info_gen3_init(struct iwl_trans *trans, 
	void *iml_img;

	u32 control_flags = 0;

	int ret;

	int cmdq_size = max_t(u32, TFD_CMD_SLOTS, trans->cfg->min_txq_size);



	/* Allocate prph scratch */

	prph_scratch = dma_alloc_coherent(trans->dev, sizeof(*prph_scratch),
@@ -151,7 +152,7 @@ int iwl_pcie_ctxt_info_gen3_init(struct iwl_trans *trans, 
	ctxt_info_gen3->mcr_base_addr =

		cpu_to_le64(trans_pcie->rxq->used_bd_dma);

	ctxt_info_gen3->mtr_size =

		cpu_to_le16(TFD_QUEUE_CB_SIZE(TFD_CMD_SLOTS));

		cpu_to_le16(TFD_QUEUE_CB_SIZE(cmdq_size));

	ctxt_info_gen3->mcr_size =

		cpu_to_le16(RX_QUEUE_CB_SIZE(MQ_RX_TABLE_SIZE));
@@ -175,8 +176,14 @@ int iwl_pcie_ctxt_info_gen3_init(struct iwl_trans *trans, 
	iwl_write64(trans, CSR_IML_DATA_ADDR,

		    trans_pcie->iml_dma_addr);

	iwl_write32(trans, CSR_IML_SIZE_ADDR, trans->iml_len);

	iwl_set_bit(trans, CSR_CTXT_INFO_BOOT_CTRL, CSR_AUTO_FUNC_BOOT_ENA);



	if (trans->cfg->device_family >= IWL_DEVICE_FAMILY_AX210) {

		iwl_write_prph(trans, UREG_CPU_INIT_RUN, 1);

	} else {

		iwl_set_bit(trans, CSR_CTXT_INFO_BOOT_CTRL,

			    CSR_AUTO_FUNC_BOOT_ENA);

		iwl_set_bit(trans, CSR_GP_CNTRL, CSR_AUTO_FUNC_INIT);

	}



	return 0;

}