Sfoglia il codice sorgente

qcacmn: Add the utils and cfg changes for Moselle

Add the changes in utils and wlan configuration
layer for supporting the newly added IPCI bus type
for Moselle.

CRs-Fixed: 2597342
Change-Id: I4484d6e774e9f94a322b8dee4ae7ff4460ed2634
Alok Kumar 5 anni fa
parent
commit
74bbfc8aee
3 ha cambiato i file con 13 aggiunte e 10 eliminazioni
  1. 5 5
      utils/epping/inc/epping_internal.h
  2. 5 3
      utils/epping/src/epping_txrx.c
  3. 3 2
      wlan_cfg/cfg_dp.h

+ 5 - 5
utils/epping/inc/epping_internal.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014-2020 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -83,7 +83,7 @@ typedef enum {
 #define MAX_COOKIE_SLOT_SIZE 512
 #define MAX_TX_PKT_DUP_NUM   4
 
-#ifdef HIF_PCI
+#if defined(HIF_PCI) || defined(HIF_IPCI)
 #define WLAN_EPPING_DELAY_TIMEOUT_US     10
 #define EPPING_MAX_CE_NUMS               8
 #define EPPING_MAX_WATER_MARK            8
@@ -114,7 +114,7 @@ typedef struct epping_context {
 	unsigned int kperf_num_tx_acks[EPPING_MAX_NUM_EPIDS];
 	unsigned int total_rx_recv;
 	unsigned int total_tx_acks;
-#ifdef HIF_PCI
+#if defined(HIF_PCI) || defined(HIF_IPCI)
 	epping_poll_t epping_poll[EPPING_MAX_NUM_EPIDS];
 #endif
 	struct epping_cookie *cookie_list;
@@ -185,12 +185,12 @@ epping_adapter_t *epping_add_adapter(epping_context_t *pEpping_ctx,
 				     bool rtnl_held);
 void epping_destroy_adapter(epping_adapter_t *adapter);
 int epping_connect_service(epping_context_t *pEpping_ctx);
-#ifdef HIF_PCI
+#if defined(HIF_PCI) || defined(HIF_IPCI)
 void epping_register_tx_copier(HTC_ENDPOINT_ID eid,
 			       epping_context_t *pEpping_ctx);
 void epping_unregister_tx_copier(HTC_ENDPOINT_ID eid,
 				 epping_context_t *pEpping_ctx);
 void epping_tx_copier_schedule(epping_context_t *pEpping_ctx,
 			       HTC_ENDPOINT_ID eid, qdf_nbuf_t skb);
-#endif /* HIF_PCI */
+#endif /* HIF_PCI || HIF_IPCI */
 #endif /* end #ifndef EPPING_INTERNAL_H */

+ 5 - 3
utils/epping/src/epping_txrx.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014-2020 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -419,7 +419,8 @@ int epping_connect_service(epping_context_t *pEpping_ctx)
 	connect.EpCallbacks.EpRecvRefill = epping_refill;
 	connect.EpCallbacks.EpSendFull =
 		epping_tx_queue_full /* ar6000_tx_queue_full */;
-#elif defined(HIF_USB) || defined(HIF_PCI) || defined(HIF_SNOC)
+#elif defined(HIF_USB) || defined(HIF_PCI) || defined(HIF_SNOC) || \
+      defined(HIF_IPCI)
 	connect.EpCallbacks.EpRecvRefill = NULL /* provided by HIF */;
 	connect.EpCallbacks.EpSendFull = NULL /* provided by HIF */;
 	/* disable flow control for hw flow control */
@@ -440,7 +441,8 @@ int epping_connect_service(epping_context_t *pEpping_ctx)
 	}
 	pEpping_ctx->EppingEndpoint[0] = response.Endpoint;
 
-#if defined(HIF_PCI) || defined(HIF_USB) || defined(HIF_SNOC)
+#if defined(HIF_PCI) || defined(HIF_USB) || defined(HIF_SNOC) || \
+    defined(HIF_IPCI)
 	connect.service_id = WMI_DATA_BK_SVC;
 	status = htc_connect_service(pEpping_ctx->HTCHandle, &connect, &response);
 	if (QDF_IS_STATUS_ERROR(status)) {

+ 3 - 2
wlan_cfg/cfg_dp.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2018-2020 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -211,7 +211,8 @@
 
 #define WLAN_CFG_RX_RELEASE_RING_SIZE 1024
 #define WLAN_CFG_RX_RELEASE_RING_SIZE_MIN 8
-#if defined(QCA_WIFI_QCA6390) || defined(QCA_WIFI_QCA6490)
+#if defined(QCA_WIFI_QCA6390) || defined(QCA_WIFI_QCA6490) || \
+    defined(QCA_WIFI_QCA6750)
 #define WLAN_CFG_RX_RELEASE_RING_SIZE_MAX 1024
 #else
 #define WLAN_CFG_RX_RELEASE_RING_SIZE_MAX 8192