Commit 2f7a3863 authored by Luca Coelho's avatar Luca Coelho
Browse files

iwlwifi: rename the temporary name of A000 to the official 22000 



The family name A000 was just a place-holder when we didn't know what
the official name would be yet.  Now we know that the family name is
22000, so rename all occurrences accordingly.

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

drivers/net/wireless/intel/iwlwifi/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ iwlwifi-objs += iwl-phy-db.o iwl-nvm-parse.o 
iwlwifi-objs		+= pcie/drv.o pcie/rx.o pcie/tx.o pcie/trans.o

iwlwifi-objs		+= pcie/ctxt-info.o pcie/trans-gen2.o pcie/tx-gen2.o

iwlwifi-$(CONFIG_IWLDVM) += cfg/1000.o cfg/2000.o cfg/5000.o cfg/6000.o

iwlwifi-$(CONFIG_IWLMVM) += cfg/7000.o cfg/8000.o cfg/9000.o cfg/a000.o

iwlwifi-$(CONFIG_IWLMVM) += cfg/7000.o cfg/8000.o cfg/9000.o cfg/22000.o

iwlwifi-objs		+= iwl-trans.o

iwlwifi-objs		+= fw/notif-wait.o

iwlwifi-$(CONFIG_IWLMVM) += fw/paging.o fw/smem.o fw/init.o fw/dbg.o

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

+216 −0
Original line number Diff line number Diff line
@@ -55,45 +55,45 @@ 
#include "iwl-agn-hw.h"



/* Highest firmware API version supported */

#define IWL_A000_UCODE_API_MAX	34

#define IWL_22000_UCODE_API_MAX	34



/* Lowest firmware API version supported */

#define IWL_A000_UCODE_API_MIN	24

#define IWL_22000_UCODE_API_MIN	24



/* NVM versions */

#define IWL_A000_NVM_VERSION		0x0a1d

#define IWL_A000_TX_POWER_VERSION	0xffff /* meaningless */

#define IWL_22000_NVM_VERSION		0x0a1d

#define IWL_22000_TX_POWER_VERSION	0xffff /* meaningless */



/* Memory offsets and lengths */

#define IWL_A000_DCCM_OFFSET		0x800000 /* LMAC1 */

#define IWL_A000_DCCM_LEN		0x10000 /* LMAC1 */

#define IWL_A000_DCCM2_OFFSET		0x880000

#define IWL_A000_DCCM2_LEN		0x8000

#define IWL_A000_SMEM_OFFSET		0x400000

#define IWL_A000_SMEM_LEN		0xD0000



#define IWL_A000_JF_FW_PRE	"iwlwifi-Qu-a0-jf-b0-"

#define IWL_A000_HR_FW_PRE	"iwlwifi-Qu-a0-hr-a0-"

#define IWL_A000_HR_CDB_FW_PRE	"iwlwifi-QuIcp-z0-hrcdb-a0-"

#define IWL_A000_HR_F0_FW_PRE	"iwlwifi-QuQnj-f0-hr-a0-"

#define IWL_A000_JF_B0_FW_PRE	"iwlwifi-QuQnj-a0-jf-b0-"

#define IWL_A000_HR_A0_FW_PRE	"iwlwifi-QuQnj-a0-hr-a0-"



#define IWL_A000_HR_MODULE_FIRMWARE(api) \

	IWL_A000_HR_FW_PRE "-" __stringify(api) ".ucode"

#define IWL_A000_JF_MODULE_FIRMWARE(api) \

	IWL_A000_JF_FW_PRE "-" __stringify(api) ".ucode"

#define IWL_A000_HR_F0_QNJ_MODULE_FIRMWARE(api) \

	IWL_A000_HR_F0_FW_PRE "-" __stringify(api) ".ucode"

#define IWL_A000_JF_B0_QNJ_MODULE_FIRMWARE(api) \

	IWL_A000_JF_B0_FW_PRE "-" __stringify(api) ".ucode"

#define IWL_A000_HR_A0_QNJ_MODULE_FIRMWARE(api) \

	IWL_A000_HR_A0_FW_PRE "-" __stringify(api) ".ucode"



#define NVM_HW_SECTION_NUM_FAMILY_A000		10



static const struct iwl_base_params iwl_a000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE_FAMILY_A000,

#define IWL_22000_DCCM_OFFSET		0x800000 /* LMAC1 */

#define IWL_22000_DCCM_LEN		0x10000 /* LMAC1 */

#define IWL_22000_DCCM2_OFFSET		0x880000

#define IWL_22000_DCCM2_LEN		0x8000

#define IWL_22000_SMEM_OFFSET		0x400000

#define IWL_22000_SMEM_LEN		0xD0000



#define IWL_22000_JF_FW_PRE	"iwlwifi-Qu-a0-jf-b0-"

#define IWL_22000_HR_FW_PRE	"iwlwifi-Qu-a0-hr-a0-"

#define IWL_22000_HR_CDB_FW_PRE	"iwlwifi-QuIcp-z0-hrcdb-a0-"

#define IWL_22000_HR_F0_FW_PRE	"iwlwifi-QuQnj-f0-hr-a0-"

#define IWL_22000_JF_B0_FW_PRE	"iwlwifi-QuQnj-a0-jf-b0-"

#define IWL_22000_HR_A0_FW_PRE	"iwlwifi-QuQnj-a0-hr-a0-"



#define IWL_22000_HR_MODULE_FIRMWARE(api) \

	IWL_22000_HR_FW_PRE "-" __stringify(api) ".ucode"

#define IWL_22000_JF_MODULE_FIRMWARE(api) \

	IWL_22000_JF_FW_PRE "-" __stringify(api) ".ucode"

#define IWL_22000_HR_F0_QNJ_MODULE_FIRMWARE(api) \

	IWL_22000_HR_F0_FW_PRE "-" __stringify(api) ".ucode"

#define IWL_22000_JF_B0_QNJ_MODULE_FIRMWARE(api) \

	IWL_22000_JF_B0_FW_PRE "-" __stringify(api) ".ucode"

#define IWL_22000_HR_A0_QNJ_MODULE_FIRMWARE(api) \

	IWL_22000_HR_A0_FW_PRE "-" __stringify(api) ".ucode"



#define NVM_HW_SECTION_NUM_FAMILY_22000		10



static const struct iwl_base_params iwl_22000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE_FAMILY_22000,

	.num_of_queues = 512,

	.shadow_ram_support = true,

	.led_compensation = 57,
@@ -103,28 +103,28 @@ static const struct iwl_base_params iwl_a000_base_params = { 
	.pcie_l1_allowed = true,

};



static const struct iwl_ht_params iwl_a000_ht_params = {

static const struct iwl_ht_params iwl_22000_ht_params = {

	.stbc = true,

	.ldpc = true,

	.ht40_bands = BIT(NL80211_BAND_2GHZ) | BIT(NL80211_BAND_5GHZ),

};



#define IWL_DEVICE_A000							\

	.ucode_api_max = IWL_A000_UCODE_API_MAX,			\

	.ucode_api_min = IWL_A000_UCODE_API_MIN,			\

	.device_family = IWL_DEVICE_FAMILY_A000,			\

#define IWL_DEVICE_22000						\

	.ucode_api_max = IWL_22000_UCODE_API_MAX,			\

	.ucode_api_min = IWL_22000_UCODE_API_MIN,			\

	.device_family = IWL_DEVICE_FAMILY_22000,			\

	.max_inst_size = IWL60_RTC_INST_SIZE,				\

	.max_data_size = IWL60_RTC_DATA_SIZE,				\

	.base_params = &iwl_a000_base_params,				\

	.base_params = &iwl_22000_base_params,				\

	.led_mode = IWL_LED_RF_STATE,					\

	.nvm_hw_section_num = NVM_HW_SECTION_NUM_FAMILY_A000,		\

	.nvm_hw_section_num = NVM_HW_SECTION_NUM_FAMILY_22000,		\

	.non_shared_ant = ANT_A,					\

	.dccm_offset = IWL_A000_DCCM_OFFSET,				\

	.dccm_len = IWL_A000_DCCM_LEN,					\

	.dccm2_offset = IWL_A000_DCCM2_OFFSET,				\

	.dccm2_len = IWL_A000_DCCM2_LEN,				\

	.smem_offset = IWL_A000_SMEM_OFFSET,				\

	.smem_len = IWL_A000_SMEM_LEN,					\

	.dccm_offset = IWL_22000_DCCM_OFFSET,				\

	.dccm_len = IWL_22000_DCCM_LEN,					\

	.dccm2_offset = IWL_22000_DCCM2_OFFSET,				\

	.dccm2_len = IWL_22000_DCCM2_LEN,				\

	.smem_offset = IWL_22000_SMEM_OFFSET,				\

	.smem_len = IWL_22000_SMEM_LEN,					\

	.features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,		\

	.apmg_not_supported = true,					\

	.mq_rx_supported = true,					\
@@ -138,79 +138,79 @@ static const struct iwl_ht_params iwl_a000_ht_params = { 
	.tx_cmd_queue_size = 32,					\

	.min_umac_error_event_table = 0x400000



const struct iwl_cfg iwla000_2ac_cfg_hr = {

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

	.fw_name_pre = IWL_A000_HR_FW_PRE,

	IWL_DEVICE_A000,

	.ht_params = &iwl_a000_ht_params,

	.nvm_ver = IWL_A000_NVM_VERSION,

	.nvm_calib_ver = IWL_A000_TX_POWER_VERSION,

const struct iwl_cfg iwl22000_2ac_cfg_hr = {

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

	.fw_name_pre = IWL_22000_HR_FW_PRE,

	IWL_DEVICE_22000,

	.ht_params = &iwl_22000_ht_params,

	.nvm_ver = IWL_22000_NVM_VERSION,

	.nvm_calib_ver = IWL_22000_TX_POWER_VERSION,

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,

};



const struct iwl_cfg iwla000_2ac_cfg_hr_cdb = {

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

	.fw_name_pre = IWL_A000_HR_CDB_FW_PRE,

	IWL_DEVICE_A000,

	.ht_params = &iwl_a000_ht_params,

	.nvm_ver = IWL_A000_NVM_VERSION,

	.nvm_calib_ver = IWL_A000_TX_POWER_VERSION,

const struct iwl_cfg iwl22000_2ac_cfg_hr_cdb = {

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

	.fw_name_pre = IWL_22000_HR_CDB_FW_PRE,

	IWL_DEVICE_22000,

	.ht_params = &iwl_22000_ht_params,

	.nvm_ver = IWL_22000_NVM_VERSION,

	.nvm_calib_ver = IWL_22000_TX_POWER_VERSION,

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,

	.cdb = true,

};



const struct iwl_cfg iwla000_2ac_cfg_jf = {

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

	.fw_name_pre = IWL_A000_JF_FW_PRE,

	IWL_DEVICE_A000,

	.ht_params = &iwl_a000_ht_params,

	.nvm_ver = IWL_A000_NVM_VERSION,

	.nvm_calib_ver = IWL_A000_TX_POWER_VERSION,

const struct iwl_cfg iwl22000_2ac_cfg_jf = {

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

	.fw_name_pre = IWL_22000_JF_FW_PRE,

	IWL_DEVICE_22000,

	.ht_params = &iwl_22000_ht_params,

	.nvm_ver = IWL_22000_NVM_VERSION,

	.nvm_calib_ver = IWL_22000_TX_POWER_VERSION,

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,

};



const struct iwl_cfg iwla000_2ax_cfg_hr = {

	.name = "Intel(R) Dual Band Wireless AX a000",

	.fw_name_pre = IWL_A000_HR_FW_PRE,

	IWL_DEVICE_A000,

	.ht_params = &iwl_a000_ht_params,

	.nvm_ver = IWL_A000_NVM_VERSION,

	.nvm_calib_ver = IWL_A000_TX_POWER_VERSION,

const struct iwl_cfg iwl22000_2ax_cfg_hr = {

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

	.fw_name_pre = IWL_22000_HR_FW_PRE,

	IWL_DEVICE_22000,

	.ht_params = &iwl_22000_ht_params,

	.nvm_ver = IWL_22000_NVM_VERSION,

	.nvm_calib_ver = IWL_22000_TX_POWER_VERSION,

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,

};



const struct iwl_cfg iwla000_2ax_cfg_qnj_hr_f0 = {

	.name = "Intel(R) Dual Band Wireless AX a000",

	.fw_name_pre = IWL_A000_HR_F0_FW_PRE,

	IWL_DEVICE_A000,

	.ht_params = &iwl_a000_ht_params,

	.nvm_ver = IWL_A000_NVM_VERSION,

	.nvm_calib_ver = IWL_A000_TX_POWER_VERSION,

const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_f0 = {

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

	.fw_name_pre = IWL_22000_HR_F0_FW_PRE,

	IWL_DEVICE_22000,

	.ht_params = &iwl_22000_ht_params,

	.nvm_ver = IWL_22000_NVM_VERSION,

	.nvm_calib_ver = IWL_22000_TX_POWER_VERSION,

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,

};



const struct iwl_cfg iwla000_2ax_cfg_qnj_jf_b0 = {

	.name = "Intel(R) Dual Band Wireless AX a000",

	.fw_name_pre = IWL_A000_JF_B0_FW_PRE,

	IWL_DEVICE_A000,

	.ht_params = &iwl_a000_ht_params,

	.nvm_ver = IWL_A000_NVM_VERSION,

	.nvm_calib_ver = IWL_A000_TX_POWER_VERSION,

const struct iwl_cfg iwl22000_2ax_cfg_qnj_jf_b0 = {

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

	.fw_name_pre = IWL_22000_JF_B0_FW_PRE,

	IWL_DEVICE_22000,

	.ht_params = &iwl_22000_ht_params,

	.nvm_ver = IWL_22000_NVM_VERSION,

	.nvm_calib_ver = IWL_22000_TX_POWER_VERSION,

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,

};



const struct iwl_cfg iwla000_2ax_cfg_qnj_hr_a0 = {

	.name = "Intel(R) Dual Band Wireless AX a000",

	.fw_name_pre = IWL_A000_HR_A0_FW_PRE,

	IWL_DEVICE_A000,

	.ht_params = &iwl_a000_ht_params,

	.nvm_ver = IWL_A000_NVM_VERSION,

	.nvm_calib_ver = IWL_A000_TX_POWER_VERSION,

const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_a0 = {

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

	.fw_name_pre = IWL_22000_HR_A0_FW_PRE,

	IWL_DEVICE_22000,

	.ht_params = &iwl_22000_ht_params,

	.nvm_ver = IWL_22000_NVM_VERSION,

	.nvm_calib_ver = IWL_22000_TX_POWER_VERSION,

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,

};



MODULE_FIRMWARE(IWL_A000_HR_MODULE_FIRMWARE(IWL_A000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_A000_JF_MODULE_FIRMWARE(IWL_A000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_A000_HR_F0_QNJ_MODULE_FIRMWARE(IWL_A000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_A000_JF_B0_QNJ_MODULE_FIRMWARE(IWL_A000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_A000_HR_A0_QNJ_MODULE_FIRMWARE(IWL_A000_UCODE_API_MAX));
 
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_F0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_JF_B0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_HR_A0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

drivers/net/wireless/intel/iwlwifi/fw/api/commands.h

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ enum iwl_legacy_cmds { 
	/**

	 * @SCD_QUEUE_CFG: &struct iwl_scd_txq_cfg_cmd for older hardware,

	 *	&struct iwl_tx_queue_cfg_cmd with &struct iwl_tx_queue_cfg_rsp

	 *	for newer (A000) hardware.

	 *	for newer (22000) hardware.

	 */

	SCD_QUEUE_CFG = 0x1d,

drivers/net/wireless/intel/iwlwifi/fw/api/tx.h

+2 −2
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ enum iwl_tx_flags { 
}; /* TX_FLAGS_BITS_API_S_VER_1 */



/**

 * enum iwl_tx_cmd_flags - bitmasks for tx_flags in TX command for a000

 * enum iwl_tx_cmd_flags - bitmasks for tx_flags in TX command for 22000

 * @IWL_TX_FLAGS_CMD_RATE: use rate from the TX command

 * @IWL_TX_FLAGS_ENCRYPT_DIS: frame should not be encrypted, even if it belongs

 *	to a secured STA
@@ -301,7 +301,7 @@ struct iwl_dram_sec_info { 
} __packed; /* DRAM_SEC_INFO_API_S_VER_1 */



/**

 * struct iwl_tx_cmd_gen2 - TX command struct to FW for a000 devices

 * struct iwl_tx_cmd_gen2 - TX command struct to FW for 22000 devices

 * ( TX_CMD = 0x1c )

 * @len: in bytes of the payload, see below for details

 * @offload_assist: TX offload configuration

drivers/net/wireless/intel/iwlwifi/fw/smem.c

+4 −4
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ 
#include "runtime.h"

#include "fw/api/commands.h"



static void iwl_parse_shared_mem_a000(struct iwl_fw_runtime *fwrt,

static void iwl_parse_shared_mem_22000(struct iwl_fw_runtime *fwrt,

				       struct iwl_rx_packet *pkt)

{

	struct iwl_shared_mem_cfg *mem_cfg = (void *)pkt->data;
@@ -143,8 +143,8 @@ void iwl_get_shared_mem_conf(struct iwl_fw_runtime *fwrt) 
		return;



	pkt = cmd.resp_pkt;

	if (fwrt->trans->cfg->device_family == IWL_DEVICE_FAMILY_A000)

		iwl_parse_shared_mem_a000(fwrt, pkt);

	if (fwrt->trans->cfg->device_family == IWL_DEVICE_FAMILY_22000)

		iwl_parse_shared_mem_22000(fwrt, pkt);

	else

		iwl_parse_shared_mem(fwrt, pkt);