Commit b7e6725d authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2021-02-05' of... 

Merge tag 'iwlwifi-next-for-kalle-2021-02-05' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

iwlwifi patches intended for v5.12

* Check FW notification sizes for robustness;
* Improvements in the NAPI implementation;
* Implement a workaround for CCA-EXT;
* Add new FW API support;
* Fix a CSA bug;
* Implement PHY integration version parsing;
* A bit of refactoring;
* One more CSA bug fix, this time in the AP side;
* Support for new So devices and a bit of reorg;
* Per Platform Antenna Gain (PPAG) fixes and improvements;
* Improvements in the debug framework;
* Some other clean-ups and small fixes.

# gpg: Signature made Fri 05 Feb 2021 12:04:21 PM EET using RSA key ID 1A3CC5FA
# gpg: Good signature from "Luciano Roth Coelho (Luca) <luca@coelho.fi>"
# gpg:                 aka "Luciano Roth Coelho (Intel) <luciano.coelho@intel.com>"
parents 4331667f 47ef328c

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

+53 −5
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#include "iwl-prph.h"



/* Highest firmware API version supported */

#define IWL_22000_UCODE_API_MAX	59

#define IWL_22000_UCODE_API_MAX	61



/* Lowest firmware API version supported */

#define IWL_22000_UCODE_API_MIN	39
@@ -42,6 +42,7 @@ 
#define IWL_SNJ_A_GF4_A_FW_PRE		"iwlwifi-SoSnj-a0-gf4-a0-"

#define IWL_SNJ_A_GF_A_FW_PRE		"iwlwifi-SoSnj-a0-gf-a0-"

#define IWL_SNJ_A_HR_B_FW_PRE		"iwlwifi-SoSnj-a0-hr-b0-"

#define IWL_SNJ_A_JF_B_FW_PRE		"iwlwifi-SoSnj-a0-jf-b0-"

#define IWL_MA_A_GF_A_FW_PRE		"iwlwifi-ma-a0-gf-a0-"

#define IWL_MA_A_MR_A_FW_PRE		"iwlwifi-ma-a0-mr-a0-"

#define IWL_SNJ_A_MR_A_FW_PRE		"iwlwifi-SoSnj-a0-mr-a0-"
@@ -76,6 +77,8 @@ 
	IWL_SNJ_A_GF_A_FW_PRE __stringify(api) ".ucode"

#define IWL_SNJ_A_HR_B_MODULE_FIRMWARE(api) \

	IWL_SNJ_A_HR_B_FW_PRE __stringify(api) ".ucode"

#define IWL_SNJ_A_JF_B_MODULE_FIRMWARE(api) \

	IWL_SNJ_A_JF_B_FW_PRE __stringify(api) ".ucode"

#define IWL_MA_A_GF_A_FW_MODULE_FIRMWARE(api)		\

	IWL_MA_A_GF_A_FW_PRE __stringify(api) ".ucode"

#define IWL_MA_A_MR_A_FW_MODULE_FIRMWARE(api) \
@@ -238,6 +241,44 @@ const struct iwl_cfg_trans_params iwl_qu_long_latency_trans_cfg = { 
	.ltr_delay = IWL_CFG_TRANS_LTR_DELAY_2500US,

};



const struct iwl_cfg_trans_params iwl_snj_trans_cfg = {

	.mq_rx_supported = true,

	.use_tfh = true,

	.rf_id = true,

	.gen2 = true,

	.device_family = IWL_DEVICE_FAMILY_AX210,

	.base_params = &iwl_ax210_base_params,

	.umac_prph_offset = 0x300000,

};



const struct iwl_cfg_trans_params iwl_so_trans_cfg = {

	.mq_rx_supported = true,

	.use_tfh = true,

	.rf_id = true,

	.gen2 = true,

	.device_family = IWL_DEVICE_FAMILY_AX210,

	.base_params = &iwl_ax210_base_params,

	.umac_prph_offset = 0x300000,

	.integrated = true,

	/* TODO: the following values need to be checked */

	.xtal_latency = 500,

	.ltr_delay = IWL_CFG_TRANS_LTR_DELAY_200US,

};



const struct iwl_cfg_trans_params iwl_so_long_latency_trans_cfg = {

	.mq_rx_supported = true,

	.use_tfh = true,

	.rf_id = true,

	.gen2 = true,

	.device_family = IWL_DEVICE_FAMILY_AX210,

	.base_params = &iwl_ax210_base_params,

	.umac_prph_offset = 0x300000,

	.integrated = true,

	/* TODO: the following values need to be checked */

	.xtal_latency = 12000,

	.ltr_delay = IWL_CFG_TRANS_LTR_DELAY_2500US,

};



/*

 * If the device doesn't support HE, no need to have that many buffers.

 * 22000 devices can split multiple frames into a single RB, so fewer are
@@ -606,9 +647,15 @@ const struct iwl_cfg iwlax211_cfg_snj_gf_a0 = { 
	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwlax201_cfg_snj_hr_b0 = {

	.name = iwl_ax201_name,

	.fw_name_pre = IWL_QU_B_HR_B_FW_PRE,

const struct iwl_cfg iwl_cfg_snj_hr_b0 = {

	.fw_name_pre = IWL_SNJ_A_HR_B_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_snj_a0_jf_b0 = {

	.fw_name_pre = IWL_SNJ_A_JF_B_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,
@@ -650,6 +697,7 @@ MODULE_FIRMWARE(IWL_TY_A_GF_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); 
MODULE_FIRMWARE(IWL_SNJ_A_GF4_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_SNJ_A_GF_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_SNJ_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_SNJ_A_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_MA_A_GF_A_FW_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_MA_A_MR_A_FW_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_SNJ_A_MR_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

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

+17 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */

/*

 * Copyright (C) 2012-2014, 2018-2019 Intel Corporation

 * Copyright (C) 2012-2014, 2018-2020 Intel Corporation

 * Copyright (C) 2013-2015 Intel Mobile Communications GmbH

 * Copyright (C) 2016-2017 Intel Deutschland GmbH

 */
@@ -52,6 +52,12 @@ enum iwl_data_path_subcmd_ids { 
	 */

	CHEST_COLLECTOR_FILTER_CONFIG_CMD = 0x14,



	/**

	 * @MONITOR_NOTIF: Datapath monitoring notification, using

	 *	&struct iwl_datapath_monitor_notif

	 */

	MONITOR_NOTIF = 0xF4,



	/**

	 * @RX_NO_DATA_NOTIF: &struct iwl_rx_no_data

	 */
@@ -153,4 +159,14 @@ struct iwl_channel_estimation_cfg { 
	__le64 frame_types;

} __packed; /* CHEST_COLLECTOR_FILTER_CMD_API_S_VER_1 */



enum iwl_datapath_monitor_notif_type {

	IWL_DP_MON_NOTIF_TYPE_EXT_CCA,

};



struct iwl_datapath_monitor_notif {

	__le32 type;

	u8 mac_id;

	u8 reserved[3];

} __packed; /* MONITOR_NTF_API_S_VER_1 */



#endif /* __iwl_fw_api_datapath_h__ */

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

+15 −0
Original line number Diff line number Diff line
@@ -185,6 +185,21 @@ struct iwl_shared_mem_cfg { 
	__le32 rxfifo2_control_size;

} __packed; /* SHARED_MEM_ALLOC_API_S_VER_4 */



/**

 * struct iwl_mfuart_load_notif_v1 - mfuart image version & status

 * ( MFUART_LOAD_NOTIFICATION = 0xb1 )

 * @installed_ver: installed image version

 * @external_ver: external image version

 * @status: MFUART loading status

 * @duration: MFUART loading time

*/

struct iwl_mfuart_load_notif_v1 {

	__le32 installed_ver;

	__le32 external_ver;

	__le32 status;

	__le32 duration;

} __packed; /* MFU_LOADER_NTFY_API_S_VER_1 */



/**

 * struct iwl_mfuart_load_notif - mfuart image version & status

 * ( MFUART_LOAD_NOTIFICATION = 0xb1 )

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

+5 −2
Original line number Diff line number Diff line
@@ -140,7 +140,8 @@ enum iwl_rx_phy_flags { 
 * @RX_MPDU_RES_STATUS_SEC_TKIP_ENC: this frame is encrypted using TKIP

 * @RX_MPDU_RES_STATUS_SEC_EXT_ENC: this frame is encrypted using extension

 *	algorithm

 * @RX_MPDU_RES_STATUS_SEC_CCM_CMAC_ENC: this frame is encrypted using CCM_CMAC

 * @RX_MPDU_RES_STATUS_SEC_CMAC_GMAC_ENC: this frame is protected using

 *	CMAC or GMAC

 * @RX_MPDU_RES_STATUS_SEC_ENC_ERR: this frame couldn't be decrypted

 * @RX_MPDU_RES_STATUS_SEC_ENC_MSK: bitmask of the encryption algorithm

 * @RX_MPDU_RES_STATUS_DEC_DONE: this frame has been successfully decrypted
@@ -167,7 +168,7 @@ enum iwl_mvm_rx_status { 
	RX_MPDU_RES_STATUS_SEC_CCM_ENC			= (2 << 8),

	RX_MPDU_RES_STATUS_SEC_TKIP_ENC			= (3 << 8),

	RX_MPDU_RES_STATUS_SEC_EXT_ENC			= (4 << 8),

	RX_MPDU_RES_STATUS_SEC_CCM_CMAC_ENC		= (6 << 8),

	RX_MPDU_RES_STATUS_SEC_CMAC_GMAC_ENC		= (6 << 8),

	RX_MPDU_RES_STATUS_SEC_ENC_ERR			= (7 << 8),

	RX_MPDU_RES_STATUS_SEC_ENC_MSK			= (7 << 8),

	RX_MPDU_RES_STATUS_DEC_DONE			= BIT(11),
@@ -239,6 +240,8 @@ enum iwl_rx_mpdu_status { 
	IWL_RX_MPDU_STATUS_ICV_OK		= BIT(5),

	IWL_RX_MPDU_STATUS_MIC_OK		= BIT(6),

	IWL_RX_MPDU_RES_STATUS_TTAK_OK		= BIT(7),

	/* overlayed since IWL_UCODE_TLV_API_DEPRECATE_TTAK */

	IWL_RX_MPDU_STATUS_REPLAY_ERROR		= BIT(7),

	IWL_RX_MPDU_STATUS_SEC_MASK		= 0x7 << 8,

	IWL_RX_MPDU_STATUS_SEC_UNKNOWN		= IWL_RX_MPDU_STATUS_SEC_MASK,

	IWL_RX_MPDU_STATUS_SEC_NONE		= 0x0 << 8,

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

+27 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ struct iwl_tx_cmd { 
	__le16 pm_frame_timeout;

	__le16 reserved4;

	u8 payload[0];

	struct ieee80211_hdr hdr[];

	struct ieee80211_hdr hdr[0];

} __packed; /* TX_CMD_API_S_VER_6 */



struct iwl_dram_sec_info {
@@ -855,6 +855,32 @@ struct iwl_tx_path_flush_cmd { 
	__le16 reserved;

} __packed; /* TX_PATH_FLUSH_CMD_API_S_VER_2 */



#define IWL_TX_FLUSH_QUEUE_RSP 16



/**

 * struct iwl_flush_queue_info - virtual flush queue info

 * @queue_num: virtual queue id

 * @read_before_flush: read pointer before flush

 * @read_after_flush: read pointer after flush

 */

struct iwl_flush_queue_info {

	__le16 tid;

	__le16 queue_num;

	__le16 read_before_flush;

	__le16 read_after_flush;

} __packed; /* TFDQ_FLUSH_INFO_API_S_VER_1 */



/**

 * struct iwl_tx_path_flush_cmd_rsp -- queue/FIFO flush command response

 * @num_flushed_queues: number of queues in queues array

 * @queues: all flushed queues

 */

struct iwl_tx_path_flush_cmd_rsp {

	__le16 sta_id;

	__le16 num_flushed_queues;

	struct iwl_flush_queue_info queues[IWL_TX_FLUSH_QUEUE_RSP];

} __packed; /* TX_PATH_FLUSH_CMD_RSP_API_S_VER_1 */



/* Available options for the SCD_QUEUE_CFG HCMD */

enum iwl_scd_cfg_actions {

	SCD_CFG_DISABLE_QUEUE		= 0x0,