Commit 5213e8a8 authored by Johannes Berg's avatar Johannes Berg Committed by Luca Coelho
Browse files

iwlwifi: mvm: implement CSI reporting 



Implement CSI (channel estimation matrix) reporting in the mvm
driver, if the firmware has the capability.

Currently only a debugfs API is provided as the API is still
under discussion.

For now, RX aggregation must be disabled to use this feature
on data frames as we haven't found a good way to attach the
data to A-MPDUs, given complexities with multi-queue.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 6c161980

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

+55 −0
Original line number Diff line number Diff line
@@ -104,6 +104,12 @@ enum iwl_data_path_subcmd_ids { 
	 */

	HE_AIR_SNIFFER_CONFIG_CMD = 0x13,



	/**

	 * @CHEST_COLLECTOR_FILTER_CONFIG_CMD: Configure the CSI

	 *	matrix collection, uses &struct iwl_channel_estimation_cfg

	 */

	CHEST_COLLECTOR_FILTER_CONFIG_CMD = 0x14,



	/**

	 * @RX_NO_DATA_NOTIF: &struct iwl_rx_no_data

	 */
@@ -156,4 +162,53 @@ struct iwl_mu_group_mgmt_notif { 
	__le32 user_position[4];

} __packed; /* MU_GROUP_MNG_NTFY_API_S_VER_1 */



enum iwl_channel_estimation_flags {

	IWL_CHANNEL_ESTIMATION_ENABLE	= BIT(0),

	IWL_CHANNEL_ESTIMATION_TIMER	= BIT(1),

	IWL_CHANNEL_ESTIMATION_COUNTER	= BIT(2),

};



/**

 * struct iwl_channel_estimation_cfg - channel estimation reporting config

 */

struct iwl_channel_estimation_cfg {

	/**

	 * @flags: flags, see &enum iwl_channel_estimation_flags

	 */

	__le32 flags;

	/**

	 * @timer: if enabled via flags, automatically disable after this many

	 *	microseconds

	 */

	__le32 timer;

	/**

	 * @count: if enabled via flags, automatically disable after this many

	 *	frames with channel estimation matrix were captured

	 */

	__le32 count;

	/**

	 * @rate_n_flags_mask: only try to record the channel estimation matrix

	 *	if the rate_n_flags value for the received frame (let's call

	 *	that rx_rnf) matches the mask/value given here like this:

	 *	(rx_rnf & rate_n_flags_mask) == rate_n_flags_val.

	 */

	__le32 rate_n_flags_mask;

	/**

	 * @rate_n_flags_val: see @rate_n_flags_mask

	 */

	__le32 rate_n_flags_val;

	/**

	 * @reserved: reserved (for alignment)

	 */

	__le32 reserved;

	/**

	 * @frame_types: bitmap of frame types to capture, the received frame's

	 *	subtype|type takes 6 bits in the frame and the corresponding bit

	 *	in this field must be set to 1 to capture channel estimation for

	 *	that frame type. Set to all-ones to enable capturing for all

	 *	frame types.

	 */

	__le64 frame_types;

} __packed; /* CHEST_COLLECTOR_FILTER_CMD_API_S_VER_1 */



#endif /* __iwl_fw_api_datapath_h__ */

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

+20 −0
Original line number Diff line number Diff line
@@ -93,6 +93,15 @@ enum iwl_location_subcmd_ids { 
	 *	uses &struct iwl_tof_responder_dyn_config_cmd

	 */

	TOF_RESPONDER_DYN_CONFIG_CMD = 0x5,

	/**

	 * @CSI_HEADER_NOTIFICATION: CSI header

	 */

	CSI_HEADER_NOTIFICATION = 0xFA,

	/**

	 * @CSI_CHUNKS_NOTIFICATION: CSI chunk,

	 *	uses &struct iwl_csi_chunk_notification

	 */

	CSI_CHUNKS_NOTIFICATION = 0xFB,

	/**

	 * @TOF_LC_NOTIF: used for LCI/civic location, contains just

	 *	the action frame
@@ -688,4 +697,15 @@ struct iwl_ftm_responder_stats { 
	__le16 reserved;

} __packed; /* TOF_RESPONDER_STATISTICS_NTFY_S_VER_2 */



#define IWL_CSI_CHUNK_CTL_NUM_MASK	0x3

#define IWL_CSI_CHUNK_CTL_IDX_MASK	0xc



struct iwl_csi_chunk_notification {

	__le32 token;

	__le16 seq;

	__le16 ctl;

	__le32 size;

	u8 data[];

} __packed; /* CSI_CHUNKS_HDR_NTFY_API_S_VER_1 */



#endif /* __iwl_fw_api_location_h__ */

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

+2 −0
Original line number Diff line number Diff line
@@ -333,6 +333,8 @@ enum iwl_rx_mpdu_phy_info { 
	IWL_RX_MPDU_PHY_AMPDU		= BIT(5),

	IWL_RX_MPDU_PHY_AMPDU_TOGGLE	= BIT(6),

	IWL_RX_MPDU_PHY_SHORT_PREAMBLE	= BIT(7),

	/* short preamble is only for CCK, for non-CCK overridden by this */

	IWL_RX_MPDU_PHY_NCCK_ADDTL_NTFY	= BIT(7),

	IWL_RX_MPDU_PHY_TSF_OVERLOAD	= BIT(8),

};

drivers/net/wireless/intel/iwlwifi/fw/file.h

+6 −1
Original line number Diff line number Diff line
@@ -356,10 +356,13 @@ typedef unsigned int __bitwise iwl_ucode_tlv_capa_t; 
 * @IWL_UCODE_TLV_CAPA_TX_POWER_ACK: reduced TX power API has larger

 *	command size (command version 4) that supports toggling ACK TX

 *	power reduction.

 * @IWL_UCODE_TLV_CAPA_MLME_OFFLOAD: supports MLME offload

 * @IWL_UCODE_TLV_CAPA_D3_DEBUG: supports debug recording during D3

 * @IWL_UCODE_TLV_CAPA_MCC_UPDATE_11AX_SUPPORT: MCC response support 11ax

 *	capability.

 * @IWL_UCODE_TLV_CAPA_CSI_REPORTING: firmware is capable of being configured

 *	to report the CSI information with (certain) RX frames

 *

 * @IWL_UCODE_TLV_CAPA_MLME_OFFLOAD: supports MLME offload

 *

 * @NUM_IWL_UCODE_TLV_CAPA: number of bits used

 */
@@ -410,6 +413,8 @@ enum iwl_ucode_tlv_capa { 
	IWL_UCODE_TLV_CAPA_D3_DEBUG			= (__force iwl_ucode_tlv_capa_t)87,

	IWL_UCODE_TLV_CAPA_LED_CMD_SUPPORT		= (__force iwl_ucode_tlv_capa_t)88,

	IWL_UCODE_TLV_CAPA_MCC_UPDATE_11AX_SUPPORT	= (__force iwl_ucode_tlv_capa_t)89,

	IWL_UCODE_TLV_CAPA_CSI_REPORTING		= (__force iwl_ucode_tlv_capa_t)90,



	IWL_UCODE_TLV_CAPA_MLME_OFFLOAD			= (__force iwl_ucode_tlv_capa_t)96,



	NUM_IWL_UCODE_TLV_CAPA

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

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ 
#include "sta.h"

#include "iwl-io.h"

#include "debugfs.h"

#include "iwl-modparams.h"

#include "fw/error-dump.h"



static ssize_t iwl_dbgfs_ctdp_budget_read(struct file *file,