Commit 80b0ebd4 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2017-11-29' of... 

Merge tag 'iwlwifi-next-for-kalle-2017-11-29' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

First batch of iwlwifi updates for v4.16

* Rename the temporary name A000 to 22000;
* Change in the way we print the firmware version;
* Remove some unused code;
* Other small improvements;

kvalo:

There were conflicts, I fixed them with taking into account commit c2c48ddf
("iwlwifi: fix firmware names for 9000 and A000 series hw"):

CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/iwl-config.h
CONFLICT (modify/delete): drivers/net/wireless/intel/iwlwifi/cfg/a000.c deleted in ca495785063c428641cc6df8888afd2587ca6677 and modified in HEAD. Version HEAD of drivers/net/wireless/intel/iwlwifi/cfg/a000.c left in tree.
parents 0fc66ddf 2f7a3863

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/alive.h

+2 −2
Original line number Diff line number Diff line
@@ -95,8 +95,8 @@ enum { 
#define IWL_ALIVE_FLG_RFKILL	BIT(0)



struct iwl_lmac_alive {

	__le32 ucode_minor;

	__le32 ucode_major;

	__le32 ucode_minor;

	u8 ver_subtype;

	u8 ver_type;

	u8 mac;
@@ -113,8 +113,8 @@ struct iwl_lmac_alive { 
} __packed; /* UCODE_ALIVE_NTFY_API_S_VER_3 */



struct iwl_umac_alive {

	__le32 umac_minor;		/* UMAC version: minor */

	__le32 umac_major;		/* UMAC version: major */

	__le32 umac_minor;		/* UMAC version: minor */

	__le32 error_info_addr;		/* SRAM address for UMAC error log */

	__le32 dbg_print_buff_addr;

} __packed; /* UMAC_ALIVE_DATA_API_S_VER_2 */

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

+0 −30
Original line number Diff line number Diff line
@@ -188,11 +188,6 @@ enum iwl_bt_mxbox_dw3 { 
	BT_MBOX(3, UPDATE_REQUEST, 21, 1),

};



enum iwl_bt_mxbox_dw4 {

	BT_MBOX(4, ATS_BT_INTERVAL, 0, 7),

	BT_MBOX(4, ATS_BT_ACTIVE_MAX_TH, 7, 7),

};



#define BT_MBOX_MSG(_notif, _num, _field)				     \

	((le32_to_cpu((_notif)->mbox_msg[(_num)]) & BT_MBOX##_num##_##_field)\

	>> BT_MBOX##_num##_##_field##_POS)
@@ -232,31 +227,6 @@ enum iwl_bt_ci_compliance { 
 * @reserved: reserved

 */

struct iwl_bt_coex_profile_notif {

	__le32 mbox_msg[8];

	__le32 msg_idx;

	__le32 bt_ci_compliance;



	__le32 primary_ch_lut;

	__le32 secondary_ch_lut;

	__le32 bt_activity_grading;

	u8 ttc_status;

	u8 rrc_status;

	__le16 reserved;

} __packed; /* BT_COEX_PROFILE_NTFY_API_S_VER_5 */



/**

 * struct iwl_bt_coex_profile_notif - notification about BT coex

 * @mbox_msg: message from BT to WiFi

 * @msg_idx: the index of the message

 * @bt_ci_compliance: enum %iwl_bt_ci_compliance

 * @primary_ch_lut: LUT used for primary channel &enum iwl_bt_coex_lut_type

 * @secondary_ch_lut: LUT used for secondary channel &enum iwl_bt_coex_lut_type

 * @bt_activity_grading: the activity of BT &enum iwl_bt_activity_grading

 * @ttc_status: is TTC enabled - one bit per PHY

 * @rrc_status: is RRC enabled - one bit per PHY

 * @reserved: reserved

 */

struct iwl_bt_coex_profile_notif_v4 {

	__le32 mbox_msg[4];

	__le32 msg_idx;

	__le32 bt_ci_compliance;

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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE