From 27b1a60e64a08c7b25576392b1653b1180a239e9 Mon Sep 17 00:00:00 2001
From: "Poddar, Siddarth" <siddpodd@codeaurora.org>
Date: Fri, 29 Apr 2016 11:01:33 +0530
Subject: [PATCH] qcacld-3.0: Add datapath layer changes for sdio bus (Part 4 -
 HIF SDIO)

Remove bus specific calls from data path layer.
Add sdio specific target address
Add sdio bundling rates in datapath layer.
Fix rx data callback for UMP system.

CRs-Fixed: 969334
Change-Id: I0cd45479ca89b97455b4a9c71ce326646f38a5f3
---
 core/dp/txrx/ol_txrx.c | 7 +++++--
 target/inc/targaddrs.h | 9 ++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c
index 63bdd47c84..85fa99eea3 100644
--- a/core/dp/txrx/ol_txrx.c
+++ b/core/dp/txrx/ol_txrx.c
@@ -33,8 +33,10 @@
 #include <qdf_lock.h>           /* qdf_spinlock */
 #include <qdf_atomic.h>         /* qdf_atomic_read */
 
+#if defined(HIF_PCI) || defined(HIF_SNOC) || defined(HIF_AHB)
 /* Required for WLAN_FEATURE_FASTPATH */
 #include <ce_api.h>
+#endif
 /* header files for utilities */
 #include <cds_queue.h>          /* TAILQ */
 
@@ -70,6 +72,7 @@
 #include <cdp_txrx_flow_ctrl_legacy.h>
 #include <cdp_txrx_ipa.h>
 #include "wma.h"
+#include "hif.h"
 #include <cdp_txrx_peer_ops.h>
 #ifndef REMOVE_PKT_LOG
 #include "pktlog_ac.h"
@@ -556,8 +559,8 @@ ol_txrx_pdev_post_attach(ol_txrx_pdev_handle pdev)
 	if (ret)
 		goto ol_attach_fail;
 
-	/* Update CE's pkt download length */
-	ce_pkt_dl_len_set((void *)osc, htt_pkt_dl_len_get(pdev->htt_pdev));
+	/* Update bus pkt download length */
+	hif_bus_pkt_dl_len_set((void *)osc, htt_pkt_dl_len_get(pdev->htt_pdev));
 
 	/* Attach micro controller data path offload resource */
 	if (ol_cfg_ipa_uc_offload_enabled(pdev->ctrl_pdev))
diff --git a/target/inc/targaddrs.h b/target/inc/targaddrs.h
index 7cf64d385c..30a8931a4c 100644
--- a/target/inc/targaddrs.h
+++ b/target/inc/targaddrs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -414,6 +414,13 @@ PREPACK64 struct host_interest_s {
 #define HI_ACS_FLAGS_USE_WWAN       (1 << 1)    /* Use physical WWAN device */
 #define HI_ACS_FLAGS_TEST_VAP       (1 << 2)    /* Use test VAP */
 
+#define HI_ACS_FLAGS_SDIO_SWAP_MAILBOX_SET          (1 << 0)
+#define HI_ACS_FLAGS_SDIO_REDUCE_TX_COMPL_SET       (1 << 1)
+#define HI_ACS_FLAGS_ALT_DATA_CREDIT_SIZE           (1 << 2)
+
+#define HI_ACS_FLAGS_SDIO_SWAP_MAILBOX_FW_ACK       (1 << 16)
+#define HI_ACS_FLAGS_SDIO_REDUCE_TX_COMPL_FW_ACK    (1 << 17)
+
 /* CONSOLE FLAGS
  *
  * Bit Range  Meaning