ath10k: Add support for 64 bit HTT frag descriptor

WCN3990 target uses 64 bit frag descriptor and more
fields in TSO flag.
Add support for 64 bit HTT frag descriptor.

Signed-off-by: Govind Singh <govinds@qti.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath10k/htt.c b/drivers/net/wireless/ath/ath10k/htt.c
index 7176b0a..8dc96a1 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/htt.c
+++ b/drivers/net/wireless/ath/ath10k/htt.c
@@ -256,7 +256,7 @@ int ath10k_htt_setup(struct ath10k_htt *htt)
                return status;
        }
 
-       status = ath10k_htt_send_frag_desc_bank_cfg(htt);
+       status = htt->tx_ops->htt_send_frag_desc_bank_cfg(htt);
        if (status)
                return status;
 

diff --git a/drivers/net/wireless/ath/ath10k/htt.h b/drivers/net/wireless/ath/ath10k/htt.h
index 60a8f6c..5108b0b 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/htt.h
+++ b/drivers/net/wireless/ath/ath10k/htt.h
@@ -107,6 +107,14 @@ struct htt_msdu_ext_desc {
        struct htt_data_tx_desc_frag frags[6];
 };
 
+struct htt_msdu_ext_desc_64 {
+       __le32 tso_flag[5];
+       __le16 ip_identification;
+       u8 flags;
+       u8 reserved;
+       struct htt_data_tx_desc_frag frags[6];
+};
+
 #define        HTT_MSDU_EXT_DESC_FLAG_IPV4_CSUM_ENABLE         BIT(0)
 #define        HTT_MSDU_EXT_DESC_FLAG_UDP_IPV4_CSUM_ENABLE     BIT(1)
 #define        HTT_MSDU_EXT_DESC_FLAG_UDP_IPV6_CSUM_ENABLE     BIT(2)
@@ -1387,7 +1395,7 @@ struct htt_q_state_conf {
        u8 pad[2];
 } __packed;
 
-struct htt_frag_desc_bank_cfg {
+struct htt_frag_desc_bank_cfg32 {
        u8 info; /* HTT_FRAG_DESC_BANK_CFG_INFO_ */
        u8 num_banks;
        u8 desc_size;
@@ -1396,6 +1404,15 @@ struct htt_frag_desc_bank_cfg {
        struct htt_q_state_conf q_state;
 } __packed;
 
+struct htt_frag_desc_bank_cfg64 {
+       u8 info; /* HTT_FRAG_DESC_BANK_CFG_INFO_ */
+       u8 num_banks;
+       u8 desc_size;
+       __le64 bank_base_addrs[HTT_FRAG_DESC_BANK_MAX];
+       struct htt_frag_desc_bank_id bank_id[HTT_FRAG_DESC_BANK_MAX];
+       struct htt_q_state_conf q_state;
+} __packed;
+
 #define HTT_TX_Q_STATE_ENTRY_COEFFICIENT       128
 #define HTT_TX_Q_STATE_ENTRY_FACTOR_MASK       0x3f
 #define HTT_TX_Q_STATE_ENTRY_FACTOR_LSB                0
@@ -1572,7 +1589,8 @@ struct htt_cmd {
                struct htt_stats_req stats_req;
                struct htt_oob_sync_req oob_sync_req;
                struct htt_aggr_conf aggr_conf;
-               struct htt_frag_desc_bank_cfg frag_desc_bank_cfg;
+               struct htt_frag_desc_bank_cfg32 frag_desc_bank_cfg32;
+               struct htt_frag_desc_bank_cfg64 frag_desc_bank_cfg64;
                struct htt_tx_fetch_resp tx_fetch_resp;
        };
 } __packed;
@@ -1758,7 +1776,11 @@ struct ath10k_htt {
 
        struct {
                dma_addr_t paddr;
-               struct htt_msdu_ext_desc *vaddr;
+               union {
+                       struct htt_msdu_ext_desc *vaddr_desc_32;
+                       struct htt_msdu_ext_desc_64 *vaddr_desc_64;
+               };
+               size_t size;
        } frag_desc;
 
        struct {
@@ -1783,6 +1805,9 @@ struct ath10k_htt {
 
 struct ath10k_htt_tx_ops {
        int (*htt_send_rx_ring_cfg)(struct ath10k_htt *htt);
+       int (*htt_send_frag_desc_bank_cfg)(struct ath10k_htt *htt);
+       int (*htt_alloc_frag_desc)(struct ath10k_htt *htt);
+       void (*htt_free_frag_desc)(struct ath10k_htt *htt);
 };
 
 #define RX_HTT_HDR_STATUS_LEN 64
@@ -1862,7 +1887,6 @@ void ath10k_htt_htc_t2h_msg_handler(struct ath10k *ar, struct sk_buff *skb);
 bool ath10k_htt_t2h_msg_handler(struct ath10k *ar, struct sk_buff *skb);
 int ath10k_htt_h2t_ver_req_msg(struct ath10k_htt *htt);
 int ath10k_htt_h2t_stats_req(struct ath10k_htt *htt, u8 mask, u64 cookie);
-int ath10k_htt_send_frag_desc_bank_cfg(struct ath10k_htt *htt);
 int ath10k_htt_send_rx_ring_cfg_ll(struct ath10k_htt *htt);
 int ath10k_htt_h2t_aggr_cfg_msg(struct ath10k_htt *htt,
                                u8 max_subfrms_ampdu,

diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c b/drivers/net/wireless/ath/ath10k/htt_tx.c
index fad1664..5989489 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/htt_tx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_tx.c
@@ -256,23 +256,65 @@ static int ath10k_htt_tx_alloc_cont_txbuf(struct ath10k_htt *htt)
        return 0;
 }
 
-static void ath10k_htt_tx_free_cont_frag_desc(struct ath10k_htt *htt)
+static void ath10k_htt_tx_free_cont_frag_desc_32(struct ath10k_htt *htt)
 {
        size_t size;
 
-       if (!htt->frag_desc.vaddr)
+       if (!htt->frag_desc.vaddr_desc_32)
                return;
 
-       size = htt->max_num_pending_tx * sizeof(struct htt_msdu_ext_desc);
+       size = htt->max_num_pending_tx *
+                       sizeof(struct htt_msdu_ext_desc);
 
        dma_free_coherent(htt->ar->dev,
                          size,
-                         htt->frag_desc.vaddr,
+                         htt->frag_desc.vaddr_desc_32,
                          htt->frag_desc.paddr);
-       htt->frag_desc.vaddr = NULL;
+
+       htt->frag_desc.vaddr_desc_32 = NULL;
+}
+
+static int ath10k_htt_tx_alloc_cont_frag_desc_32(struct ath10k_htt *htt)
+{
+       struct ath10k *ar = htt->ar;
+       size_t size;
+
+       if (!ar->hw_params.continuous_frag_desc)
+               return 0;
+
+       size = htt->max_num_pending_tx *
+                       sizeof(struct htt_msdu_ext_desc);
+       htt->frag_desc.vaddr_desc_32 = dma_alloc_coherent(ar->dev, size,
+                                                         &htt->frag_desc.paddr,
+                                                         GFP_KERNEL);
+       if (!htt->frag_desc.vaddr_desc_32) {
+               ath10k_err(ar, "failed to alloc fragment desc memory\n");
+               return -ENOMEM;
+       }
+       htt->frag_desc.size = size;
+
+       return 0;
+}
+
+static void ath10k_htt_tx_free_cont_frag_desc_64(struct ath10k_htt *htt)
+{
+       size_t size;
+
+       if (!htt->frag_desc.vaddr_desc_64)
+               return;
+
+       size = htt->max_num_pending_tx *
+                       sizeof(struct htt_msdu_ext_desc_64);
+
+       dma_free_coherent(htt->ar->dev,
+                         size,
+                         htt->frag_desc.vaddr_desc_64,
+                         htt->frag_desc.paddr);
+
+       htt->frag_desc.vaddr_desc_64 = NULL;
 }
 
-static int ath10k_htt_tx_alloc_cont_frag_desc(struct ath10k_htt *htt)
+static int ath10k_htt_tx_alloc_cont_frag_desc_64(struct ath10k_htt *htt)
 {
        struct ath10k *ar = htt->ar;
        size_t size;
@@ -280,12 +322,17 @@ static int ath10k_htt_tx_alloc_cont_frag_desc(struct ath10k_htt *htt)
        if (!ar->hw_params.continuous_frag_desc)
                return 0;
 
-       size = htt->max_num_pending_tx * sizeof(struct htt_msdu_ext_desc);
-       htt->frag_desc.vaddr = dma_alloc_coherent(ar->dev, size,
-                                                 &htt->frag_desc.paddr,
-                                                 GFP_KERNEL);
-       if (!htt->frag_desc.vaddr)
+       size = htt->max_num_pending_tx *
+                       sizeof(struct htt_msdu_ext_desc_64);
+
+       htt->frag_desc.vaddr_desc_64 = dma_alloc_coherent(ar->dev, size,
+                                                         &htt->frag_desc.paddr,
+                                                         GFP_KERNEL);
+       if (!htt->frag_desc.vaddr_desc_64) {
+               ath10k_err(ar, "failed to alloc fragment desc memory\n");
                return -ENOMEM;
+       }
+       htt->frag_desc.size = size;
 
        return 0;
 }
@@ -363,7 +410,7 @@ static int ath10k_htt_tx_alloc_buf(struct ath10k_htt *htt)
                return ret;
        }
 
-       ret = ath10k_htt_tx_alloc_cont_frag_desc(htt);
+       ret = htt->tx_ops->htt_alloc_frag_desc(htt);
        if (ret) {
                ath10k_err(ar, "failed to alloc cont frag desc: %d\n", ret);
                goto free_txbuf;
@@ -387,7 +434,7 @@ free_txq:
        ath10k_htt_tx_free_txq(htt);
 
 free_frag_desc:
-       ath10k_htt_tx_free_cont_frag_desc(htt);
+       htt->tx_ops->htt_free_frag_desc(htt);
 
 free_txbuf:
        ath10k_htt_tx_free_cont_txbuf(htt);
@@ -446,7 +493,7 @@ void ath10k_htt_tx_destroy(struct ath10k_htt *htt)
 
        ath10k_htt_tx_free_cont_txbuf(htt);
        ath10k_htt_tx_free_txq(htt);
-       ath10k_htt_tx_free_cont_frag_desc(htt);
+       htt->tx_ops->htt_free_frag_desc(htt);
        ath10k_htt_tx_free_txdone_fifo(htt);
        htt->tx_mem_allocated = false;
 }
@@ -545,12 +592,12 @@ int ath10k_htt_h2t_stats_req(struct ath10k_htt *htt, u8 mask, u64 cookie)
        return 0;
 }
 
-int ath10k_htt_send_frag_desc_bank_cfg(struct ath10k_htt *htt)
+static int ath10k_htt_send_frag_desc_bank_cfg_32(struct ath10k_htt *htt)
 {
        struct ath10k *ar = htt->ar;
        struct sk_buff *skb;
        struct htt_cmd *cmd;
-       struct htt_frag_desc_bank_cfg *cfg;
+       struct htt_frag_desc_bank_cfg32 *cfg;
        int ret, size;
        u8 info;
 
@@ -562,7 +609,7 @@ int ath10k_htt_send_frag_desc_bank_cfg(struct ath10k_htt *htt)
                return -EINVAL;
        }
 
-       size = sizeof(cmd->hdr) + sizeof(cmd->frag_desc_bank_cfg);
+       size = sizeof(cmd->hdr) + sizeof(cmd->frag_desc_bank_cfg32);
        skb = ath10k_htc_alloc_skb(ar, size);
        if (!skb)
                return -ENOMEM;
@@ -579,7 +626,7 @@ int ath10k_htt_send_frag_desc_bank_cfg(struct ath10k_htt *htt)
                     ar->running_fw->fw_file.fw_features))
                info |= HTT_FRAG_DESC_BANK_CFG_INFO_Q_STATE_VALID;
 
-       cfg = &cmd->frag_desc_bank_cfg;
+       cfg = &cmd->frag_desc_bank_cfg32;
        cfg->info = info;
        cfg->num_banks = 1;
        cfg->desc_size = sizeof(struct htt_msdu_ext_desc);
@@ -607,6 +654,68 @@ int ath10k_htt_send_frag_desc_bank_cfg(struct ath10k_htt *htt)
        return 0;
 }
 
+static int ath10k_htt_send_frag_desc_bank_cfg_64(struct ath10k_htt *htt)
+{
+       struct ath10k *ar = htt->ar;
+       struct sk_buff *skb;
+       struct htt_cmd *cmd;
+       struct htt_frag_desc_bank_cfg64 *cfg;
+       int ret, size;
+       u8 info;
+
+       if (!ar->hw_params.continuous_frag_desc)
+               return 0;
+
+       if (!htt->frag_desc.paddr) {
+               ath10k_warn(ar, "invalid frag desc memory\n");
+               return -EINVAL;
+       }
+
+       size = sizeof(cmd->hdr) + sizeof(cmd->frag_desc_bank_cfg64);
+       skb = ath10k_htc_alloc_skb(ar, size);
+       if (!skb)
+               return -ENOMEM;
+
+       skb_put(skb, size);
+       cmd = (struct htt_cmd *)skb->data;
+       cmd->hdr.msg_type = HTT_H2T_MSG_TYPE_FRAG_DESC_BANK_CFG;
+
+       info = 0;
+       info |= SM(htt->tx_q_state.type,
+                  HTT_FRAG_DESC_BANK_CFG_INFO_Q_STATE_DEPTH_TYPE);
+
+       if (test_bit(ATH10K_FW_FEATURE_PEER_FLOW_CONTROL,
+                    ar->running_fw->fw_file.fw_features))
+               info |= HTT_FRAG_DESC_BANK_CFG_INFO_Q_STATE_VALID;
+
+       cfg = &cmd->frag_desc_bank_cfg64;
+       cfg->info = info;
+       cfg->num_banks = 1;
+       cfg->desc_size = sizeof(struct htt_msdu_ext_desc_64);
+       cfg->bank_base_addrs[0] =  __cpu_to_le64(htt->frag_desc.paddr);
+       cfg->bank_id[0].bank_min_id = 0;
+       cfg->bank_id[0].bank_max_id = __cpu_to_le16(htt->max_num_pending_tx -
+                                                   1);
+
+       cfg->q_state.paddr = cpu_to_le32(htt->tx_q_state.paddr);
+       cfg->q_state.num_peers = cpu_to_le16(htt->tx_q_state.num_peers);
+       cfg->q_state.num_tids = cpu_to_le16(htt->tx_q_state.num_tids);
+       cfg->q_state.record_size = HTT_TX_Q_STATE_ENTRY_SIZE;
+       cfg->q_state.record_multiplier = HTT_TX_Q_STATE_ENTRY_MULTIPLIER;
+
+       ath10k_dbg(ar, ATH10K_DBG_HTT, "htt frag desc bank cmd\n");
+
+       ret = ath10k_htc_send(&htt->ar->htc, htt->eid, skb);
+       if (ret) {
+               ath10k_warn(ar, "failed to send frag desc bank cfg request: %d\n",
+                           ret);
+               dev_kfree_skb_any(skb);
+               return ret;
+       }
+
+       return 0;
+}
+
 static void ath10k_htt_fill_rx_desc_offset_32(void *rx_ring)
 {
        struct htt_rx_ring_setup_ring32 *ring =
@@ -1010,6 +1119,7 @@ int ath10k_htt_tx(struct ath10k_htt *htt, enum ath10k_hw_txrx_mode txmode,
        u32 frags_paddr = 0;
        u32 txbuf_paddr;
        struct htt_msdu_ext_desc *ext_desc = NULL;
+       struct htt_msdu_ext_desc *ext_desc_t = NULL;
 
        spin_lock_bh(&htt->tx_lock);
        res = ath10k_htt_tx_alloc_msdu_id(htt, msdu);
@@ -1055,11 +1165,12 @@ int ath10k_htt_tx(struct ath10k_htt *htt, enum ath10k_hw_txrx_mode txmode,
                /* pass through */
        case ATH10K_HW_TXRX_ETHERNET:
                if (ar->hw_params.continuous_frag_desc) {
-                       memset(&htt->frag_desc.vaddr[msdu_id], 0,
+                       ext_desc_t = htt->frag_desc.vaddr_desc_32;
+                       memset(&ext_desc_t[msdu_id], 0,
                               sizeof(struct htt_msdu_ext_desc));
                        frags = (struct htt_data_tx_desc_frag *)
-                               &htt->frag_desc.vaddr[msdu_id].frags;
-                       ext_desc = &htt->frag_desc.vaddr[msdu_id];
+                               &ext_desc_t[msdu_id].frags;
+                       ext_desc = &ext_desc_t[msdu_id];
                        frags[0].tword_addr.paddr_lo =
                                __cpu_to_le32(skb_cb->paddr);
                        frags[0].tword_addr.paddr_hi = 0;
@@ -1189,10 +1300,16 @@ err:
 
 static const struct ath10k_htt_tx_ops htt_tx_ops_32 = {
        .htt_send_rx_ring_cfg = ath10k_htt_send_rx_ring_cfg_32,
+       .htt_send_frag_desc_bank_cfg = ath10k_htt_send_frag_desc_bank_cfg_32,
+       .htt_alloc_frag_desc = ath10k_htt_tx_alloc_cont_frag_desc_32,
+       .htt_free_frag_desc = ath10k_htt_tx_free_cont_frag_desc_32,
 };
 
 static const struct ath10k_htt_tx_ops htt_tx_ops_64 = {
        .htt_send_rx_ring_cfg = ath10k_htt_send_rx_ring_cfg_64,
+       .htt_send_frag_desc_bank_cfg = ath10k_htt_send_frag_desc_bank_cfg_64,
+       .htt_alloc_frag_desc = ath10k_htt_tx_alloc_cont_frag_desc_64,
+       .htt_free_frag_desc = ath10k_htt_tx_free_cont_frag_desc_64,
 };
 
 void ath10k_htt_set_tx_ops(struct ath10k_htt *htt)