iwlwifi: mvm: responder: support responder config command version 8
Version 8 add NDP ranging parameters configuration, as well as enable/disable NDP ranging and LMR feedback. Signed-off-by: Avraham Stern <avraham.stern@intel.com> Signed-off-by: Luca Coelho <luciano.coelho@intel.com> Link: https://lore.kernel.org/r/iwlwifi.20210330162204.ce9570d755d3.Ic81cb8da9aecbbc9edff468cb4ffbb741418cc73@changeid Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
This commit is contained in:
parent
9896b0b904
commit
20578872d5
|
@ -147,6 +147,10 @@ enum iwl_tof_mcsi_enable {
|
||||||
* @IWL_TOF_RESPONDER_CMD_VALID_RETRY_ON_ALGO_FAIL: retry on algorithm failure
|
* @IWL_TOF_RESPONDER_CMD_VALID_RETRY_ON_ALGO_FAIL: retry on algorithm failure
|
||||||
* is valid
|
* is valid
|
||||||
* @IWL_TOF_RESPONDER_CMD_VALID_STA_ID: station ID is valid
|
* @IWL_TOF_RESPONDER_CMD_VALID_STA_ID: station ID is valid
|
||||||
|
* @IWL_TOF_RESPONDER_CMD_VALID_NDP_SUPPORT: enable/disable NDP ranging support
|
||||||
|
* is valid
|
||||||
|
* @IWL_TOF_RESPONDER_CMD_VALID_NDP_PARAMS: NDP parameters are valid
|
||||||
|
* @IWL_TOF_RESPONDER_CMD_VALID_LMR_FEEDBACK: LMR feedback support is valid
|
||||||
*/
|
*/
|
||||||
enum iwl_tof_responder_cmd_valid_field {
|
enum iwl_tof_responder_cmd_valid_field {
|
||||||
IWL_TOF_RESPONDER_CMD_VALID_CHAN_INFO = BIT(0),
|
IWL_TOF_RESPONDER_CMD_VALID_CHAN_INFO = BIT(0),
|
||||||
|
@ -162,6 +166,9 @@ enum iwl_tof_responder_cmd_valid_field {
|
||||||
IWL_TOF_RESPONDER_CMD_VALID_FAST_ALGO_SUPPORT = BIT(10),
|
IWL_TOF_RESPONDER_CMD_VALID_FAST_ALGO_SUPPORT = BIT(10),
|
||||||
IWL_TOF_RESPONDER_CMD_VALID_RETRY_ON_ALGO_FAIL = BIT(11),
|
IWL_TOF_RESPONDER_CMD_VALID_RETRY_ON_ALGO_FAIL = BIT(11),
|
||||||
IWL_TOF_RESPONDER_CMD_VALID_STA_ID = BIT(12),
|
IWL_TOF_RESPONDER_CMD_VALID_STA_ID = BIT(12),
|
||||||
|
IWL_TOF_RESPONDER_CMD_VALID_NDP_SUPPORT = BIT(22),
|
||||||
|
IWL_TOF_RESPONDER_CMD_VALID_NDP_PARAMS = BIT(23),
|
||||||
|
IWL_TOF_RESPONDER_CMD_VALID_LMR_FEEDBACK = BIT(24),
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -176,6 +183,9 @@ enum iwl_tof_responder_cmd_valid_field {
|
||||||
* @IWL_TOF_RESPONDER_FLAGS_FAST_ALGO_SUPPORT: fast algorithm support
|
* @IWL_TOF_RESPONDER_FLAGS_FAST_ALGO_SUPPORT: fast algorithm support
|
||||||
* @IWL_TOF_RESPONDER_FLAGS_RETRY_ON_ALGO_FAIL: retry on algorithm fail
|
* @IWL_TOF_RESPONDER_FLAGS_RETRY_ON_ALGO_FAIL: retry on algorithm fail
|
||||||
* @IWL_TOF_RESPONDER_FLAGS_FTM_TX_ANT: TX antenna mask
|
* @IWL_TOF_RESPONDER_FLAGS_FTM_TX_ANT: TX antenna mask
|
||||||
|
* @IWL_TOF_RESPONDER_FLAGS_NDP_SUPPORT: support NDP ranging
|
||||||
|
* @IWL_TOF_RESPONDER_FLAGS_LMR_FEEDBACK: request for LMR feedback if the
|
||||||
|
* initiator supports it
|
||||||
*/
|
*/
|
||||||
enum iwl_tof_responder_cfg_flags {
|
enum iwl_tof_responder_cfg_flags {
|
||||||
IWL_TOF_RESPONDER_FLAGS_NON_ASAP_SUPPORT = BIT(0),
|
IWL_TOF_RESPONDER_FLAGS_NON_ASAP_SUPPORT = BIT(0),
|
||||||
|
@ -188,6 +198,8 @@ enum iwl_tof_responder_cfg_flags {
|
||||||
IWL_TOF_RESPONDER_FLAGS_FAST_ALGO_SUPPORT = BIT(9),
|
IWL_TOF_RESPONDER_FLAGS_FAST_ALGO_SUPPORT = BIT(9),
|
||||||
IWL_TOF_RESPONDER_FLAGS_RETRY_ON_ALGO_FAIL = BIT(10),
|
IWL_TOF_RESPONDER_FLAGS_RETRY_ON_ALGO_FAIL = BIT(10),
|
||||||
IWL_TOF_RESPONDER_FLAGS_FTM_TX_ANT = RATE_MCS_ANT_ABC_MSK,
|
IWL_TOF_RESPONDER_FLAGS_FTM_TX_ANT = RATE_MCS_ANT_ABC_MSK,
|
||||||
|
IWL_TOF_RESPONDER_FLAGS_NDP_SUPPORT = BIT(24),
|
||||||
|
IWL_TOF_RESPONDER_FLAGS_LMR_FEEDBACK = BIT(25),
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -226,7 +238,7 @@ struct iwl_tof_responder_config_cmd_v6 {
|
||||||
} __packed; /* TOF_RESPONDER_CONFIG_CMD_API_S_VER_6 */
|
} __packed; /* TOF_RESPONDER_CONFIG_CMD_API_S_VER_6 */
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* struct iwl_tof_responder_config_cmd - ToF AP mode (for debug)
|
* struct iwl_tof_responder_config_cmd_v7 - ToF AP mode (for debug)
|
||||||
* @cmd_valid_fields: &iwl_tof_responder_cmd_valid_field
|
* @cmd_valid_fields: &iwl_tof_responder_cmd_valid_field
|
||||||
* @responder_cfg_flags: &iwl_tof_responder_cfg_flags
|
* @responder_cfg_flags: &iwl_tof_responder_cfg_flags
|
||||||
* @format_bw: bits 0 - 3: &enum iwl_location_frame_format.
|
* @format_bw: bits 0 - 3: &enum iwl_location_frame_format.
|
||||||
|
@ -245,7 +257,7 @@ struct iwl_tof_responder_config_cmd_v6 {
|
||||||
* @bssid: Current AP BSSID
|
* @bssid: Current AP BSSID
|
||||||
* @reserved2: reserved
|
* @reserved2: reserved
|
||||||
*/
|
*/
|
||||||
struct iwl_tof_responder_config_cmd {
|
struct iwl_tof_responder_config_cmd_v7 {
|
||||||
__le32 cmd_valid_fields;
|
__le32 cmd_valid_fields;
|
||||||
__le32 responder_cfg_flags;
|
__le32 responder_cfg_flags;
|
||||||
u8 format_bw;
|
u8 format_bw;
|
||||||
|
@ -259,7 +271,56 @@ struct iwl_tof_responder_config_cmd {
|
||||||
__le16 specific_calib;
|
__le16 specific_calib;
|
||||||
u8 bssid[ETH_ALEN];
|
u8 bssid[ETH_ALEN];
|
||||||
__le16 reserved2;
|
__le16 reserved2;
|
||||||
} __packed; /* TOF_RESPONDER_CONFIG_CMD_API_S_VER_6 */
|
} __packed; /* TOF_RESPONDER_CONFIG_CMD_API_S_VER_7 */
|
||||||
|
|
||||||
|
#define IWL_RESPONDER_STS_POS 3
|
||||||
|
#define IWL_RESPONDER_TOTAL_LTF_POS 6
|
||||||
|
|
||||||
|
/**
|
||||||
|
* struct iwl_tof_responder_config_cmd_v8 - ToF AP mode (for debug)
|
||||||
|
* @cmd_valid_fields: &iwl_tof_responder_cmd_valid_field
|
||||||
|
* @responder_cfg_flags: &iwl_tof_responder_cfg_flags
|
||||||
|
* @format_bw: bits 0 - 3: &enum iwl_location_frame_format.
|
||||||
|
* bits 4 - 7: &enum iwl_location_bw.
|
||||||
|
* @rate: current AP rate
|
||||||
|
* @channel_num: current AP Channel
|
||||||
|
* @ctrl_ch_position: coding of the control channel position relative to
|
||||||
|
* the center frequency, see iwl_mvm_get_ctrl_pos()
|
||||||
|
* @sta_id: index of the AP STA when in AP mode
|
||||||
|
* @reserved1: reserved
|
||||||
|
* @toa_offset: Artificial addition [pSec] for the ToA - to be used for debug
|
||||||
|
* purposes, simulating station movement by adding various values
|
||||||
|
* to this field
|
||||||
|
* @common_calib: XVT: common calibration value
|
||||||
|
* @specific_calib: XVT: specific calibration value
|
||||||
|
* @bssid: Current AP BSSID
|
||||||
|
* @r2i_ndp_params: parameters for R2I NDP.
|
||||||
|
* bits 0 - 2: max number of LTF repetitions
|
||||||
|
* bits 3 - 5: max number of spatial streams (supported values are < 2)
|
||||||
|
* bits 6 - 7: max number of total LTFs
|
||||||
|
* (&enum ieee80211_range_params_max_total_ltf)
|
||||||
|
* @i2r_ndp_params: parameters for I2R NDP.
|
||||||
|
* bits 0 - 2: max number of LTF repetitions
|
||||||
|
* bits 3 - 5: max number of spatial streams
|
||||||
|
* bits 6 - 7: max number of total LTFs
|
||||||
|
* (&enum ieee80211_range_params_max_total_ltf)
|
||||||
|
*/
|
||||||
|
struct iwl_tof_responder_config_cmd_v8 {
|
||||||
|
__le32 cmd_valid_fields;
|
||||||
|
__le32 responder_cfg_flags;
|
||||||
|
u8 format_bw;
|
||||||
|
u8 rate;
|
||||||
|
u8 channel_num;
|
||||||
|
u8 ctrl_ch_position;
|
||||||
|
u8 sta_id;
|
||||||
|
u8 reserved1;
|
||||||
|
__le16 toa_offset;
|
||||||
|
__le16 common_calib;
|
||||||
|
__le16 specific_calib;
|
||||||
|
u8 bssid[ETH_ALEN];
|
||||||
|
u8 r2i_ndp_params;
|
||||||
|
u8 i2r_ndp_params;
|
||||||
|
} __packed; /* TOF_RESPONDER_CONFIG_CMD_API_S_VER_8 */
|
||||||
|
|
||||||
#define IWL_LCI_CIVIC_IE_MAX_SIZE 400
|
#define IWL_LCI_CIVIC_IE_MAX_SIZE 400
|
||||||
|
|
||||||
|
|
|
@ -100,6 +100,8 @@
|
||||||
#define IWL_MVM_FTM_R2I_MAX_TOTAL_LTF 3
|
#define IWL_MVM_FTM_R2I_MAX_TOTAL_LTF 3
|
||||||
#define IWL_MVM_FTM_I2R_MAX_TOTAL_LTF 3
|
#define IWL_MVM_FTM_I2R_MAX_TOTAL_LTF 3
|
||||||
#define IWL_MVM_FTM_INITIATOR_SECURE_LTF false
|
#define IWL_MVM_FTM_INITIATOR_SECURE_LTF false
|
||||||
|
#define IWL_MVM_FTM_RESP_NDP_SUPPORT true
|
||||||
|
#define IWL_MVM_FTM_RESP_LMR_FEEDBACK_SUPPORT true
|
||||||
#define IWL_MVM_D3_DEBUG false
|
#define IWL_MVM_D3_DEBUG false
|
||||||
#define IWL_MVM_USE_TWT true
|
#define IWL_MVM_USE_TWT true
|
||||||
#define IWL_MVM_AMPDU_CONSEC_DROPS_DELBA 10
|
#define IWL_MVM_AMPDU_CONSEC_DROPS_DELBA 10
|
||||||
|
|
|
@ -75,6 +75,24 @@ static int iwl_mvm_ftm_responder_set_bw_v2(struct cfg80211_chan_def *chandef,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
iwl_mvm_ftm_responder_set_ndp(struct iwl_mvm *mvm,
|
||||||
|
struct iwl_tof_responder_config_cmd_v8 *cmd)
|
||||||
|
{
|
||||||
|
/* Up to 2 R2I STS are allowed on the responder */
|
||||||
|
u32 r2i_max_sts = IWL_MVM_FTM_R2I_MAX_STS < 2 ?
|
||||||
|
IWL_MVM_FTM_R2I_MAX_STS : 1;
|
||||||
|
|
||||||
|
cmd->r2i_ndp_params = IWL_MVM_FTM_R2I_MAX_REP |
|
||||||
|
(r2i_max_sts << IWL_RESPONDER_STS_POS) |
|
||||||
|
(IWL_MVM_FTM_R2I_MAX_TOTAL_LTF << IWL_RESPONDER_TOTAL_LTF_POS);
|
||||||
|
cmd->i2r_ndp_params = IWL_MVM_FTM_I2R_MAX_REP |
|
||||||
|
(IWL_MVM_FTM_I2R_MAX_STS << IWL_RESPONDER_STS_POS) |
|
||||||
|
(IWL_MVM_FTM_I2R_MAX_TOTAL_LTF << IWL_RESPONDER_TOTAL_LTF_POS);
|
||||||
|
cmd->cmd_valid_fields |=
|
||||||
|
cpu_to_le32(IWL_TOF_RESPONDER_CMD_VALID_NDP_PARAMS);
|
||||||
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
iwl_mvm_ftm_responder_cmd(struct iwl_mvm *mvm,
|
iwl_mvm_ftm_responder_cmd(struct iwl_mvm *mvm,
|
||||||
struct ieee80211_vif *vif,
|
struct ieee80211_vif *vif,
|
||||||
|
@ -82,11 +100,11 @@ iwl_mvm_ftm_responder_cmd(struct iwl_mvm *mvm,
|
||||||
{
|
{
|
||||||
struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
|
struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
|
||||||
/*
|
/*
|
||||||
* The command structure is the same for versions 6 and 7, (only the
|
* The command structure is the same for versions 6, 7 and 8 (only the
|
||||||
* field interpretation is different), so the same struct can be use
|
* field interpretation is different), so the same struct can be use
|
||||||
* for all cases.
|
* for all cases.
|
||||||
*/
|
*/
|
||||||
struct iwl_tof_responder_config_cmd cmd = {
|
struct iwl_tof_responder_config_cmd_v8 cmd = {
|
||||||
.channel_num = chandef->chan->hw_value,
|
.channel_num = chandef->chan->hw_value,
|
||||||
.cmd_valid_fields =
|
.cmd_valid_fields =
|
||||||
cpu_to_le32(IWL_TOF_RESPONDER_CMD_VALID_CHAN_INFO |
|
cpu_to_le32(IWL_TOF_RESPONDER_CMD_VALID_CHAN_INFO |
|
||||||
|
@ -100,7 +118,10 @@ iwl_mvm_ftm_responder_cmd(struct iwl_mvm *mvm,
|
||||||
|
|
||||||
lockdep_assert_held(&mvm->mutex);
|
lockdep_assert_held(&mvm->mutex);
|
||||||
|
|
||||||
if (cmd_ver == 7)
|
if (cmd_ver == 8)
|
||||||
|
iwl_mvm_ftm_responder_set_ndp(mvm, &cmd);
|
||||||
|
|
||||||
|
if (cmd_ver >= 7)
|
||||||
err = iwl_mvm_ftm_responder_set_bw_v2(chandef, &cmd.format_bw,
|
err = iwl_mvm_ftm_responder_set_bw_v2(chandef, &cmd.format_bw,
|
||||||
&cmd.ctrl_ch_position);
|
&cmd.ctrl_ch_position);
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue