ath11k: add WMI calls to manually add/del/pause/resume TWT dialogs
PATCH 1/2 ath11k: add WMI calls to manually add/del/pause/resume TWT dialogs
These calls are used for debugging and will be required for WFA certification tests.
Signed-off-by John Crispin <[email protected]>
--- drivers/net/wireless/ath/ath11k/wmi.c | 194 ++++++++++++++++++++++++++ drivers/net/wireless/ath/ath11k/wmi.h | 114 +++++++++++++++ 2 files changed, 308 insertions(+)
drivers/net/wireless/ath/ath11k/wmi.c +194 -0
@@ -97,6 +97,8 @@ static const struct wmi_tlv_policy wmi_tlv_policies[] = { = { .min_len = sizeof(struct wmi_stats_event) }, [WMI_TAG_PDEV_CTL_FAILSAFE_CHECK_EVENT ] = { .min_len = sizeof(struct wmi_pdev_ctl_failsafe_chk_event) }, + [WMI_TAG_TWT_ADD_DIALOG_COMPLETE_EVENT ] + = { .min_len = sizeof(struct wmi_twt_add_dialog_event) }, };#define PRIMAP (_hw_mode_) \
@@ -2543,6 +2545,161 @@ ath11k_wmi_send_twt_disable_cmd(struct ath11k *ar, u32 pdev_id)return ret; } +int +ath11k_wmi_send_twt_add_dialog_cmd (struct ath11k *ar, +struct wmi_twt_add_dialog_params *params) +{ +struct ath11k_pdev_wmi *wmi = ar->wmi; +struct ath11k_base *ab = wmi->wmi_sc->sc; +struct wmi_twt_add_dialog_params_cmd *cmd; +struct sk_buff *skb; +int ret, len; + + len =sizeof (*cmd); + + skb =ath11k_wmi_alloc_skb (wmi->wmi_sc, len); +if (!skb) +return -ENOMEM ; + + cmd = (void *)skb->data; + cmd->tlv_header =FIELD_PREP (WMI_TLV_TAG , +WMI_TAG_TWT_ADD_DIALOG_CMD ) | +FIELD_PREP (WMI_TLV_LEN , len -TLV_HDR_SIZE ); + + cmd->vdev_id = params->vdev_id; +ether_addr_copy (cmd->peer_macaddr.addr, params->peer_macaddr); + cmd->dialog_id = params->dialog_id; + cmd->wake_intvl_us = params->wake_intvl_us; + cmd->wake_intvl_mantis = params->wake_intvl_mantis; + cmd->wake_dura_us = params->wake_dura_us; + cmd->sp_offset_us = params->sp_offset_us; + cmd->flags = params->twt_cmd; +if (params->flag_bcast) + cmd->flags |=WMI_TWT_ADD_DIALOG_FLAG_BCAST ; +if (params->flag_trigger) + cmd->flags |=WMI_TWT_ADD_DIALOG_FLAG_TRIGGER ; +if (params->flag_flow_type) + cmd->flags |=WMI_TWT_ADD_DIALOG_FLAG_FLOW_TYPE ; +if (params->flag_protection) + cmd->flags |=WMI_TWT_ADD_DIALOG_FLAG_PROTECTION ; + + ret =ath11k_wmi_cmd_send (wmi, skb, +WMI_TWT_ADD_DIALOG_CMDID ); +if (ret) { +ath11k_warn (ab,"Failed to send WMI_TWT_ADD_DIALOG_CMDID" ); +dev_kfree_skb (skb); + } +return ret; +} + +int +ath11k_wmi_send_twt_del_dialog_cmd (struct ath11k *ar, +struct wmi_twt_del_dialog_params *params) +{ +struct ath11k_pdev_wmi *wmi = ar->wmi; +struct ath11k_base *ab = wmi->wmi_sc->sc; +struct wmi_twt_del_dialog_params_cmd *cmd; +struct sk_buff *skb; +int ret, len; + + len =sizeof (*cmd); + + skb =ath11k_wmi_alloc_skb (wmi->wmi_sc, len); +if (!skb) +return -ENOMEM ; + + cmd = (void *)skb->data; + cmd->tlv_header =FIELD_PREP (WMI_TLV_TAG , +WMI_TAG_TWT_DEL_DIALOG_CMD ) | +FIELD_PREP (WMI_TLV_LEN , len -TLV_HDR_SIZE ); + + cmd->vdev_id = params->vdev_id; +ether_addr_copy (cmd->peer_macaddr.addr, params->peer_macaddr); + cmd->dialog_id = params->dialog_id; + + ret =ath11k_wmi_cmd_send (wmi, skb, +WMI_TWT_DEL_DIALOG_CMDID ); +if (ret) { +ath11k_warn (ab,"Failed to send WMI_TWT_DEL_DIALOG_CMDID" ); +dev_kfree_skb (skb); + } +return ret; +} + +int +ath11k_wmi_send_twt_pause_dialog_cmd (struct ath11k *ar, +struct wmi_twt_pause_dialog_params *params) +{ +struct ath11k_pdev_wmi *wmi = ar->wmi; +struct ath11k_base *ab = wmi->wmi_sc->sc; +struct wmi_twt_pause_dialog_params_cmd *cmd; +struct sk_buff *skb; +int ret, len; + + len =sizeof (*cmd); + + skb =ath11k_wmi_alloc_skb (wmi->wmi_sc, len); +if (!skb) +return -ENOMEM ; + + cmd = (void *)skb->data; + cmd->tlv_header =FIELD_PREP (WMI_TLV_TAG , +WMI_TAG_TWT_PAUSE_DIALOG_CMD ) | +FIELD_PREP (WMI_TLV_LEN , len -TLV_HDR_SIZE ); + + cmd->vdev_id = params->vdev_id; +ether_addr_copy (cmd->peer_macaddr.addr, params->peer_macaddr); + cmd->dialog_id = params->dialog_id; + + ret =ath11k_wmi_cmd_send (wmi, skb, +WMI_TWT_PAUSE_DIALOG_CMDID ); +if (ret) { +ath11k_warn (ab,"Failed to send WMI_TWT_PAUSE_DIALOG_CMDID" ); +dev_kfree_skb (skb); + } +return ret; +} + +int +ath11k_wmi_send_twt_resume_dialog_cmd (struct ath11k *ar, +struct wmi_twt_resume_dialog_params *params) +{ +struct ath11k_pdev_wmi *wmi = ar->wmi; +struct ath11k_base *ab = wmi->wmi_sc->sc; +struct wmi_twt_resume_dialog_params_cmd *cmd; +struct sk_buff *skb; +int ret, len; + + len =sizeof (*cmd); + + skb =ath11k_wmi_alloc_skb (wmi->wmi_sc, len); +if (!skb) +return -ENOMEM ; + + cmd = (void *)skb->data; + cmd->tlv_header =FIELD_PREP (WMI_TLV_TAG , +WMI_TAG_TWT_RESUME_DIALOG_CMD ) | +FIELD_PREP (WMI_TLV_LEN , len -TLV_HDR_SIZE ); + + cmd->vdev_id = params->vdev_id; +ether_addr_copy (cmd->peer_macaddr.addr, params->peer_macaddr); + cmd->dialog_id = params->dialog_id; + cmd->sp_offset_us = params->sp_offset_us; + cmd->next_twt_size = params->next_twt_size; +printk ("%s:%s[%d]%x %x %x %x %x\n" , __FILE__, __func__, __LINE__, + cmd->peer_macaddr.word0, + cmd->peer_macaddr.word1, + cmd->dialog_id, params->sp_offset_us, params->next_twt_size); + + ret =ath11k_wmi_cmd_send (wmi, skb, +WMI_TWT_RESUME_DIALOG_CMDID ); +if (ret) { +ath11k_warn (ab,"Failed to send WMI_TWT_RESUME_DIALOG_CMDID" ); +dev_kfree_skb (skb); + } +return ret; +} +int ath11k_wmi_send_obss_spr_cmd (struct ath11k *ar,u32 vdev_id,struct ieee80211_he_obss_pd *he_obss_pd)
@@ -5466,6 +5623,37 @@ ath11k_wmi_pdev_dfs_radar_detected_event(struct ath11k_base *ab, struct sk_buffkfree (tb); } +static void ath11k_wmi_twt_add_dialog_event (struct ath11k_base *ab,struct sk_buff *skb) +{ +const char *status[] = { +"OK" ,"TWT_NOT_ENABLED" ,"USED_DIALOG_ID" ,"INVALID_PARAM" , +"NOT_READY" ,"NO_RESOURCE" ,"NO_ACK" ,"NO_RESPONSE" , +"DENIED" ,"UNKNOWN_ERROR" + }; +const void **tb; +const struct wmi_twt_add_dialog_event *ev; +int ret; + + tb =ath11k_wmi_tlv_parse_alloc (ab, skb->data, skb->len,GFP_ATOMIC ); +if (IS_ERR (tb)) { + ret =PTR_ERR (tb); +ath11k_warn (ab,"failed to parse tlv: %d\n" , ret); +return ; + } + + ev = tb[WMI_TAG_TWT_ADD_DIALOG_COMPLETE_EVENT ]; +if (!ev) { +ath11k_warn (ab,"failed to fetch twt add dialog ev" ); + goto exit; + } + +ath11k_info (ab,"TWT Add Dialog Event - Status: %s, DialogId: %d, VdevId: %d\n" , + status[ev->status], ev->vdev_id, ev->dialog_id); + +exit: +kfree (tb); +} +static void ath11k_wmi_tlv_op_rx (struct ath11k_base *ab,struct sk_buff *skb) {struct wmi_cmd_hdr *cmd_hdr;
@@ -5543,12 +5731,18 @@ static void ath11k_wmi_tlv_op_rx(struct ath11k_base *ab, struct sk_buff *skb)case WMI_PDEV_CSA_SWITCH_COUNT_STATUS_EVENTID :ath11k_wmi_pdev_csa_switch_count_status_event (ab, skb);break ; +case WMI_TWT_ADD_DIALOG_EVENTID : +ath11k_wmi_twt_add_dialog_event (ab, skb); +break ;/* add Unsupported events here */ case WMI_TBTTOFFSET_EXT_UPDATE_EVENTID :case WMI_VDEV_DELETE_RESP_EVENTID :case WMI_PEER_OPER_MODE_CHANGE_EVENTID :case WMI_TWT_ENABLE_EVENTID :case WMI_TWT_DISABLE_EVENTID : +case WMI_TWT_DEL_DIALOG_EVENTID : +case WMI_TWT_PAUSE_DIALOG_EVENTID : +case WMI_TWT_RESUME_DIALOG_EVENTID :ath11k_dbg (ab,ATH11K_DBG_WMI ,"ignoring unsupported event 0x%x\n" , id);break ;
drivers/net/wireless/ath/ath11k/wmi.h +114 -0
126 lines not on this page · raw message
Signature · 7 lines
2.20.1 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH 2/2 ath11k: add debugfs for TWT debug calls
These new debugfs files allow us to manually add/del/pause/resume TWT dialogs for test/debug purposes.
Signed-off-by John Crispin <[email protected]>
--- drivers/net/wireless/ath/ath11k/core.h | 1 + drivers/net/wireless/ath/ath11k/debug.c | 197 ++++++++++++++++++++++++ drivers/net/wireless/ath/ath11k/debug.h | 9 ++ drivers/net/wireless/ath/ath11k/mac.c | 3 + 4 files changed, 210 insertions(+)
drivers/net/wireless/ath/ath11k/core.h +1 -0
@@ -221,6 +221,7 @@ struct ath11k_vif {int num_legacy_stations;int rtscts_prot_mode;int txpower; +struct dentry *debugfs_twt; };struct ath11k_vif_iter {
drivers/net/wireless/ath/ath11k/debug.c +197 -0
203 lines not on this page · raw message
drivers/net/wireless/ath/ath11k/debug.h +9 -0
@@ -130,6 +130,15 @@ static inline void ath11k_dbg_dump(struct ath11k_base *ab, }#endif /* CONFIG_ATH11K_DEBUG */ +#ifdef CONFIG_MAC80211_DEBUGFS +void ath11k_debugfs_twt (struct ath11k_vif *arvif,bool enable); +#else +static inline void ath11k_debugfs_twt (struct ath11k_vif *arvif,bool enable) +{ + +} +#endif +#ifdef CONFIG_ATH11K_DEBUGFS int ath11k_debug_soc_create (struct ath11k_base *sc);void ath11k_debug_soc_destroy (struct ath11k_base *sc);
drivers/net/wireless/ath/ath11k/mac.c +3 -0
@@ -1909,6 +1909,8 @@ static void ath11k_mac_op_bss_info_changed(struct ieee80211_hw *hw,ath11k_wmi_send_twt_enable_cmd (ar, ar->pdev_idx); else ath11k_wmi_send_twt_disable_cmd(ar, ar->pdev_idx); +if (vif->type ==NL80211_IFTYPE_AP ) +ath11k_debugfs_twt (arvif, info->twt_requester); }if (changed &BSS_CHANGED_HE_OBSS_PD )
@@ -4219,6 +4221,7 @@ static void ath11k_mac_op_remove_interface(struct ieee80211_hw *hw,/* TODO: recal traffic pause state based on the available vdevs */ mutex_unlock (&ar->conf_mutex); + arvif->debugfs_twt =NULL ; }/* FIXME: Has to be verified. */
Signature · 7 lines
2.20.1 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k