qcacld-3.0: Change to include FW interface file wdi_ipa.h

For WLAN FW-host interface file automation, need to pull in WDI IPA
interface definition file wdi_ipa.h, into WLAN host driver.
This change is to match host dirver MACRO names with wdi_ipa.h.
Enable back CONFIG_IPA_OFFLOAD flag in Kbuild.

Change-Id: I9cd0c3b942c0a7b5e98f589090ae51cc0acf67c2
CRs-Fixed: 2085741

Kbuild

@@ -355,7 +355,7 @@ CONFIG_ATH_PCIE_ACCESS_DEBUG := 0
 
 #Enable IPA offload
 ifeq ($(CONFIG_IPA), y)
-#CONFIG_IPA_OFFLOAD := 1
+CONFIG_IPA_OFFLOAD := 1
 endif
 ifeq ($(CONFIG_IPA3), y)
 CONFIG_IPA_OFFLOAD := 1

core/dp/htt/htt_h2t.c

@@ -47,6 +47,7 @@
 #include <htc_api.h>            /* HTC_PACKET */
 #include <htc.h>                /* HTC_HDR_ALIGNMENT_PADDING */
 #include <htt.h>                /* HTT host->target msg defs */
+#include <wdi_ipa.h>            /* HTT host->target WDI IPA msg defs */
 #include <ol_txrx_htt_api.h>    /* ol_tx_completion_handler, htt_tx_status */
 #include <ol_htt_tx_api.h>
 
@@ -1382,7 +1383,7 @@ int htt_h2t_ipa_uc_get_share_stats(struct htt_pdev_t *pdev, uint8_t reset_stats)
 	/* reserve room for HTC header */
 	msg = qdf_nbuf_alloc(pdev->osdev,
 		HTT_MSG_BUF_SIZE(HTT_WDI_IPA_OP_REQUEST_SZ)+
-		HTT_MSG_BUF_SIZE(HTT_WDI_IPA_OP_REQ_GET_SHARING_STATS_SZ),
+		HTT_MSG_BUF_SIZE(WLAN_WDI_IPA_GET_SHARING_STATS_REQ_SZ),
 		HTC_HEADER_LEN + HTC_HDR_ALIGNMENT_PADDING, 4, false);
 	if (!msg) {
 		htt_htc_pkt_free(pdev, pkt);
@@ -1390,7 +1391,7 @@ int htt_h2t_ipa_uc_get_share_stats(struct htt_pdev_t *pdev, uint8_t reset_stats)
 	}
 	/* set the length of the message */
 	qdf_nbuf_put_tail(msg, HTT_WDI_IPA_OP_REQUEST_SZ+
-			  HTT_WDI_IPA_OP_REQ_GET_SHARING_STATS_SZ);
+			  WLAN_WDI_IPA_GET_SHARING_STATS_REQ_SZ);
 
 	/* fill in the message contents */
 	msg_word = (uint32_t *) qdf_nbuf_data(msg);
@@ -1405,7 +1406,7 @@ int htt_h2t_ipa_uc_get_share_stats(struct htt_pdev_t *pdev, uint8_t reset_stats)
 
 	msg_word++;
 	*msg_word = 0;
-	HTT_WDI_IPA_OP_REQ_GET_SHARING_STATS_RESET_STATS_SET(*msg_word,
+	WLAN_WDI_IPA_GET_SHARING_STATS_REQ_RESET_STATS_SET(*msg_word,
 							     reset_stats);
 
 	SET_HTC_PACKET_INFO_TX(&pkt->htc_pkt,
@@ -1446,7 +1447,7 @@ int htt_h2t_ipa_uc_set_quota(struct htt_pdev_t *pdev, uint64_t quota_bytes)
 	/* reserve room for HTC header */
 	msg = qdf_nbuf_alloc(pdev->osdev,
 		HTT_MSG_BUF_SIZE(HTT_WDI_IPA_OP_REQUEST_SZ)+
-		HTT_MSG_BUF_SIZE(HTT_WDI_IPA_OP_REQ_SET_QUOTA_SZ),
+		HTT_MSG_BUF_SIZE(WLAN_WDI_IPA_SET_QUOTA_REQ_SZ),
 		HTC_HEADER_LEN + HTC_HDR_ALIGNMENT_PADDING, 4, false);
 	if (!msg) {
 		htt_htc_pkt_free(pdev, pkt);
@@ -1454,7 +1455,7 @@ int htt_h2t_ipa_uc_set_quota(struct htt_pdev_t *pdev, uint64_t quota_bytes)
 	}
 	/* set the length of the message */
 	qdf_nbuf_put_tail(msg, HTT_WDI_IPA_OP_REQUEST_SZ+
-			  HTT_WDI_IPA_OP_REQ_SET_QUOTA_SZ);
+			  WLAN_WDI_IPA_SET_QUOTA_REQ_SZ);
 
 	/* fill in the message contents */
 	msg_word = (uint32_t *) qdf_nbuf_data(msg);
@@ -1469,19 +1470,19 @@ int htt_h2t_ipa_uc_set_quota(struct htt_pdev_t *pdev, uint64_t quota_bytes)
 
 	msg_word++;
 	*msg_word = 0;
-	HTT_WDI_IPA_OP_REQ_SET_QUOTA_SET_QUOTA_SET(*msg_word, quota_bytes > 0);
+	WLAN_WDI_IPA_SET_QUOTA_REQ_SET_QUOTA_SET(*msg_word, quota_bytes > 0);
 
 	msg_word++;
 	*msg_word = 0;
-	HTT_WDI_IPA_OP_REQ_SET_QUOTA_QUOTA_LO_SET(*msg_word,
+	WLAN_WDI_IPA_SET_QUOTA_REQ_QUOTA_LO_SET(*msg_word,
 			(uint32_t)(quota_bytes &
-				   HTT_WDI_IPA_OP_REQ_SET_QUOTA_QUOTA_LO_M));
+				   WLAN_WDI_IPA_SET_QUOTA_REQ_QUOTA_LO_M));
 
 	msg_word++;
 	*msg_word = 0;
-	HTT_WDI_IPA_OP_REQ_SET_QUOTA_QUOTA_HI_SET(*msg_word,
+	WLAN_WDI_IPA_SET_QUOTA_REQ_QUOTA_HI_SET(*msg_word,
 			(uint32_t)(quota_bytes>>32 &
-				   HTT_WDI_IPA_OP_REQ_SET_QUOTA_QUOTA_HI_M));
+				   WLAN_WDI_IPA_SET_QUOTA_REQ_QUOTA_HI_M));
 
 	SET_HTC_PACKET_INFO_TX(&pkt->htc_pkt,
 			       htt_h2t_send_complete_free_netbuf,

core/hdd/src/wlan_hdd_ipa.c

@@ -2877,7 +2877,7 @@ QDF_STATUS hdd_ipa_uc_ol_init(struct hdd_context *hdd_ctx)
 	}
 
 fail_return:
-	HDD_IPA_LOG(QDF_TRACE_LEVEL_FATAL, "exit: stat=%d", stat);
+	HDD_IPA_LOG(QDF_TRACE_LEVEL_FATAL, "exit: stat=%d", status);
 	return status;
 }