Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc405152 authored by Rakesh Pillai's avatar Rakesh Pillai Committed by Kalle Valo
Browse files

ath10k: handle mgmt tx completion event 



WCN3990 transmits management frames via WMI
with reference. Currently, with the management
tx completion not being handled, these frames are
not getting freed even after the transmission status
is returned by the firmware.

The transmitted management frames should be freed
when the firmware sends the over-the-air tx status of
the corresponding management frames.

Handle the wmi mgmt tx completion event and free
the corresponding management frame.

Tested HW: WCN3990
Tested FW: WLAN.HL.2.0-01188-QCAHLSWMTPLZ-1

Signed-off-by: default avatarRakesh Pillai <pillair@codeaurora.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 673bc519

drivers/net/wireless/ath/ath10k/core.c

+1 −0
Original line number Diff line number Diff line
@@ -2095,6 +2095,7 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar) 
		ar->fw_stats_req_mask = WMI_STAT_PDEV | WMI_STAT_VDEV |

			WMI_STAT_PEER;

		ar->max_spatial_stream = WMI_MAX_SPATIAL_STREAM;

		ar->wmi.mgmt_max_num_pending_tx = TARGET_TLV_MGMT_NUM_MSDU_DESC;

		break;

	case ATH10K_FW_WMI_OP_VERSION_10_4:

		ar->max_num_peers = TARGET_10_4_NUM_PEERS;

drivers/net/wireless/ath/ath10k/core.h

+5 −0
Original line number Diff line number Diff line
@@ -186,6 +186,11 @@ struct ath10k_wmi { 
	const struct wmi_ops *ops;

	const struct wmi_peer_flags_map *peer_flags;



	u32 mgmt_max_num_pending_tx;



	/* Protected by data_lock */

	struct idr mgmt_pending_tx;



	u32 num_mem_chunks;

	u32 rx_decap_mode;

	struct ath10k_mem_chunk mem_chunks[WMI_MAX_MEM_REQS];

drivers/net/wireless/ath/ath10k/hw.h

+1 −0
Original line number Diff line number Diff line
@@ -699,6 +699,7 @@ ath10k_rx_desc_get_l3_pad_bytes(struct ath10k_hw_params *hw, 
#define TARGET_TLV_NUM_TIDS			((TARGET_TLV_NUM_PEERS) * 2)

#define TARGET_TLV_NUM_MSDU_DESC		(1024 + 32)

#define TARGET_TLV_NUM_WOW_PATTERNS		22

#define TARGET_TLV_MGMT_NUM_MSDU_DESC		(50)



/* Target specific defines for WMI-HL-1.0 firmware */

#define TARGET_HL_10_TLV_NUM_PEERS		14

drivers/net/wireless/ath/ath10k/wmi-ops.h

+12 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ struct wmi_ops { 
			 struct wmi_scan_ev_arg *arg);

	int (*pull_mgmt_rx)(struct ath10k *ar, struct sk_buff *skb,

			    struct wmi_mgmt_rx_ev_arg *arg);

	int (*pull_mgmt_tx_compl)(struct ath10k *ar, struct sk_buff *skb,

				  struct wmi_tlv_mgmt_tx_compl_ev_arg *arg);

	int (*pull_ch_info)(struct ath10k *ar, struct sk_buff *skb,

			    struct wmi_ch_info_ev_arg *arg);

	int (*pull_vdev_start)(struct ath10k *ar, struct sk_buff *skb,
@@ -261,6 +263,16 @@ ath10k_wmi_pull_scan(struct ath10k *ar, struct sk_buff *skb, 
	return ar->wmi.ops->pull_scan(ar, skb, arg);

}



static inline int

ath10k_wmi_pull_mgmt_tx_compl(struct ath10k *ar, struct sk_buff *skb,

			      struct wmi_tlv_mgmt_tx_compl_ev_arg *arg)

{

	if (!ar->wmi.ops->pull_mgmt_tx_compl)

		return -EOPNOTSUPP;



	return ar->wmi.ops->pull_mgmt_tx_compl(ar, skb, arg);

}



static inline int

ath10k_wmi_pull_mgmt_rx(struct ath10k *ar, struct sk_buff *skb,

			struct wmi_mgmt_rx_ev_arg *arg)

drivers/net/wireless/ath/ath10k/wmi-tlv.c

+63 −2
Original line number Diff line number Diff line
@@ -618,6 +618,9 @@ static void ath10k_wmi_tlv_op_rx(struct ath10k *ar, struct sk_buff *skb) 
	case WMI_TLV_TDLS_PEER_EVENTID:

		ath10k_wmi_event_tdls_peer(ar, skb);

		break;

	case WMI_TLV_MGMT_TX_COMPLETION_EVENTID:

		ath10k_wmi_event_mgmt_tx_compl(ar, skb);

		break;

	default:

		ath10k_warn(ar, "Unknown eventid: %d\n", id);

		break;
@@ -659,6 +662,31 @@ static int ath10k_wmi_tlv_op_pull_scan_ev(struct ath10k *ar, 
	return 0;

}



static int

ath10k_wmi_tlv_op_pull_mgmt_tx_compl_ev(struct ath10k *ar, struct sk_buff *skb,

					struct wmi_tlv_mgmt_tx_compl_ev_arg *arg)

{

	const void **tb;

	const struct wmi_tlv_mgmt_tx_compl_ev *ev;

	int ret;



	tb = ath10k_wmi_tlv_parse_alloc(ar, skb->data, skb->len, GFP_ATOMIC);

	if (IS_ERR(tb)) {

		ret = PTR_ERR(tb);

		ath10k_warn(ar, "failed to parse tlv: %d\n", ret);

		return ret;

	}



	ev = tb[WMI_TLV_TAG_STRUCT_MGMT_TX_COMPL_EVENT];



	arg->desc_id = ev->desc_id;

	arg->status = ev->status;

	arg->pdev_id = ev->pdev_id;



	kfree(tb);

	return 0;

}



static int ath10k_wmi_tlv_op_pull_mgmt_rx_ev(struct ath10k *ar,

					     struct sk_buff *skb,

					     struct wmi_mgmt_rx_ev_arg *arg)
@@ -2612,6 +2640,30 @@ ath10k_wmi_tlv_op_gen_request_stats(struct ath10k *ar, u32 stats_mask) 
	return skb;

}



static int

ath10k_wmi_mgmt_tx_alloc_msdu_id(struct ath10k *ar, struct sk_buff *skb,

				 dma_addr_t paddr)

{

	struct ath10k_wmi *wmi = &ar->wmi;

	struct ath10k_mgmt_tx_pkt_addr *pkt_addr;

	int ret;



	pkt_addr = kmalloc(sizeof(*pkt_addr), GFP_ATOMIC);

	if (!pkt_addr)

		return -ENOMEM;



	pkt_addr->vaddr = skb;

	pkt_addr->paddr = paddr;



	spin_lock_bh(&ar->data_lock);

	ret = idr_alloc(&wmi->mgmt_pending_tx, pkt_addr, 0,

			wmi->mgmt_max_num_pending_tx, GFP_ATOMIC);

	spin_unlock_bh(&ar->data_lock);



	ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi mgmt tx alloc msdu_id ret %d\n", ret);

	return ret;

}



static struct sk_buff *

ath10k_wmi_tlv_op_gen_mgmt_tx_send(struct ath10k *ar, struct sk_buff *msdu,

				   dma_addr_t paddr)
@@ -2623,9 +2675,9 @@ ath10k_wmi_tlv_op_gen_mgmt_tx_send(struct ath10k *ar, struct sk_buff *msdu, 
	u32 buf_len = msdu->len;

	struct wmi_tlv *tlv;

	struct sk_buff *skb;

	int len, desc_id;

	u32 vdev_id;

	void *ptr;

	int len;



	if (!cb->vif)

		return ERR_PTR(-EINVAL);
@@ -2656,13 +2708,17 @@ ath10k_wmi_tlv_op_gen_mgmt_tx_send(struct ath10k *ar, struct sk_buff *msdu, 
	if (!skb)

		return ERR_PTR(-ENOMEM);



	desc_id = ath10k_wmi_mgmt_tx_alloc_msdu_id(ar, msdu, paddr);

	if (desc_id < 0)

		goto err_free_skb;



	ptr = (void *)skb->data;

	tlv = ptr;

	tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_MGMT_TX_CMD);

	tlv->len = __cpu_to_le16(sizeof(*cmd));

	cmd = (void *)tlv->value;

	cmd->vdev_id = __cpu_to_le32(vdev_id);

	cmd->desc_id = 0;

	cmd->desc_id = __cpu_to_le32(desc_id);

	cmd->chanfreq = 0;

	cmd->buf_len = __cpu_to_le32(buf_len);

	cmd->frame_len = __cpu_to_le32(msdu->len);
@@ -2679,6 +2735,10 @@ ath10k_wmi_tlv_op_gen_mgmt_tx_send(struct ath10k *ar, struct sk_buff *msdu, 
	memcpy(ptr, msdu->data, buf_len);



	return skb;



err_free_skb:

	dev_kfree_skb(skb);

	return ERR_PTR(desc_id);

}



static struct sk_buff *
@@ -3843,6 +3903,7 @@ static const struct wmi_ops wmi_tlv_ops = { 


	.pull_scan = ath10k_wmi_tlv_op_pull_scan_ev,

	.pull_mgmt_rx = ath10k_wmi_tlv_op_pull_mgmt_rx_ev,

	.pull_mgmt_tx_compl = ath10k_wmi_tlv_op_pull_mgmt_tx_compl_ev,

	.pull_ch_info = ath10k_wmi_tlv_op_pull_ch_info_ev,

	.pull_vdev_start = ath10k_wmi_tlv_op_pull_vdev_start_ev,

	.pull_peer_kick = ath10k_wmi_tlv_op_pull_peer_kick_ev,