Linux-Wireless Archive on lore.kernel.org
 help / color / Atom feed
From: vthiagar@codeaurora.org
To: John Crispin <john@phrozen.org>
Cc: Kalle Valo <kvalo@codeaurora.org>,
	linux-wireless@vger.kernel.org, ath11k@lists.infradead.org,
	linux-wireless-owner@vger.kernel.org
Subject: Re: [RESEND 5/9] ath11k: add WMI calls to manually add/del/pause/resume TWT dialogs
Date: Wed, 4 Dec 2019 05:55:22 +0000
Message-ID: <0101016ecf7a30ee-153837b8-308e-4b00-9df0-aafc33f40667-000000@us-west-2.amazonses.com> (raw)
In-Reply-To: <20191204053713.3064-6-john@phrozen.org>

On 2019-12-04 11:07, John Crispin wrote:
> These calls are used for debugging and will be required for WFA 
> certification
> tests.
> 
> Signed-off-by: John Crispin <john@phrozen.org>
> ---
>  drivers/net/wireless/ath/ath11k/wmi.c | 218 ++++++++++++++++++++++++--
>  drivers/net/wireless/ath/ath11k/wmi.h | 114 ++++++++++++++
>  2 files changed, 318 insertions(+), 14 deletions(-)
> 
> diff --git a/drivers/net/wireless/ath/ath11k/wmi.c
> b/drivers/net/wireless/ath/ath11k/wmi.c
> index b16bfb50d73e..ba08a7d95764 100644
> --- a/drivers/net/wireless/ath/ath11k/wmi.c
> +++ b/drivers/net/wireless/ath/ath11k/wmi.c
> @@ -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_) \
> @@ -234,22 +236,22 @@ static int ath11k_wmi_cmd_send_nowait(struct
> ath11k_pdev_wmi *wmi, struct sk_buf
>  int ath11k_wmi_cmd_send(struct ath11k_pdev_wmi *wmi, struct sk_buff 
> *skb,
>  			u32 cmd_id)
>  {
> -	struct ath11k_wmi_base *wmi_sc = wmi->wmi_ab;
> +	struct ath11k_wmi_base *wmi_ab = wmi->wmi_ab;
>  	int ret = -EOPNOTSUPP;
> 
>  	might_sleep();
> 
> -	wait_event_timeout(wmi_sc->tx_credits_wq, ({
> +	wait_event_timeout(wmi_ab->tx_credits_wq, ({
>  		ret = ath11k_wmi_cmd_send_nowait(wmi, skb, cmd_id);
> 
> -		if (ret && test_bit(ATH11K_FLAG_CRASH_FLUSH, 
> &wmi_sc->ab->dev_flags))
> +		if (ret && test_bit(ATH11K_FLAG_CRASH_FLUSH, 
> &wmi_ab->ab->dev_flags))
>  			ret = -ESHUTDOWN;
> 
>  		(ret != -EAGAIN);
>  	}), WMI_SEND_TIMEOUT_HZ);
> 
>  	if (ret == -EAGAIN)
> -		ath11k_warn(wmi_sc->ab, "wmi command %d timeout\n", cmd_id);
> +		ath11k_warn(wmi_ab->ab, "wmi command %d timeout\n", cmd_id);
> 
>  	return ret;
>  }
> @@ -503,10 +505,10 @@ static int ath11k_service_ready_event(struct
> ath11k_base *ab, struct sk_buff *sk
>  	return 0;
>  }
> 
> -struct sk_buff *ath11k_wmi_alloc_skb(struct ath11k_wmi_base *wmi_sc, 
> u32 len)
> +struct sk_buff *ath11k_wmi_alloc_skb(struct ath11k_wmi_base *wmi_ab, 
> u32 len)
>  {
>  	struct sk_buff *skb;
> -	struct ath11k_base *ab = wmi_sc->ab;
> +	struct ath11k_base *ab = wmi_ab->ab;
>  	u32 round_len = roundup(len, 4);
> 
>  	skb = ath11k_htc_alloc_skb(ab, WMI_SKB_HEADROOM + round_len);
> @@ -2580,6 +2582,157 @@ 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_ab->ab;
> +	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_ab, len);
> +	if (!skb)
> +		return -ENOMEM;
> +
> +	cmd = (void *)skb->data;

Better to avoid void * conversion, instead it can probably be convert to 
the actual
structure.

> +	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);
> +	}

Adding WMI debug log with all the parameters passed in this command will 
be helpful
for debugging.

Same comments for the other WMI command handlers as well.

> +	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_ab->ab;
> +	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_ab, 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_ab->ab;
> +	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_ab, 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_ab->ab;
> +	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_ab, 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;
> +
> +	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)
> @@ -2851,7 +3004,7 @@ int ath11k_wmi_wait_for_unified_ready(struct
> ath11k_base *ab)
> 
>  int ath11k_wmi_cmd_init(struct ath11k_base *ab)
>  {
> -	struct ath11k_wmi_base *wmi_sc = &ab->wmi_ab;
> +	struct ath11k_wmi_base *wmi_ab = &ab->wmi_ab;
>  	struct wmi_init_cmd_param init_param;
>  	struct target_resource_config  config;
> 
> @@ -2903,21 +3056,21 @@ int ath11k_wmi_cmd_init(struct ath11k_base *ab)
>  	config.twt_ap_pdev_count = 2;
>  	config.twt_ap_sta_count = 1000;
> 
> -	memcpy(&wmi_sc->wlan_resource_config, &config, sizeof(config));
> +	memcpy(&wmi_ab->wlan_resource_config, &config, sizeof(config));
> 
> -	init_param.res_cfg = &wmi_sc->wlan_resource_config;
> -	init_param.num_mem_chunks = wmi_sc->num_mem_chunks;
> -	init_param.hw_mode_id = wmi_sc->preferred_hw_mode;
> -	init_param.mem_chunks = wmi_sc->mem_chunks;
> +	init_param.res_cfg = &wmi_ab->wlan_resource_config;
> +	init_param.num_mem_chunks = wmi_ab->num_mem_chunks;
> +	init_param.hw_mode_id = wmi_ab->preferred_hw_mode;
> +	init_param.mem_chunks = wmi_ab->mem_chunks;
> 
> -	if (wmi_sc->preferred_hw_mode == WMI_HOST_HW_MODE_SINGLE)
> +	if (wmi_ab->preferred_hw_mode == WMI_HOST_HW_MODE_SINGLE)
>  		init_param.hw_mode_id = WMI_HOST_HW_MODE_MAX;
> 
>  	init_param.num_band_to_mac = ab->num_radios;
> 
>  	ath11k_fill_band_to_mac_param(ab, init_param.band_to_mac);
> 
> -	return ath11k_init_cmd_send(&wmi_sc->wmi[0], &init_param);
> +	return ath11k_init_cmd_send(&wmi_ab->wmi[0], &init_param);
>  }
> 
>  static int ath11k_wmi_tlv_hw_mode_caps_parse(struct ath11k_base *soc,
> @@ -5511,6 +5664,37 @@ ath11k_wmi_pdev_dfs_radar_detected_event(struct
> ath11k_base *ab, struct sk_buff
>  	kfree(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;
> @@ -5588,12 +5772,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;
> diff --git a/drivers/net/wireless/ath/ath11k/wmi.h
> b/drivers/net/wireless/ath/ath11k/wmi.h
> index ab983aac604b..6e0be33bd37c 100644
> --- a/drivers/net/wireless/ath/ath11k/wmi.h
> +++ b/drivers/net/wireless/ath/ath11k/wmi.h
> @@ -4569,6 +4569,112 @@ struct wmi_twt_disable_params_cmd {
>  	u32 pdev_id;
>  };
> 
> +enum WMI_HOST_TWT_COMMAND {
> +	WMI_HOST_TWT_COMMAND_REQUEST_TWT = 0,
> +	WMI_HOST_TWT_COMMAND_SUGGEST_TWT,
> +	WMI_HOST_TWT_COMMAND_DEMAND_TWT,
> +	WMI_HOST_TWT_COMMAND_TWT_GROUPING,
> +	WMI_HOST_TWT_COMMAND_ACCEPT_TWT,
> +	WMI_HOST_TWT_COMMAND_ALTERNATE_TWT,
> +	WMI_HOST_TWT_COMMAND_DICTATE_TWT,
> +	WMI_HOST_TWT_COMMAND_REJECT_TWT,
> +};
> +
> +#define WMI_TWT_ADD_DIALOG_FLAG_BCAST		BIT(8)
> +#define WMI_TWT_ADD_DIALOG_FLAG_TRIGGER		BIT(9)
> +#define WMI_TWT_ADD_DIALOG_FLAG_FLOW_TYPE	BIT(10)
> +#define WMI_TWT_ADD_DIALOG_FLAG_PROTECTION	BIT(11)
> +
> +struct wmi_twt_add_dialog_params_cmd {
> +	u32 tlv_header;
> +	u32 vdev_id;
> +	struct wmi_mac_addr peer_macaddr;
> +	u32 dialog_id;
> +	u32 wake_intvl_us;
> +	u32 wake_intvl_mantis;
> +	u32 wake_dura_us;
> +	u32 sp_offset_us;
> +	u32 flags;
> +};

Better to be marked with __packed attribute for the structures which
are used in host-firmware communication. Same for other wmi command
and event structures in this patch.


Vasanth

  reply index

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-04  5:37 [RESEND 0/9] ath11k: resend pending patches John Crispin
2019-12-04  5:37 ` [RESEND 1/9] ath11k: add wmi helper for turning STA PS on/off John Crispin
2019-12-04  5:37 ` [RESEND 2/9] ath11k: disable PS for STA interfaces by default upon bringup John Crispin
2019-12-04  5:37 ` [RESEND 3/9] ath11k: drop memset when setting up a tx cmd desc John Crispin
2019-12-04  5:37 ` [RESEND 4/9] ath11k: rename ath11k_wmi_base instances from wmi_sc to wmi_ab John Crispin
2019-12-04  5:37 ` [RESEND 5/9] ath11k: add WMI calls to manually add/del/pause/resume TWT dialogs John Crispin
2019-12-04  5:55   ` vthiagar [this message]
2019-12-04  5:37 ` [RESEND 6/9] ath11k: add debugfs for TWT debug calls John Crispin
2019-12-04  6:00   ` vthiagar
2019-12-04  5:37 ` [RESEND 7/9] ath11k: move some tx_status parsing to debugfs code John Crispin
2019-12-04  5:37 ` [RESEND 8/9] ath11k: optimise ath11k_dp_tx_completion_handler John Crispin
2019-12-04  5:37 ` [RESEND 9/9] ath11k: optimize ath11k_hal_tx_status_parse John Crispin
2019-12-04  6:02   ` vthiagar

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=0101016ecf7a30ee-153837b8-308e-4b00-9df0-aafc33f40667-000000@us-west-2.amazonses.com \
    --to=vthiagar@codeaurora.org \
    --cc=ath11k@lists.infradead.org \
    --cc=john@phrozen.org \
    --cc=kvalo@codeaurora.org \
    --cc=linux-wireless-owner@vger.kernel.org \
    --cc=linux-wireless@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-Wireless Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-wireless/0 linux-wireless/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-wireless linux-wireless/ https://lore.kernel.org/linux-wireless \
		linux-wireless@vger.kernel.org
	public-inbox-index linux-wireless

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-wireless


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git