From 1f462c5d0f105c46b47db26c8a44c37a5c1028f2 Mon Sep 17 00:00:00 2001 From: Eugene Syromiatnikov Date: Thu, 25 Jul 2019 13:52:10 +0200 Subject: [PATCH 2/7] Revert "iwlwifi: mvm: support rtt confidence indication" This reverts commit 957a67c828e741ef7e09f69075edd3d5a6148e2c. --- .../net/wireless/intel/iwlwifi/fw/api/location.h | 77 +--------------------- .../net/wireless/intel/iwlwifi/mvm/ftm-initiator.c | 13 +--- 2 files changed, 3 insertions(+), 87 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/location.h b/drivers/net/wireless/intel/iwlwifi/fw/api/location.h index 8d78b0e671c0..5dddb21c1c4d 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/api/location.h +++ b/drivers/net/wireless/intel/iwlwifi/fw/api/location.h @@ -675,59 +675,6 @@ struct iwl_tof_range_rsp_ap_entry_ntfy_v3 { } __packed; /* LOCATION_RANGE_RSP_AP_ETRY_NTFY_API_S_VER_3 */ /** - * struct iwl_tof_range_rsp_ap_entry_ntfy_v4 - AP parameters (response) - * @bssid: BSSID of the AP - * @measure_status: current APs measurement status, one of - * &enum iwl_tof_entry_status. - * @measure_bw: Current AP Bandwidth: 0 20MHz, 1 40MHz, 2 80MHz - * @rtt: The Round Trip Time that took for the last measurement for - * current AP [pSec] - * @rtt_variance: The Variance of the RTT values measured for current AP - * @rtt_spread: The Difference between the maximum and the minimum RTT - * values measured for current AP in the current session [pSec] - * @rssi: RSSI as uploaded in the Channel Estimation notification - * @rssi_spread: The Difference between the maximum and the minimum RSSI values - * measured for current AP in the current session - * @last_burst: 1 if no more FTM sessions are scheduled for this responder - * @refusal_period: refusal period in case of - * @IWL_TOF_ENTRY_RESPONDER_CANNOT_COLABORATE [sec] - * @timestamp: The GP2 Clock [usec] where Channel Estimation notification was - * uploaded by the LMAC - * @start_tsf: measurement start time in TSF of the mac specified in the range - * request - * @rx_rate_n_flags: rate and flags of the last FTM frame received from this - * responder - * @tx_rate_n_flags: rate and flags of the last ack sent to this responder - * @t2t3_initiator: as calculated from the algo in the initiator - * @t1t4_responder: as calculated from the algo in the responder - * @common_calib: Calib val that was used in for this AP measurement - * @specific_calib: val that was used in for this AP measurement - * @papd_calib_output: The result of the tof papd calibration that was injected - * into the algorithm. - */ -struct iwl_tof_range_rsp_ap_entry_ntfy_v4 { - u8 bssid[ETH_ALEN]; - u8 measure_status; - u8 measure_bw; - __le32 rtt; - __le32 rtt_variance; - __le32 rtt_spread; - s8 rssi; - u8 rssi_spread; - u8 last_burst; - u8 refusal_period; - __le32 timestamp; - __le32 start_tsf; - __le32 rx_rate_n_flags; - __le32 tx_rate_n_flags; - __le32 t2t3_initiator; - __le32 t1t4_responder; - __le16 common_calib; - __le16 specific_calib; - __le32 papd_calib_output; -} __packed; /* LOCATION_RANGE_RSP_AP_ETRY_NTFY_API_S_VER_4 */ - -/** * struct iwl_tof_range_rsp_ap_entry_ntfy - AP parameters (response) * @bssid: BSSID of the AP * @measure_status: current APs measurement status, one of @@ -757,8 +704,6 @@ struct iwl_tof_range_rsp_ap_entry_ntfy_v4 { * @specific_calib: val that was used in for this AP measurement * @papd_calib_output: The result of the tof papd calibration that was injected * into the algorithm. - * @rttConfidence: a value between 0 - 31 that represents the rtt accuracy. - * @reserved: for alignment */ struct iwl_tof_range_rsp_ap_entry_ntfy { u8 bssid[ETH_ALEN]; @@ -780,9 +725,7 @@ struct iwl_tof_range_rsp_ap_entry_ntfy { __le16 common_calib; __le16 specific_calib; __le32 papd_calib_output; - u8 rttConfidence; - u8 reserved[3]; -} __packed; /* LOCATION_RANGE_RSP_AP_ETRY_NTFY_API_S_VER_5 */ +} __packed; /* LOCATION_RANGE_RSP_AP_ETRY_NTFY_API_S_VER_4 */ /** * enum iwl_tof_response_status - tof response status @@ -818,22 +761,6 @@ struct iwl_tof_range_rsp_ntfy_v5 { } __packed; /* LOCATION_RANGE_RSP_NTFY_API_S_VER_5 */ /** - * struct iwl_tof_range_rsp_ntfy_v6 - ranging response notification - * @request_id: A Token ID of the corresponding Range request - * @num_of_aps: Number of APs results - * @last_report: 1 if no more FTM sessions are scheduled, 0 otherwise. - * @reserved: reserved - * @ap: per-AP data - */ -struct iwl_tof_range_rsp_ntfy_v6 { - u8 request_id; - u8 num_of_aps; - u8 last_report; - u8 reserved; - struct iwl_tof_range_rsp_ap_entry_ntfy_v4 ap[IWL_MVM_TOF_MAX_APS]; -} __packed; /* LOCATION_RANGE_RSP_NTFY_API_S_VER_6 */ - -/** * struct iwl_tof_range_rsp_ntfy - ranging response notification * @request_id: A Token ID of the corresponding Range request * @num_of_aps: Number of APs results @@ -847,7 +774,7 @@ struct iwl_tof_range_rsp_ntfy { u8 last_report; u8 reserved; struct iwl_tof_range_rsp_ap_entry_ntfy ap[IWL_MVM_TOF_MAX_APS]; -} __packed; /* LOCATION_RANGE_RSP_NTFY_API_S_VER_7 */ +} __packed; /* LOCATION_RANGE_RSP_NTFY_API_S_VER_6 */ #define IWL_MVM_TOF_MCSI_BUF_SIZE (245) /** diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c b/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c index b15a4db7198e..94132cfd1f56 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c @@ -480,7 +480,6 @@ void iwl_mvm_ftm_range_resp(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb) { struct iwl_rx_packet *pkt = rxb_addr(rxb); struct iwl_tof_range_rsp_ntfy_v5 *fw_resp_v5 = (void *)pkt->data; - struct iwl_tof_range_rsp_ntfy_v6 *fw_resp_v6 = (void *)pkt->data; struct iwl_tof_range_rsp_ntfy *fw_resp = (void *)pkt->data; int i; bool new_api = fw_has_api(&mvm->fw->ucode_capa, @@ -520,12 +519,7 @@ void iwl_mvm_ftm_range_resp(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb) int peer_idx; if (new_api) { - if (fw_has_api(&mvm->fw->ucode_capa, - IWL_UCODE_TLV_API_FTM_RTT_ACCURACY)) - fw_ap = &fw_resp->ap[i]; - else - fw_ap = (void *)&fw_resp_v6->ap[i]; - + fw_ap = &fw_resp->ap[i]; result.final = fw_resp->ap[i].last_burst; } else { /* the first part is the same for old and new APIs */ @@ -594,11 +588,6 @@ void iwl_mvm_ftm_range_resp(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb) mvm->ftm_initiator.req, &result, GFP_KERNEL); - if (fw_has_api(&mvm->fw->ucode_capa, - IWL_UCODE_TLV_API_FTM_RTT_ACCURACY)) - IWL_DEBUG_INFO(mvm, "RTT confidence: %hhu\n", - fw_ap->rttConfidence); - iwl_mvm_debug_range_resp(mvm, i, &result); } -- 2.13.6