Merge "ath10k: Add htt tx/rx layer changes for WCN3990 target."

3 files changed, 141 insertions, 17 deletions

diff --git a/drivers/net/wireless/ath/ath10k/htt.h b/drivers/net/wireless/ath/ath10k/htt.h
index 0d2ed09f202b..b2678984f2de 100644
--- a/drivers/net/wireless/ath/ath10k/htt.h
+++ b/drivers/net/wireless/ath/ath10k/htt.h
@@ -99,7 +99,11 @@ struct htt_data_tx_desc_frag {
 } __packed;
 
 struct htt_msdu_ext_desc {
+#ifdef CONFIG_ATH10K_SNOC
+	__le32 tso_flag[5];
+#else
 	__le32 tso_flag[3];
+#endif
 	__le16 ip_identification;
 	u8 flags;
 	u8 reserved;
@@ -167,7 +171,12 @@ struct htt_data_tx_desc {
 	__le16 flags1; /* %HTT_DATA_TX_DESC_FLAGS1_ */
 	__le16 len;
 	__le16 id;
+#ifdef CONFIG_ATH10K_SNOC
+	__le32 frags_paddr_lo;
+	__le32 frags_paddr_hi;
+#else
 	__le32 frags_paddr;
+#endif
 	union {
 		__le32 peerid;
 		struct {
@@ -201,8 +210,15 @@ enum htt_rx_ring_flags {
 #define HTT_RX_RING_SIZE_MAX 2048
 
 struct htt_rx_ring_setup_ring {
+#ifdef CONFIG_ATH10K_SNOC
+	__le32 fw_idx_shadow_reg_paddr_low;
+	__le32 fw_idx_shadow_reg_paddr_high;
+	__le32 rx_ring_base_paddr_low;
+	__le32 rx_ring_base_paddr_high;
+#else
 	__le32 fw_idx_shadow_reg_paddr;
 	__le32 rx_ring_base_paddr;
+#endif
 	__le16 rx_ring_len; /* in 4-byte words */
 	__le16 rx_ring_bufsize; /* rx skb size - in bytes */
 	__le16 flags; /* %HTT_RX_RING_FLAGS_ */
@@ -524,6 +540,8 @@ struct htt_rx_indication_hdr {
 #define HTT_RX_INDICATION_INFO2_SERVICE_MASK    0xFF000000
 #define HTT_RX_INDICATION_INFO2_SERVICE_LSB     24
 
+#define HTT_WCN3990_PADDR_MASK 0x1F
+
 enum htt_rx_legacy_rate {
 	HTT_RX_OFDM_48 = 0,
 	HTT_RX_OFDM_24 = 1,
@@ -846,7 +864,12 @@ struct htt_rx_offload_ind {
 } __packed;
 
 struct htt_rx_in_ord_msdu_desc {
+#ifdef CONFIG_ATH10K_SNOC
+	__le32 msdu_paddr_lo;
+	__le32 msdu_paddr_hi;
+#else
 	__le32 msdu_paddr;
+#endif
 	__le16 msdu_len;
 	u8 fw_desc;
 	u8 reserved;
@@ -1346,11 +1369,20 @@ struct htt_q_state_conf {
 	u8 pad[2];
 } __packed;
 
+struct bank_base_addr {
+	__le32 low;
+	__le32 high;
+};
+
 struct htt_frag_desc_bank_cfg {
 	u8 info; /* HTT_FRAG_DESC_BANK_CFG_INFO_ */
 	u8 num_banks;
 	u8 desc_size;
+#ifdef CONFIG_ATH10K_SNOC
+	struct bank_base_addr bank_base_addrs[HTT_FRAG_DESC_BANK_MAX];
+#else
 	__le32 bank_base_addrs[HTT_FRAG_DESC_BANK_MAX];
+#endif
 	struct htt_frag_desc_bank_id bank_id[HTT_FRAG_DESC_BANK_MAX];
 	struct htt_q_state_conf q_state;
 } __packed;
@@ -1599,7 +1631,11 @@ struct ath10k_htt {
 		 * rx buffers the host SW provides for the MAC HW to
 		 * fill.
 		 */
+#ifdef CONFIG_ATH10K_SNOC
+		__le64 *paddrs_ring;
+#else
 		__le32 *paddrs_ring;
+#endif
 
 		/*
 		 * Base address of ring, as a "physical" device address
diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c
index ed6ac39cd49d..78df1d1ad67c 100644
--- a/drivers/net/wireless/ath/ath10k/htt_rx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
@@ -425,8 +425,11 @@ static int ath10k_htt_rx_pop_paddr_list(struct ath10k_htt *htt,
 	is_offload = !!(ev->info & HTT_RX_IN_ORD_IND_INFO_OFFLOAD_MASK);
 
 	while (msdu_count--) {
+#ifdef CONFIG_ATH10K_SNOC
+		paddr = __le32_to_cpu(msdu_desc->msdu_paddr_lo);
+#else
 		paddr = __le32_to_cpu(msdu_desc->msdu_paddr);
-
+#endif
 		msdu = ath10k_htt_rx_pop_paddr(htt, paddr);
 		if (!msdu) {
 			__skb_queue_purge(list);
diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c b/drivers/net/wireless/ath/ath10k/htt_tx.c
index ae5b33fe5ba8..62e7f5e4b6fc 100644
--- a/drivers/net/wireless/ath/ath10k/htt_tx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_tx.c
@@ -487,6 +487,95 @@ int ath10k_htt_h2t_stats_req(struct ath10k_htt *htt, u8 mask, u64 cookie)
 	return 0;
 }
 
+#ifdef CONFIG_ATH10K_SNOC
+static inline
+void ath10k_htt_fill_rx_ring_cfg(struct ath10k_htt *htt,
+				 struct htt_rx_ring_setup_ring *ring)
+{
+	ring->fw_idx_shadow_reg_paddr_low =
+		__cpu_to_le32(htt->rx_ring.alloc_idx.paddr);
+	ring->fw_idx_shadow_reg_paddr_high = 0;
+	ring->rx_ring_base_paddr_low = __cpu_to_le32(htt->rx_ring.base_paddr);
+	ring->rx_ring_base_paddr_high = upper_32_bits(htt->rx_ring.base_paddr) &
+						      HTT_WCN3990_PADDR_MASK;
+}
+
+static inline void ath10k_htt_fill_frags(struct htt_data_tx_desc_frag *frags,
+					 struct sk_buff *msdu,
+					 struct ath10k_skb_cb *skb_cb)
+{
+	frags[0].tword_addr.paddr_lo = __cpu_to_le32(skb_cb->paddr);
+	frags[0].tword_addr.paddr_hi = upper_32_bits(skb_cb->paddr) &
+					HTT_WCN3990_PADDR_MASK;
+	frags[0].tword_addr.len_16 = __cpu_to_le16(msdu->len);
+	frags[1].tword_addr.paddr_lo = 0;
+	frags[1].tword_addr.paddr_hi = 0;
+	frags[1].tword_addr.len_16 = 0;
+}
+
+static inline void ath10k_htt_fill_frag_desc(struct ath10k_htt_txbuf *txbuf,
+					     dma_addr_t frags_paddr)
+{
+	txbuf->cmd_tx.frags_paddr_lo = __cpu_to_le32(frags_paddr);
+	txbuf->cmd_tx.frags_paddr_hi = upper_32_bits(frags_paddr) &
+					HTT_WCN3990_PADDR_MASK;
+}
+
+static inline
+void ath10k_htt_set_bank_base_addr(struct htt_frag_desc_bank_cfg *cfg,
+				   dma_addr_t paddr)
+{
+	cfg->bank_base_addrs[0].low = __cpu_to_le32(paddr);
+	cfg->bank_base_addrs[0].high = upper_32_bits(paddr) &
+						HTT_WCN3990_PADDR_MASK;
+}
+
+static inline
+u32 ath10k_htt_get_paddr_hi(dma_addr_t paddr)
+{
+	return(upper_32_bits(paddr) &
+			     HTT_WCN3990_PADDR_MASK);
+}
+#else
+static inline void ath10k_htt_fill_frags(struct htt_data_tx_desc_frag *frags,
+					 struct sk_buff *msdu,
+					 struct ath10k_skb_cb *skb_cb)
+{
+	frags[0].dword_addr.paddr = __cpu_to_le32(skb_cb->paddr);
+	frags[0].dword_addr.len = __cpu_to_le32(msdu->len);
+	frags[1].dword_addr.paddr = 0;
+	frags[1].dword_addr.len = 0;
+}
+
+static inline void ath10k_htt_fill_frag_desc(struct ath10k_htt_txbuf *txbuf,
+					     dma_addr_t frags_paddr)
+{
+	txbuf->cmd_tx.frags_paddr = __cpu_to_le32(frags_paddr);
+}
+
+static inline
+void ath10k_htt_set_bank_base_addr(struct htt_frag_desc_bank_cfg *cfg,
+				   dma_addr_t paddr)
+{
+	cfg->bank_base_addrs[0] = __cpu_to_le32(paddr);
+}
+
+static inline
+void ath10k_htt_fill_rx_ring_cfg(struct ath10k_htt *htt,
+				 struct htt_rx_ring_setup_ring *ring)
+{
+	ring->fw_idx_shadow_reg_paddr =
+			__cpu_to_le32(htt->rx_ring.alloc_idx.paddr);
+	ring->rx_ring_base_paddr = __cpu_to_le32(htt->rx_ring.base_paddr);
+}
+
+static inline
+u32 ath10k_htt_get_paddr_hi(dma_addr_t paddr)
+{
+	return 0;
+}
+#endif
+
 int ath10k_htt_send_frag_desc_bank_cfg(struct ath10k_htt *htt)
 {
 	struct ath10k *ar = htt->ar;
@@ -525,7 +614,7 @@ int ath10k_htt_send_frag_desc_bank_cfg(struct ath10k_htt *htt)
 	cfg->info = info;
 	cfg->num_banks = 1;
 	cfg->desc_size = sizeof(struct htt_msdu_ext_desc);
-	cfg->bank_base_addrs[0] = __cpu_to_le32(htt->frag_desc.paddr);
+	ath10k_htt_set_bank_base_addr(cfg, 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);
@@ -603,9 +692,7 @@ int ath10k_htt_send_rx_ring_cfg_ll(struct ath10k_htt *htt)
 
 	fw_idx = __le32_to_cpu(*htt->rx_ring.alloc_idx.vaddr);
 
-	ring->fw_idx_shadow_reg_paddr =
-		__cpu_to_le32(htt->rx_ring.alloc_idx.paddr);
-	ring->rx_ring_base_paddr = __cpu_to_le32(htt->rx_ring.base_paddr);
+	ath10k_htt_fill_rx_ring_cfg(htt, ring);
 	ring->rx_ring_len = __cpu_to_le16(htt->rx_ring.size);
 	ring->rx_ring_bufsize = __cpu_to_le16(HTT_RX_BUF_SIZE);
 	ring->flags = __cpu_to_le16(flags);
@@ -856,7 +943,7 @@ int ath10k_htt_tx(struct ath10k_htt *htt, enum ath10k_hw_txrx_mode txmode,
 	u8 flags0 = 0;
 	u16 msdu_id, flags1 = 0;
 	u16 freq = 0;
-	u32 frags_paddr = 0;
+	dma_addr_t frags_paddr = 0;
 	u32 txbuf_paddr;
 	struct htt_msdu_ext_desc *ext_desc = NULL;
 
@@ -911,19 +998,15 @@ int ath10k_htt_tx(struct ath10k_htt *htt, enum ath10k_hw_txrx_mode txmode,
 			ext_desc = &htt->frag_desc.vaddr[msdu_id];
 			frags[0].tword_addr.paddr_lo =
 				__cpu_to_le32(skb_cb->paddr);
-			frags[0].tword_addr.paddr_hi = 0;
+			frags[0].tword_addr.paddr_hi =
+				ath10k_htt_get_paddr_hi(skb_cb->paddr);
 			frags[0].tword_addr.len_16 = __cpu_to_le16(msdu->len);
 
 			frags_paddr =  htt->frag_desc.paddr +
 				(sizeof(struct htt_msdu_ext_desc) * msdu_id);
 		} else {
 			frags = txbuf->frags;
-			frags[0].dword_addr.paddr =
-				__cpu_to_le32(skb_cb->paddr);
-			frags[0].dword_addr.len = __cpu_to_le32(msdu->len);
-			frags[1].dword_addr.paddr = 0;
-			frags[1].dword_addr.len = 0;
-
+			ath10k_htt_fill_frags(frags, msdu, skb_cb);
 			frags_paddr = txbuf_paddr;
 		}
 		flags0 |= SM(txmode, HTT_DATA_TX_DESC_FLAGS0_PKT_TYPE);
@@ -983,7 +1066,9 @@ int ath10k_htt_tx(struct ath10k_htt *htt, enum ath10k_hw_txrx_mode txmode,
 	txbuf->cmd_tx.flags1 = __cpu_to_le16(flags1);
 	txbuf->cmd_tx.len = __cpu_to_le16(msdu->len);
 	txbuf->cmd_tx.id = __cpu_to_le16(msdu_id);
-	txbuf->cmd_tx.frags_paddr = __cpu_to_le32(frags_paddr);
+
+	/* fill fragment descriptor */
+	ath10k_htt_fill_frag_desc(txbuf, frags_paddr);
 	if (ath10k_mac_tx_frm_has_freq(ar)) {
 		txbuf->cmd_tx.offchan_tx.peerid =
 				__cpu_to_le16(HTT_INVALID_PEERID);
@@ -996,9 +1081,9 @@ int ath10k_htt_tx(struct ath10k_htt *htt, enum ath10k_hw_txrx_mode txmode,
 
 	trace_ath10k_htt_tx(ar, msdu_id, msdu->len, vdev_id, tid);
 	ath10k_dbg(ar, ATH10K_DBG_HTT,
-		   "htt tx flags0 %hhu flags1 %hu len %d id %hu frags_paddr %08x, msdu_paddr %08x vdev %hhu tid %hhu freq %hu\n",
-		   flags0, flags1, msdu->len, msdu_id, frags_paddr,
-		   (u32)skb_cb->paddr, vdev_id, tid, freq);
+		   "htt tx flags0 %hhu flags1 %hu len %d id %hu frags_paddr %pad, msdu_paddr %pad vdev %hhu tid %hhu freq %hu\n",
+		   flags0, flags1, msdu->len, msdu_id, &frags_paddr,
+		   &skb_cb->paddr, vdev_id, tid, freq);
 	ath10k_dbg_dump(ar, ATH10K_DBG_HTT_DUMP, NULL, "htt tx msdu: ",
 			msdu->data, msdu->len);
 	trace_ath10k_tx_hdr(ar, msdu->data, msdu->len);