Merge "qcacld-3.0: ipa data path bug fix" into wlan-cld3.driver.lnx.1.1-dev

3 files changed, 24 insertions, 40 deletions

diff --git a/core/dp/htt/htt.c b/core/dp/htt/htt.c
index 0bb7b6122b5c..56f4df39aeb8 100644
--- a/core/dp/htt/htt.c
+++ b/core/dp/htt/htt.c
@@ -703,8 +703,7 @@ int htt_ipa_uc_attach(struct htt_pdev_t *pdev)
 
 	/* RX resource attach */
 	error = htt_rx_ipa_uc_attach(
-		pdev,
-		ol_cfg_ipa_uc_rx_ind_ring_size(pdev->ctrl_pdev));
+		pdev, qdf_get_pwr2(pdev->rx_ring.fill_level));
 	if (error) {
 		qdf_print("HTT IPA UC RX attach fail code %d\n", error);
 		htt_tx_ipa_uc_detach(pdev);
diff --git a/core/dp/htt/htt_h2t.c b/core/dp/htt/htt_h2t.c
index f52c06403fdc..b9bff6cf8cff 100644
--- a/core/dp/htt/htt_h2t.c
+++ b/core/dp/htt/htt_h2t.c
@@ -61,6 +61,17 @@
 	((type *)((char *)(ptr) - (char *)(&((type *)0)->member)))
 #endif
 
+#ifdef ATH_11AC_TXCOMPACT
+#define HTT_SEND_HTC_PKT(pdev, pkt)                              \
+do {                                                             \
+	if (htc_send_pkt(pdev->htc_pdev, &pkt->htc_pkt) == A_OK) \
+		htt_htc_misc_pkt_list_add(pdev, pkt);            \
+} while (0)
+#else
+#define HTT_SEND_HTC_PKT(pdev, ppkt) htc_send_pkt(pdev->htc_pdev, &pkt->htc_pkt);
+#endif
+
+
 static void
 htt_h2t_send_complete_free_netbuf(void *pdev, A_STATUS status,
 				  qdf_nbuf_t netbuf, uint16_t msdu_id)
@@ -272,13 +283,7 @@ A_STATUS htt_h2t_ver_req_msg(struct htt_pdev_t *pdev)
 			       1); /* tag - not relevant here */
 
 	SET_HTC_PACKET_NET_BUF_CONTEXT(&pkt->htc_pkt, msg);
-
-#ifdef ATH_11AC_TXCOMPACT
-	if (htc_send_pkt(pdev->htc_pdev, &pkt->htc_pkt) == A_OK)
-		htt_htc_misc_pkt_list_add(pdev, pkt);
-#else
-	htc_send_pkt(pdev->htc_pdev, &pkt->htc_pkt);
-#endif
+	HTT_SEND_HTC_PKT(pdev, pkt);
 
 	if ((pdev->cfg.is_high_latency) &&
 	    (!pdev->cfg.default_tx_comp_req))
@@ -473,13 +478,7 @@ QDF_STATUS htt_h2t_rx_ring_cfg_msg_ll(struct htt_pdev_t *pdev)
 			       HTC_TX_PACKET_TAG_RUNTIME_PUT);
 
 	SET_HTC_PACKET_NET_BUF_CONTEXT(&pkt->htc_pkt, msg);
-
-#ifdef ATH_11AC_TXCOMPACT
-	if (htc_send_pkt(pdev->htc_pdev, &pkt->htc_pkt) == A_OK)
-		htt_htc_misc_pkt_list_add(pdev, pkt);
-#else
-	htc_send_pkt(pdev->htc_pdev, &pkt->htc_pkt);
-#endif
+	HTT_SEND_HTC_PKT(pdev, pkt);
 	return A_OK;
 }
 
@@ -765,13 +764,7 @@ A_STATUS htt_h2t_sync_msg(struct htt_pdev_t *pdev, uint8_t sync_cnt)
 			       HTC_TX_PACKET_TAG_RUNTIME_PUT);
 
 	SET_HTC_PACKET_NET_BUF_CONTEXT(&pkt->htc_pkt, msg);
-
-#ifdef ATH_11AC_TXCOMPACT
-	if (htc_send_pkt(pdev->htc_pdev, &pkt->htc_pkt) == A_OK)
-		htt_htc_misc_pkt_list_add(pdev, pkt);
-#else
-	htc_send_pkt(pdev->htc_pdev, &pkt->htc_pkt);
-#endif
+	HTT_SEND_HTC_PKT(pdev, pkt);
 
 	if ((pdev->cfg.is_high_latency) &&
 	    (!pdev->cfg.default_tx_comp_req))
@@ -938,7 +931,7 @@ int htt_h2t_ipa_uc_rsc_cfg_msg(struct htt_pdev_t *pdev)
 	msg_word++;
 	*msg_word = 0;
 	HTT_WDI_IPA_CFG_RX_IND_RING_SIZE_SET(*msg_word,
-		(unsigned int)ol_cfg_ipa_uc_rx_ind_ring_size(pdev->ctrl_pdev));
+		(unsigned int)qdf_get_pwr2(pdev->rx_ring.fill_level));
 
 	msg_word++;
 	*msg_word = 0;
@@ -970,7 +963,7 @@ int htt_h2t_ipa_uc_rsc_cfg_msg(struct htt_pdev_t *pdev)
 	msg_word++;
 	*msg_word = 0;
 	HTT_WDI_IPA_CFG_RX_RING2_SIZE_SET(*msg_word,
-		(unsigned int)ol_cfg_ipa_uc_rx_ind_ring_size(pdev->ctrl_pdev));
+		(unsigned int)qdf_get_pwr2(pdev->rx_ring.fill_level));
 
 	msg_word++;
 	*msg_word = 0;
@@ -998,9 +991,7 @@ int htt_h2t_ipa_uc_rsc_cfg_msg(struct htt_pdev_t *pdev)
 			       HTC_TX_PACKET_TAG_RUNTIME_PUT);
 
 	SET_HTC_PACKET_NET_BUF_CONTEXT(&pkt->htc_pkt, msg);
-
-	htc_send_pkt(pdev->htc_pdev, &pkt->htc_pkt);
-
+	HTT_SEND_HTC_PKT(pdev, pkt);
 	return A_OK;
 }
 #else
@@ -1072,7 +1063,7 @@ int htt_h2t_ipa_uc_rsc_cfg_msg(struct htt_pdev_t *pdev)
 	msg_word++;
 	*msg_word = 0;
 	HTT_WDI_IPA_CFG_RX_IND_RING_SIZE_SET(*msg_word,
-		(unsigned int)ol_cfg_ipa_uc_rx_ind_ring_size(pdev->ctrl_pdev));
+		(unsigned int)qdf_get_pwr2(pdev->rx_ring.fill_level));
 
 	msg_word++;
 	*msg_word = 0;
@@ -1092,9 +1083,7 @@ int htt_h2t_ipa_uc_rsc_cfg_msg(struct htt_pdev_t *pdev)
 			       HTC_TX_PACKET_TAG_RUNTIME_PUT);
 
 	SET_HTC_PACKET_NET_BUF_CONTEXT(&pkt->htc_pkt, msg);
-
-	htc_send_pkt(pdev->htc_pdev, &pkt->htc_pkt);
-
+	HTT_SEND_HTC_PKT(pdev, pkt);
 	return A_OK;
 }
 #endif
@@ -1165,9 +1154,7 @@ int htt_h2t_ipa_uc_set_active(struct htt_pdev_t *pdev,
 			       1); /* tag - not relevant here */
 
 	SET_HTC_PACKET_NET_BUF_CONTEXT(&pkt->htc_pkt, msg);
-
-	htc_send_pkt(pdev->htc_pdev, &pkt->htc_pkt);
-
+	HTT_SEND_HTC_PKT(pdev, pkt);
 	return A_OK;
 }
 
@@ -1225,9 +1212,7 @@ int htt_h2t_ipa_uc_get_stats(struct htt_pdev_t *pdev)
 			       1); /* tag - not relevant here */
 
 	SET_HTC_PACKET_NET_BUF_CONTEXT(&pkt->htc_pkt, msg);
-
-	htc_send_pkt(pdev->htc_pdev, &pkt->htc_pkt);
-
+	HTT_SEND_HTC_PKT(pdev, pkt);
 	return A_OK;
 }
 #endif /* IPA_OFFLOAD */
diff --git a/core/dp/htt/htt_rx.c b/core/dp/htt/htt_rx.c
index e3f334088014..dceafca40e33 100644
--- a/core/dp/htt/htt_rx.c
+++ b/core/dp/htt/htt_rx.c
@@ -3420,10 +3420,10 @@ void htt_rx_ipa_uc_free_wdi2_rsc(struct htt_pdev_t *pdev)
 			pdev->osdev, pdev->osdev->dev,
 			4,
 			pdev->ipa_uc_rx_rsc.
-			rx_ipa_prc_done_idx.vaddr,
+			rx2_ipa_prc_done_idx.vaddr,
 			pdev->ipa_uc_rx_rsc.rx2_ipa_prc_done_idx.paddr,
 			qdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc.
-						 rx_ipa_prc_done_idx),
+						 rx2_ipa_prc_done_idx),
 						memctx));
 	}
 }