ath10k: Add support to configure ftm responder role
PATCH 1/1 ath10k: Add support to configure ftm responder role
Configure fine timing measurement (FTM) responder role from the ftm_responder bss param sent by mac80211. With FTM functionality offloaded to firmware, adding the interface allows userspace to enable or disable FTM responder functionality. ath10k disables it at the time of interface creation.
Supported FW: 10.4
Tested on IPQ4019 with firmware: 10.4-3.2.1.1-00022
--- drivers/net/wireless/ath/ath10k/core.h | 1 + drivers/net/wireless/ath/ath10k/mac.c | 29 +++++++++++++++++++++++++++++ drivers/net/wireless/ath/ath10k/wmi.c | 4 ++++ drivers/net/wireless/ath/ath10k/wmi.h | 22 ++++++++++++++++++++++ 4 files changed, 56 insertions(+)
drivers/net/wireless/ath/ath10k/core.h +1 -0
@@ -569,6 +569,7 @@ struct ath10k_vif {bool nohwcrypt;int num_legacy_stations;int txpower; +bool ftm_responder;struct wmi_wmm_params_all_arg wmm_params;struct work_struct ap_csa_work;struct delayed_work connection_loss_work;
drivers/net/wireless/ath/ath10k/mac.c +29 -0
@@ -5283,6 +5283,17 @@ static int ath10k_add_interface(struct ieee80211_hw *hw, goto err_peer_delete; } +if (test_bit (WMI_SERVICE_RTT_RESPONDER_ROLE , ar->wmi.svc_map)) { + vdev_param = ar->wmi.vdev_param->rtt_responder_role; + ret =ath10k_wmi_vdev_set_param (ar, arvif->vdev_id, vdev_param, + arvif->ftm_responder); + +/* It is harmless to not set FTM role. Do not warn */ +if (ret && ret != -EOPNOTSUPP ) +ath10k_warn (ar,"failed to set vdev %i FTM Responder: %d\n" , + arvif->vdev_id, ret); + } +if (vif->type ==NL80211_IFTYPE_MONITOR ) { ar->monitor_arvif = arvif; ret =ath10k_monitor_recalc (ar);
@@ -5557,6 +5568,20 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw,if (changed &BSS_CHANGED_BSSID && !is_zero_ether_addr (info->bssid))ether_addr_copy (arvif->bssid, info->bssid); +if (changed &BSS_CHANGED_FTM_RESPONDER && + arvif->ftm_responder != info->ftm_responder && +test_bit (WMI_SERVICE_RTT_RESPONDER_ROLE , ar->wmi.svc_map)) { + arvif->ftm_responder = info->ftm_responder; + + vdev_param = ar->wmi.vdev_param->rtt_responder_role; + ret =ath10k_wmi_vdev_set_param (ar, arvif->vdev_id, vdev_param, + arvif->ftm_responder); + +ath10k_dbg (ar,ATH10K_DBG_MAC , +"mac vdev %d ftm_responder %d:ret %d\n" , + arvif->vdev_id, arvif->ftm_responder, ret); + } +if (changed &BSS_CHANGED_BEACON_ENABLED )ath10k_control_beaconing (arvif, info);
@@ -8578,6 +8603,10 @@ int ath10k_mac_register(struct ath10k *ar)wiphy_ext_feature_set (ar->hw->wiphy,NL80211_EXT_FEATURE_ACK_SIGNAL_SUPPORT ); +if (test_bit (WMI_SERVICE_RTT_RESPONDER_ROLE , ar->wmi.svc_map)) +wiphy_ext_feature_set (ar->hw->wiphy, +NL80211_EXT_FEATURE_ENABLE_FTM_RESPONDER ); +/* * on LL hardware queues are managed entirely by the FW * so we only advertise to mac we can do the queues thing
drivers/net/wireless/ath/ath10k/wmi.c +4 -0
@@ -825,6 +825,7 @@ .meru_vc = WMI_VDEV_PARAM_UNSUPPORTED, .rx_decap_type = WMI_VDEV_PARAM_UNSUPPORTED, .bw_nss_ratemask = WMI_VDEV_PARAM_UNSUPPORTED, + .rtt_responder_role = WMI_VDEV_PARAM_UNSUPPORTED, };/* 10.X WMI VDEV param map */
@@ -900,6 +901,7 @@ .meru_vc = WMI_VDEV_PARAM_UNSUPPORTED, .rx_decap_type = WMI_VDEV_PARAM_UNSUPPORTED, .bw_nss_ratemask = WMI_VDEV_PARAM_UNSUPPORTED, + .rtt_responder_role = WMI_VDEV_PARAM_UNSUPPORTED, };static struct wmi_vdev_param_map wmi_10_2_4_vdev_param_map = {
@@ -974,6 +976,7 @@ .meru_vc = WMI_VDEV_PARAM_UNSUPPORTED, .rx_decap_type = WMI_VDEV_PARAM_UNSUPPORTED, .bw_nss_ratemask = WMI_VDEV_PARAM_UNSUPPORTED, + .rtt_responder_role = WMI_VDEV_PARAM_UNSUPPORTED, };static struct wmi_vdev_param_map wmi_10_4_vdev_param_map = {
@@ -1051,6 +1054,7 @@ .bw_nss_ratemask = WMI_10_4_VDEV_PARAM_BW_NSS_RATEMASK, .inc_tsf = WMI_10_4_VDEV_PARAM_TSF_INCREMENT, .dec_tsf = WMI_10_4_VDEV_PARAM_TSF_DECREMENT, + .rtt_responder_role = WMI_10_4_VDEV_PARAM_ENABLE_DISABLE_RTT_RESPONDER_ROLE, };static struct wmi_pdev_param_map wmi_pdev_param_map = {
drivers/net/wireless/ath/ath10k/wmi.h +22 -0
@@ -205,6 +205,7 @@ enum wmi_service {WMI_SERVICE_SPOOF_MAC_SUPPORT ,WMI_SERVICE_TX_DATA_ACK_RSSI ,WMI_SERVICE_VDEV_DIFFERENT_BEACON_INTERVAL_SUPPORT , +WMI_SERVICE_RTT_RESPONDER_ROLE ,/* keep last */ WMI_SERVICE_MAX,
@@ -359,6 +360,13 @@ enum wmi_10_4_service {WMI_10_4_SERVICE_PEER_TID_CONFIGS_SUPPORT ,WMI_10_4_SERVICE_VDEV_BCN_RATE_CONTROL ,WMI_10_4_SERVICE_VDEV_DIFFERENT_BEACON_INTERVAL_SUPPORT , +WMI_10_4_SERVICE_HTT_ASSERT_TRIGGER_SUPPORT , +WMI_10_4_SERVICE_VDEV_FILTER_NEIGHBOR_RX_PACKETS , +WMI_10_4_SERVICE_VDEV_DISABLE_4_ADDR_SRC_LRN_SUPPORT , +WMI_10_4_SERVICE_PEER_CHWIDTH_CHANGE , +WMI_10_4_SERVICE_RX_FILTER_OUT_COUNT , +WMI_10_4_SERVICE_RTT_RESPONDER_ROLE , + WMI_10_4_SERVICE_EXT_PEER_TID_CONFIGS_SUPPORT, };static inline char *wmi_service_name (int service_id)
@@ -474,6 +482,8 @@ static inline char *wmi_service_name(int service_id)SVCSTR (WMI_SERVICE_RESET_CHIP );SVCSTR (WMI_SERVICE_TX_DATA_ACK_RSSI );SVCSTR (WMI_SERVICE_VDEV_DIFFERENT_BEACON_INTERVAL_SUPPORT ); +SVCSTR (WMI_SERVICE_RTT_RESPONDER_ROLE ); +default :return NULL ; }
@@ -786,6 +796,8 @@ static inline void wmi_10_4_svc_map(const __le32 *in, unsigned long *out, WMI_SERVICE_TX_DATA_ACK_RSSI, len);SVCMAP (WMI_10_4_SERVICE_VDEV_DIFFERENT_BEACON_INTERVAL_SUPPORT ,WMI_SERVICE_VDEV_DIFFERENT_BEACON_INTERVAL_SUPPORT , len); +SVCMAP (WMI_10_4_SERVICE_RTT_RESPONDER_ROLE , +WMI_SERVICE_RTT_RESPONDER_ROLE , len); }#undef SVCMAP
@@ -5064,6 +5076,7 @@ struct wmi_vdev_param_map {u32 bw_nss_ratemask;u32 inc_tsf;u32 dec_tsf; +u32 rtt_responder_role; };#define WMI_VDEV_PARAM_UNSUPPORTED 0
@@ -5403,6 +5416,15 @@ enum wmi_10_4_vdev_param {WMI_10_4_VDEV_PARAM_ATF_SSID_SCHED_POLICY ,WMI_10_4_VDEV_PARAM_DISABLE_DYN_BW_RTS ,WMI_10_4_VDEV_PARAM_TSF_DECREMENT , +WMI_10_4_VDEV_PARAM_SELFGEN_FIXED_RATE , +WMI_10_4_VDEV_PARAM_AMPDU_SUBFRAME_SIZE_PER_AC , +WMI_10_4_VDEV_PARAM_NSS_VHT160 , +WMI_10_4_VDEV_PARAM_NSS_VHT80_80 , +WMI_10_4_VDEV_PARAM_AMSDU_SUBFRAME_SIZE_PER_AC , +WMI_10_4_VDEV_PARAM_DISABLE_CABQ , +WMI_10_4_VDEV_PARAM_SIFS_TRIGGER_RATE , +WMI_10_4_VDEV_PARAM_TX_POWER , + WMI_10_4_VDEV_PARAM_ENABLE_DISABLE_RTT_RESPONDER_ROLE, };#define WMI_VDEV_PARAM_TXBF_SU_TX_BFEE BIT(0)
Signature · 7 lines
1.9.1 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Quoted 6 lines · Pradeep Kumar Chitrapu
Configure fine timing measurement (FTM) responder role from the
ftm_responderbss param sent by mac80211. With FTM functionality offloaded to firmware, adding the interface allows userspace to enable or disable FTM responder functionality. ath10k disables it at the time of interface creation.
Quoted 6 lines
Supported FW: 10.4
Tested on IPQ4019 with firmware: 10.4-3.2.1.1-00022
Signed-off-by Pradeep Kumar Chitrapu <[email protected]>Signed-off-by Kalle Valo <[email protected]>
I had to fix some conflicts, please carefully check my resolution in the pending branch:
$ git am -s -3 10798883.mbox Applying: ath10k: Add support to configure ftm responder role Using index info to reconstruct a base tree... M drivers/net/wireless/ath/ath10k/core.h M drivers/net/wireless/ath/ath10k/mac.c M drivers/net/wireless/ath/ath10k/wmi.c M drivers/net/wireless/ath/ath10k/wmi.h Falling back to patching base and 3-way merge... Auto-merging drivers/net/wireless/ath/ath10k/wmi.h CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi.h Auto-merging drivers/net/wireless/ath/ath10k/wmi.c CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi.c Auto-merging drivers/net/wireless/ath/ath10k/mac.c CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/mac.c Auto-merging drivers/net/wireless/ath/ath10k/core.h Recorded preimage for 'drivers/net/wireless/ath/ath10k/mac.c' Recorded preimage for 'drivers/net/wireless/ath/ath10k/wmi.c' Recorded preimage for 'drivers/net/wireless/ath/ath10k/wmi.h' error: Failed to merge in the changes. Patch failed at 0001 ath10k: Add support to configure ftm responder role
Signature · 9 lines
https://patchwork.kernel.org/patch/10798883/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Quoted 6 lines · Pradeep Kumar Chitrapu
Configure fine timing measurement (FTM) responder role from the
ftm_responderbss param sent by mac80211. With FTM functionality offloaded to firmware, adding the interface allows userspace to enable or disable FTM responder functionality. ath10k disables it at the time of interface creation.
Quoted 6 lines
Supported FW: 10.4
Tested on IPQ4019 with firmware: 10.4-3.2.1.1-00022
Signed-off-by Pradeep Kumar Chitrapu <[email protected]>Signed-off-by Kalle Valo <[email protected]>
I had to fix some conflicts, please carefully check my resolution in the pending branch:
$ git am -s -3 10798883.mbox Applying: ath10k: Add support to configure ftm responder role Using index info to reconstruct a base tree... M drivers/net/wireless/ath/ath10k/core.h M drivers/net/wireless/ath/ath10k/mac.c M drivers/net/wireless/ath/ath10k/wmi.c M drivers/net/wireless/ath/ath10k/wmi.h Falling back to patching base and 3-way merge... Auto-merging drivers/net/wireless/ath/ath10k/wmi.h CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi.h Auto-merging drivers/net/wireless/ath/ath10k/wmi.c CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi.c Auto-merging drivers/net/wireless/ath/ath10k/mac.c CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/mac.c Auto-merging drivers/net/wireless/ath/ath10k/core.h Recorded preimage for 'drivers/net/wireless/ath/ath10k/mac.c' Recorded preimage for 'drivers/net/wireless/ath/ath10k/wmi.c' Recorded preimage for 'drivers/net/wireless/ath/ath10k/wmi.h' error: Failed to merge in the changes. Patch failed at 0001 ath10k: Add support to configure ftm responder role
Signature · 3 lines
https://patchwork.kernel.org/patch/10798883/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Quoted 6 lines · Pradeep Kumar Chitrapu
Configure fine timing measurement (FTM) responder role from the
ftm_responderbss param sent by mac80211. With FTM functionality offloaded to firmware, adding the interface allows userspace to enable or disable FTM responder functionality. ath10k disables it at the time of interface creation.
Quoted 6 lines
Supported FW: 10.4
Tested on IPQ4019 with firmware: 10.4-3.2.1.1-00022
Signed-off-by Pradeep Kumar Chitrapu <[email protected]>Signed-off-by Kalle Valo <[email protected]>
Patch applied to ath-next branch of ath.git, thanks.
059104bff312 ath10k: add support to configure ftm responder role
Signature · 9 lines
https://patchwork.kernel.org/patch/10798883/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Quoted 6 lines · Pradeep Kumar Chitrapu
Configure fine timing measurement (FTM) responder role from the
ftm_responderbss param sent by mac80211. With FTM functionality offloaded to firmware, adding the interface allows userspace to enable or disable FTM responder functionality. ath10k disables it at the time of interface creation.
Quoted 6 lines
Supported FW: 10.4
Tested on IPQ4019 with firmware: 10.4-3.2.1.1-00022
Signed-off-by Pradeep Kumar Chitrapu <[email protected]>Signed-off-by Kalle Valo <[email protected]>
Patch applied to ath-next branch of ath.git, thanks.
059104bff312 ath10k: add support to configure ftm responder role
Signature · 3 lines
https://patchwork.kernel.org/patch/10798883/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches