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

Commit 6d492fe2 authored by Michal Kazior's avatar Michal Kazior Committed by Kalle Valo
Browse files

ath10k: implement per-vdev wmm param setup command 



New wmi-tlv firmware for qca6174 supports this.
This will be used soon.

Signed-off-by: default avatarMichal Kazior <michal.kazior@tieto.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 5e752e42

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

+17 −0
Original line number Diff line number Diff line
@@ -78,6 +78,8 @@ struct wmi_ops { 
						  const struct wmi_vdev_spectral_conf_arg *arg);

	struct sk_buff *(*gen_vdev_spectral_enable)(struct ath10k *ar, u32 vdev_id,

						    u32 trigger, u32 enable);

	struct sk_buff *(*gen_vdev_wmm_conf)(struct ath10k *ar, u32 vdev_id,

					     const struct wmi_wmm_params_all_arg *arg);

	struct sk_buff *(*gen_peer_create)(struct ath10k *ar, u32 vdev_id,

					   const u8 peer_addr[ETH_ALEN]);

	struct sk_buff *(*gen_peer_delete)(struct ath10k *ar, u32 vdev_id,
@@ -600,6 +602,21 @@ ath10k_wmi_vdev_sta_uapsd(struct ath10k *ar, u32 vdev_id, 
	return ath10k_wmi_cmd_send(ar, skb, cmd_id);

}



static inline int

ath10k_wmi_vdev_wmm_conf(struct ath10k *ar, u32 vdev_id,

			 const struct wmi_wmm_params_all_arg *arg)

{

	struct sk_buff *skb;

	u32 cmd_id;



	skb = ar->wmi.ops->gen_vdev_wmm_conf(ar, vdev_id, arg);

	if (IS_ERR(skb))

		return PTR_ERR(skb);



	cmd_id = ar->wmi.cmd->vdev_set_wmm_params_cmdid;

	return ath10k_wmi_cmd_send(ar, skb, cmd_id);

}



static inline int

ath10k_wmi_peer_create(struct ath10k *ar, u32 vdev_id,

		       const u8 peer_addr[ETH_ALEN])

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

+38 −0
Original line number Diff line number Diff line
@@ -1599,6 +1599,42 @@ static void *ath10k_wmi_tlv_put_wmm(void *ptr, 
	return ptr + sizeof(*tlv) + sizeof(*wmm);

}



static struct sk_buff *

ath10k_wmi_tlv_op_gen_vdev_wmm_conf(struct ath10k *ar, u32 vdev_id,

				    const struct wmi_wmm_params_all_arg *arg)

{

	struct wmi_tlv_vdev_set_wmm_cmd *cmd;

	struct wmi_wmm_params *wmm;

	struct wmi_tlv *tlv;

	struct sk_buff *skb;

	size_t len;

	void *ptr;



	len = (sizeof(*tlv) + sizeof(*cmd)) +

	      (4 * (sizeof(*tlv) + sizeof(*wmm)));

	skb = ath10k_wmi_alloc_skb(ar, len);

	if (!skb)

		return ERR_PTR(-ENOMEM);



	ptr = (void *)skb->data;

	tlv = ptr;

	tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_VDEV_SET_WMM_PARAMS_CMD);

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

	cmd = (void *)tlv->value;

	cmd->vdev_id = __cpu_to_le32(vdev_id);



	ptr += sizeof(*tlv);

	ptr += sizeof(*cmd);



	ptr = ath10k_wmi_tlv_put_wmm(ptr, &arg->ac_be);

	ptr = ath10k_wmi_tlv_put_wmm(ptr, &arg->ac_bk);

	ptr = ath10k_wmi_tlv_put_wmm(ptr, &arg->ac_vi);

	ptr = ath10k_wmi_tlv_put_wmm(ptr, &arg->ac_vo);



	ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv vdev wmm conf\n");

	return skb;

}



static struct sk_buff *

ath10k_wmi_tlv_op_gen_peer_create(struct ath10k *ar, u32 vdev_id,

				  const u8 peer_addr[ETH_ALEN])
@@ -2426,6 +2462,7 @@ static struct wmi_cmd_map wmi_tlv_cmd_map = { 
	.gpio_config_cmdid = WMI_TLV_GPIO_CONFIG_CMDID,

	.gpio_output_cmdid = WMI_TLV_GPIO_OUTPUT_CMDID,

	.pdev_get_temperature_cmdid = WMI_TLV_CMD_UNSUPPORTED,

	.vdev_set_wmm_params_cmdid = WMI_TLV_VDEV_SET_WMM_PARAMS_CMDID,

};



static struct wmi_pdev_param_map wmi_tlv_pdev_param_map = {
@@ -2569,6 +2606,7 @@ static const struct wmi_ops wmi_tlv_ops = { 
	.gen_vdev_down = ath10k_wmi_tlv_op_gen_vdev_down,

	.gen_vdev_set_param = ath10k_wmi_tlv_op_gen_vdev_set_param,

	.gen_vdev_install_key = ath10k_wmi_tlv_op_gen_vdev_install_key,

	.gen_vdev_wmm_conf = ath10k_wmi_tlv_op_gen_vdev_wmm_conf,

	.gen_peer_create = ath10k_wmi_tlv_op_gen_peer_create,

	.gen_peer_delete = ath10k_wmi_tlv_op_gen_peer_delete,

	.gen_peer_flush = ath10k_wmi_tlv_op_gen_peer_flush,

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

+4 −0
Original line number Diff line number Diff line
@@ -1302,6 +1302,10 @@ struct wmi_tlv_pdev_set_wmm_cmd { 
	__le32 dg_type; /* no idea.. */

} __packed;



struct wmi_tlv_vdev_set_wmm_cmd {

	__le32 vdev_id;

} __packed;



struct wmi_tlv_phyerr_ev {

	__le32 num_phyerrs;

	__le32 tsf_l32;

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

+3 −0
Original line number Diff line number Diff line
@@ -5188,6 +5188,7 @@ static const struct wmi_ops wmi_ops = { 
	.gen_vdev_install_key = ath10k_wmi_op_gen_vdev_install_key,

	.gen_vdev_spectral_conf = ath10k_wmi_op_gen_vdev_spectral_conf,

	.gen_vdev_spectral_enable = ath10k_wmi_op_gen_vdev_spectral_enable,

	/* .gen_vdev_wmm_conf not implemented */

	.gen_peer_create = ath10k_wmi_op_gen_peer_create,

	.gen_peer_delete = ath10k_wmi_op_gen_peer_delete,

	.gen_peer_flush = ath10k_wmi_op_gen_peer_flush,
@@ -5251,6 +5252,7 @@ static const struct wmi_ops wmi_10_1_ops = { 
	.gen_vdev_install_key = ath10k_wmi_op_gen_vdev_install_key,

	.gen_vdev_spectral_conf = ath10k_wmi_op_gen_vdev_spectral_conf,

	.gen_vdev_spectral_enable = ath10k_wmi_op_gen_vdev_spectral_enable,

	/* .gen_vdev_wmm_conf not implemented */

	.gen_peer_create = ath10k_wmi_op_gen_peer_create,

	.gen_peer_delete = ath10k_wmi_op_gen_peer_delete,

	.gen_peer_flush = ath10k_wmi_op_gen_peer_flush,
@@ -5313,6 +5315,7 @@ static const struct wmi_ops wmi_10_2_ops = { 
	.gen_vdev_install_key = ath10k_wmi_op_gen_vdev_install_key,

	.gen_vdev_spectral_conf = ath10k_wmi_op_gen_vdev_spectral_conf,

	.gen_vdev_spectral_enable = ath10k_wmi_op_gen_vdev_spectral_enable,

	/* .gen_vdev_wmm_conf not implemented */

	.gen_peer_create = ath10k_wmi_op_gen_peer_create,

	.gen_peer_delete = ath10k_wmi_op_gen_peer_delete,

	.gen_peer_flush = ath10k_wmi_op_gen_peer_flush,

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

+1 −0
Original line number Diff line number Diff line
@@ -551,6 +551,7 @@ struct wmi_cmd_map { 
	u32 gpio_config_cmdid;

	u32 gpio_output_cmdid;

	u32 pdev_get_temperature_cmdid;

	u32 vdev_set_wmm_params_cmdid;

};



/*