QCACLD-NEW: Adding mboxping driver in USB interface

Adding the end point ping feature for USB bus
performance measurement.

Change-Id: Ic9231d57bcba640ba3a56c6c8a34c8df14fa5fd2
CRs-Fixed: 699828

4 files changed, 13 insertions, 8 deletions

diff --git a/CORE/EPPING/src/epping_txrx.c b/CORE/EPPING/src/epping_txrx.c
index bd8c7154687f..678d58e0cfae 100644
--- a/CORE/EPPING/src/epping_txrx.c
+++ b/CORE/EPPING/src/epping_txrx.c
@@ -431,7 +431,7 @@ int epping_connect_service(epping_context_t *pEpping_ctx)
    }
    pEpping_ctx->EppingEndpoint[0] = response.Endpoint;
 
-#if defined(HIF_PCI)
+#if defined(HIF_PCI) || defined(HIF_USB)
    connect.ServiceID = WMI_DATA_BK_SVC;
    status = HTCConnectService(pEpping_ctx->HTCHandle,
                               &connect, &response);
diff --git a/CORE/SERVICES/BMI/ol_fw.c b/CORE/SERVICES/BMI/ol_fw.c
index eef562a3ca33..c3c7538b0c76 100644
--- a/CORE/SERVICES/BMI/ol_fw.c
+++ b/CORE/SERVICES/BMI/ol_fw.c
@@ -461,7 +461,8 @@ static int __ol_transfer_bin_file(struct ol_softc *scn, ATH_BIN_FILE file,
 #endif
 		break;
 	case ATH_SETUP_FILE:
-		if (vos_get_conparam() != VOS_FTM_MODE) {
+		if (vos_get_conparam() != VOS_FTM_MODE &&
+		   !WLAN_IS_EPPING_ENABLED(vos_get_conparam())) {
 #ifdef CONFIG_CNSS
 			printk("%s: no Setup file defined\n", __func__);
 			return -1;
diff --git a/CORE/SERVICES/HIF/USB/if_usb.c b/CORE/SERVICES/HIF/USB/if_usb.c
index 0a8d11ff4b93..5e2c1015de4b 100644
--- a/CORE/SERVICES/HIF/USB/if_usb.c
+++ b/CORE/SERVICES/HIF/USB/if_usb.c
@@ -38,6 +38,7 @@
 #include "vos_api.h"
 #include "wma_api.h"
 #include "wlan_hdd_main.h"
+#include "epping_main.h"
 
 #ifdef WLAN_BTAMP_FEATURE
 #include "wlan_btc_svc.h"
@@ -203,7 +204,8 @@ hif_usb_probe(struct usb_interface *interface, const struct usb_device_id *id)
 	sc->hdd_removed_processing = 0;
 	sc->hdd_removed_wait_cnt = 0;
 #ifndef REMOVE_PKT_LOG
-	if (vos_get_conparam() != VOS_FTM_MODE) {
+	if (vos_get_conparam() != VOS_FTM_MODE &&
+        !WLAN_IS_EPPING_ENABLED(vos_get_conparam())) {
 		/*
 		 * pktlog initialization
 		 */
@@ -278,8 +280,9 @@ static void hif_usb_remove(struct usb_interface *interface)
 	if (usb_sc->hdd_removed == 0) {
 		usb_sc->hdd_removed_processing = 1;
 #ifndef REMOVE_PKT_LOG
-		if (vos_get_conparam() != VOS_FTM_MODE)
-			pktlogmod_exit(scn);
+	if (vos_get_conparam() != VOS_FTM_MODE &&
+		!WLAN_IS_EPPING_ENABLED(vos_get_conparam()))
+		pktlogmod_exit(scn);
 #endif
 		__hdd_wlan_exit();
 		usb_sc->hdd_removed_processing = 0;
@@ -486,7 +489,8 @@ void hif_unregister_driver(void)
 			if (usb_sc->hdd_removed == 0) {
 				usb_sc->hdd_removed_processing = 1;
 #ifndef REMOVE_PKT_LOG
-				if (vos_get_conparam() != VOS_FTM_MODE)
+	            if (vos_get_conparam() != VOS_FTM_MODE &&
+		            !WLAN_IS_EPPING_ENABLED(vos_get_conparam()))
 					pktlogmod_exit(usb_sc->ol_sc);
 #endif
 				__hdd_wlan_exit();
diff --git a/CORE/SERVICES/HTC/htc.c b/CORE/SERVICES/HTC/htc.c
index a1d7024b5dd3..a161bd9abee8 100644
--- a/CORE/SERVICES/HTC/htc.c
+++ b/CORE/SERVICES/HTC/htc.c
@@ -348,7 +348,7 @@ A_STATUS HTCSetupTargetBufferAssignments(HTC_TARGET *target)
          * space through the Ethernet interface.
          * For credit allocation, in SDIO bus case, only BE service is
          * used for tx/rx perf testing so that all credits are given
-         * to BE service. In PCIe bus case, endpoint ping uses both
+         * to BE service. In PCIe and USB bus case, endpoint ping uses both
          * BE and BK services to stress the bus so that the total credits
          * are equally distributed to BE and BK services.
          */
@@ -357,7 +357,7 @@ A_STATUS HTCSetupTargetBufferAssignments(HTC_TARGET *target)
         pEntry->ServiceID = WMI_DATA_BE_SVC;
         pEntry->CreditAllocation = credits;
 #endif
- #if defined(HIF_PCI)
+ #if defined(HIF_PCI) || defined(HIF_USB)
         pEntry->ServiceID = WMI_DATA_BE_SVC;
         pEntry->CreditAllocation = (credits >> 1);