ath10k: Add wmi command support for station specific TID config

This patch adds WMI interface to configure station specific
TID configuration . Host needs to send station's MAC address
along with TID number and its configuration to target through
WMI_10_4_PER_PEER_PER_TID_CONFIG_CMDID.

WMI_SERVICE_PEER_TID_CONFIGS_SUPPORT flag is added to advertise
this support.

Tested-on: QCA9984 hw1.0 PCI 10.4-3.9.0.2-00021

Signed-off-by: Tamizh Chelvam <tamizhr@codeaurora.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/1593875614-5683-2-git-send-email-tamizhr@codeaurora.org

diff --git a/drivers/net/wireless/ath/ath10k/wmi-ops.h b/drivers/net/wireless/ath/ath10k/wmi-ops.h
index 0dd484f850828530c63b5e8c3bc59e34c6e8a488..aa57d807491ca1932fd663218af8f3645c4fd26c 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/wmi-ops.h
+++ b/drivers/net/wireless/ath/ath10k/wmi-ops.h
@@ -224,6 +224,8 @@ struct wmi_ops {
        struct sk_buff *(*gen_bb_timing)
                        (struct ath10k *ar,
                         const struct wmi_bb_timing_cfg_arg *arg);
+       struct sk_buff *(*gen_per_peer_per_tid_cfg)(struct ath10k *ar,
+                                                   const struct wmi_per_peer_per_tid_cfg_arg *arg);
 
 };
 
@@ -1656,4 +1658,21 @@ ath10k_wmi_pdev_bb_timing(struct ath10k *ar,
        return ath10k_wmi_cmd_send(ar, skb,
                                   ar->wmi.cmd->set_bb_timing_cmdid);
 }
+
+static inline int
+ath10k_wmi_set_per_peer_per_tid_cfg(struct ath10k *ar,
+                                   const struct wmi_per_peer_per_tid_cfg_arg *arg)
+{
+       struct sk_buff *skb;
+
+       if (!ar->wmi.ops->gen_per_peer_per_tid_cfg)
+               return -EOPNOTSUPP;
+
+       skb = ar->wmi.ops->gen_per_peer_per_tid_cfg(ar, arg);
+       if (IS_ERR(skb))
+               return PTR_ERR(skb);
+
+       return ath10k_wmi_cmd_send(ar, skb,
+                                  ar->wmi.cmd->per_peer_per_tid_config_cmdid);
+}
 #endif

diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c
index a81a1ab2de19eece1db016585dbc180c2f541b75..5c77e8689b7c21b2d4b98e50b561e0ce2b3e232c 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -740,6 +740,7 @@ static struct wmi_cmd_map wmi_10_4_cmd_map = {
        .tdls_peer_update_cmdid = WMI_10_4_TDLS_PEER_UPDATE_CMDID,
        .tdls_set_offchan_mode_cmdid = WMI_10_4_TDLS_SET_OFFCHAN_MODE_CMDID,
        .radar_found_cmdid = WMI_10_4_RADAR_FOUND_CMDID,
+       .per_peer_per_tid_config_cmdid = WMI_10_4_PER_PEER_PER_TID_CONFIG_CMDID,
 };
 
 static struct wmi_peer_param_map wmi_peer_param_map = {
@@ -9004,6 +9005,37 @@ ath10k_wmi_10_4_gen_radar_found(struct ath10k *ar,
        return skb;
 }
 
+static struct sk_buff *
+ath10k_wmi_10_4_gen_per_peer_per_tid_cfg(struct ath10k *ar,
+                                        const struct wmi_per_peer_per_tid_cfg_arg *arg)
+{
+       struct wmi_peer_per_tid_cfg_cmd *cmd;
+       struct sk_buff *skb;
+
+       skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd));
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
+
+       memset(skb->data, 0, sizeof(*cmd));
+
+       cmd = (struct wmi_peer_per_tid_cfg_cmd *)skb->data;
+       cmd->vdev_id = cpu_to_le32(arg->vdev_id);
+       ether_addr_copy(cmd->peer_macaddr.addr, arg->peer_macaddr.addr);
+       cmd->tid = cpu_to_le32(arg->tid);
+       cmd->ack_policy = cpu_to_le32(arg->ack_policy);
+       cmd->aggr_control = cpu_to_le32(arg->aggr_control);
+       cmd->rate_control = cpu_to_le32(arg->rate_ctrl);
+       cmd->retry_count = cpu_to_le32(arg->retry_count);
+       cmd->rcode_flags = cpu_to_le32(arg->rcode_flags);
+
+       ath10k_dbg(ar, ATH10K_DBG_WMI,
+                  "wmi noack tid %d vdev id %d ack_policy %d aggr %u rate_ctrl %u rcflag %u retry_count %d mac_addr %pM\n",
+                  arg->tid, arg->vdev_id, arg->ack_policy, arg->aggr_control,
+                  arg->rate_ctrl, arg->rcode_flags, arg->retry_count,
+                  arg->peer_macaddr.addr);
+       return skb;
+}
+
 static struct sk_buff *
 ath10k_wmi_op_gen_echo(struct ath10k *ar, u32 value)
 {
@@ -9413,6 +9445,7 @@ static const struct wmi_ops wmi_10_4_ops = {
        .gen_pdev_get_tpc_table_cmdid =
                        ath10k_wmi_10_4_op_gen_pdev_get_tpc_table_cmdid,
        .gen_radar_found = ath10k_wmi_10_4_gen_radar_found,
+       .gen_per_peer_per_tid_cfg = ath10k_wmi_10_4_gen_per_peer_per_tid_cfg,
 
        /* shared with 10.2 */
        .pull_echo_ev = ath10k_wmi_op_pull_echo_ev,

diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/ath/ath10k/wmi.h
index 511144b362319d580496fd4bb217b238744ac39d..cba9b23643ed53708aff3a7b1c0c1da5fbad303a 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/wmi.h
+++ b/drivers/net/wireless/ath/ath10k/wmi.h
@@ -203,6 +203,7 @@ enum wmi_service {
        WMI_SERVICE_SYNC_DELETE_CMDS,
        WMI_SERVICE_TX_PWR_PER_PEER,
        WMI_SERVICE_SUPPORT_EXTEND_ADDRESS,
+       WMI_SERVICE_PEER_TID_CONFIGS_SUPPORT,
 
        /* Remember to add the new value to wmi_service_name()! */
 
@@ -503,6 +504,7 @@ static inline char *wmi_service_name(enum wmi_service service_id)
        SVCSTR(WMI_SERVICE_SYNC_DELETE_CMDS);
        SVCSTR(WMI_SERVICE_TX_PWR_PER_PEER);
        SVCSTR(WMI_SERVICE_SUPPORT_EXTEND_ADDRESS);
+       SVCSTR(WMI_SERVICE_PEER_TID_CONFIGS_SUPPORT);
 
        case WMI_SERVICE_MAX:
                return NULL;
@@ -834,6 +836,8 @@ static inline void wmi_10_4_svc_map(const __le32 *in, unsigned long *out,
               WMI_SERVICE_TX_PWR_PER_PEER, len);
        SVCMAP(WMI_10_4_SERVICE_RESET_CHIP,
               WMI_SERVICE_RESET_CHIP, len);
+       SVCMAP(WMI_10_4_SERVICE_PEER_TID_CONFIGS_SUPPORT,
+              WMI_SERVICE_PEER_TID_CONFIGS_SUPPORT, len);
 }
 
 #undef SVCMAP
@@ -1036,6 +1040,7 @@ struct wmi_cmd_map {
        u32 tdls_set_offchan_mode_cmdid;
        u32 radar_found_cmdid;
        u32 set_bb_timing_cmdid;
+       u32 per_peer_per_tid_config_cmdid;
 };
 
 /*
@@ -1877,6 +1882,8 @@ enum wmi_10_4_cmd_id {
        WMI_10_4_PDEV_SET_BRIDGE_MACADDR_CMDID,
        WMI_10_4_ATF_GROUP_WMM_AC_CONFIG_REQUEST_CMDID,
        WMI_10_4_RADAR_FOUND_CMDID,
+       WMI_10_4_PEER_CFR_CAPTURE_CMDID,
+       WMI_10_4_PER_PEER_PER_TID_CONFIG_CMDID,
        WMI_10_4_PDEV_UTF_CMDID = WMI_10_4_END_CMDID - 1,
 };
 
@@ -7220,6 +7227,53 @@ struct wmi_tdls_peer_event {
        __le32 vdev_id;
 } __packed;
 
+enum wmi_tid_aggr_control_conf {
+       WMI_TID_CONFIG_AGGR_CONTROL_IGNORE,
+       WMI_TID_CONFIG_AGGR_CONTROL_ENABLE,
+       WMI_TID_CONFIG_AGGR_CONTROL_DISABLE,
+};
+
+enum wmi_noack_tid_conf {
+       WMI_NOACK_TID_CONFIG_IGNORE_ACK_POLICY,
+       WMI_PEER_TID_CONFIG_ACK,
+       WMI_PEER_TID_CONFIG_NOACK,
+};
+
+enum wmi_tid_rate_ctrl_conf {
+       WMI_TID_CONFIG_RATE_CONTROL_IGNORE,
+       WMI_TID_CONFIG_RATE_CONTROL_AUTO,
+       WMI_TID_CONFIG_RATE_CONTROL_FIXED_RATE,
+       WMI_TID_CONFIG_RATE_CONTROL_DEFAULT_LOWEST_RATE,
+};
+
+struct wmi_per_peer_per_tid_cfg_arg {
+       u32 vdev_id;
+       struct wmi_mac_addr peer_macaddr;
+       u32 tid;
+       enum wmi_noack_tid_conf ack_policy;
+       enum wmi_tid_aggr_control_conf aggr_control;
+       u8 rate_ctrl;
+       u32 retry_count;
+       u32 rcode_flags;
+};
+
+struct wmi_peer_per_tid_cfg_cmd {
+       __le32 vdev_id;
+       struct wmi_mac_addr peer_macaddr;
+       __le32 tid;
+
+       /* see enum wmi_noack_tid_conf */
+       __le32 ack_policy;
+
+       /* see enum wmi_tid_aggr_control_conf */
+       __le32 aggr_control;
+
+       /* see enum wmi_tid_rate_ctrl_conf */
+       __le32 rate_control;
+       __le32 rcode_flags;
+       __le32 retry_count;
+} __packed;
+
 enum wmi_txbf_conf {
        WMI_TXBF_CONF_UNSUPPORTED,
        WMI_TXBF_CONF_BEFORE_ASSOC,