diff options
| author | Akash Patel <c_akashp@qca.qualcomm.com> | 2014-10-24 14:49:49 -0700 |
|---|---|---|
| committer | Akash Patel <akashp@codeaurora.org> | 2014-10-24 14:52:02 -0700 |
| commit | 17b7330e9ad24b5aaff3daf0dcae37de144a9dcc (patch) | |
| tree | e102ee587f240b21abb543dbaa42d25ee35bd97c | |
| parent | 8ecc71ef31cb7fb67f2397954b3b033d15bd2594 (diff) | |
| parent | e4d49fde6fb42e1c5d77de31e4c0c53e471cd595 (diff) | |
Release 1.0.0.219 QCACLD WLAN Driver
Merge remote-tracking branch 'origin/caf/caf-wlan/master' into HEAD
* origin/caf/caf-wlan/master:
Cafstaging Release 1.0.0.219
qcacld/txrx:Different scheduler values for usb and sdio
qca-cld: ipa uc: pump down less packet to target with ipa enabled
Change-Id: If02bca7a7133d40321f2ae5b002b4693fcca3093
| -rw-r--r-- | CORE/CLD_TXRX/TXRX/ol_tx_sched.c | 12 | ||||
| -rwxr-xr-x | CORE/HDD/src/wlan_hdd_main.c | 26 | ||||
| -rw-r--r-- | CORE/MAC/inc/qwlan_version.h | 4 |
3 files changed, 38 insertions, 4 deletions
diff --git a/CORE/CLD_TXRX/TXRX/ol_tx_sched.c b/CORE/CLD_TXRX/TXRX/ol_tx_sched.c index c65fc3514cdc..fba17b71e86f 100644 --- a/CORE/CLD_TXRX/TXRX/ol_tx_sched.c +++ b/CORE/CLD_TXRX/TXRX/ol_tx_sched.c @@ -501,6 +501,7 @@ struct ol_tx_sched_wrr_adv_category_info_t { // WRR send // skip credit limit credit disc // wts thresh (frms) reserv wts +#ifdef HIF_SDIO OL_TX_SCHED_WRR_ADV_CAT_CFG_SPEC(VO, 1, 16, 24, 0, 1); OL_TX_SCHED_WRR_ADV_CAT_CFG_SPEC(VI, 3, 16, 16, 1, 4); OL_TX_SCHED_WRR_ADV_CAT_CFG_SPEC(BE, 10, 16, 16, 1, 8); @@ -509,7 +510,16 @@ OL_TX_SCHED_WRR_ADV_CAT_CFG_SPEC(NON_QOS_DATA,12, 6, 4, 1, 8); OL_TX_SCHED_WRR_ADV_CAT_CFG_SPEC(UCAST_MGMT, 1, 1, 4, 0, 1); OL_TX_SCHED_WRR_ADV_CAT_CFG_SPEC(MCAST_DATA, 10, 16, 4, 1, 4); OL_TX_SCHED_WRR_ADV_CAT_CFG_SPEC(MCAST_MGMT, 1, 1, 4, 0, 1); - +#else +OL_TX_SCHED_WRR_ADV_CAT_CFG_SPEC(VO, 1, 16, 24, 0, 1); +OL_TX_SCHED_WRR_ADV_CAT_CFG_SPEC(VI, 3, 16, 16, 1, 4); +OL_TX_SCHED_WRR_ADV_CAT_CFG_SPEC(BE, 10, 12, 12, 1, 8); +OL_TX_SCHED_WRR_ADV_CAT_CFG_SPEC(BK, 12, 6, 6, 1, 8); +OL_TX_SCHED_WRR_ADV_CAT_CFG_SPEC(NON_QOS_DATA,12, 6, 4, 1, 8); +OL_TX_SCHED_WRR_ADV_CAT_CFG_SPEC(UCAST_MGMT, 1, 1, 4, 0, 1); +OL_TX_SCHED_WRR_ADV_CAT_CFG_SPEC(MCAST_DATA, 10, 16, 4, 1, 4); +OL_TX_SCHED_WRR_ADV_CAT_CFG_SPEC(MCAST_MGMT, 1, 1, 4, 0, 1); +#endif #if DEBUG_SCHED_STAT diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c index 3b069b5d12a0..77366234fbb0 100755 --- a/CORE/HDD/src/wlan_hdd_main.c +++ b/CORE/HDD/src/wlan_hdd_main.c @@ -157,6 +157,15 @@ void hdd_ch_avoid_cb(void *hdd_context,void *indi_param); #define MEMORY_DEBUG_STR "" #endif + +#ifdef IPA_UC_OFFLOAD +/* If IPA UC data path is enabled, target should reserve extra tx descriptors + * for IPA WDI data path. + * Then host data path should allow less TX packet pumping in case + * IPA WDI data path enabled */ +#define WLAN_TFC_IPAUC_TX_DESC_RESERVE 100 +#endif /* IPA_UC_OFFLOAD */ + /* the Android framework expects this param even though we don't use it */ #define BUF_LEN 20 static char fwpath_buffer[BUF_LEN]; @@ -9924,8 +9933,23 @@ void hdd_dump_concurrency_info(hdd_context_t *pHddCtx) * set as default for none concurrency case */ if (!preAdapterChannel) { - pAdapter->tx_flow_low_watermark = +#ifdef IPA_UC_OFFLOAD + /* If IPA UC data path is enabled, + * target should reserve extra tx descriptors + * for IPA WDI data path. + * Then host data path should allow less TX packet pumping in case + * IPA WDI data path enabled */ + if ((pHddCtx->cfg_ini->IpaUcOffloadEnabled) && + (WLAN_HDD_SOFTAP == pAdapter->device_mode)) { + pAdapter->tx_flow_low_watermark = + pHddCtx->cfg_ini->TxFlowLowWaterMark + + WLAN_TFC_IPAUC_TX_DESC_RESERVE; + } else +#endif /* IPA_UC_OFFLOAD */ + { + pAdapter->tx_flow_low_watermark = pHddCtx->cfg_ini->TxFlowLowWaterMark; + } pAdapter->tx_flow_high_watermark_offset = pHddCtx->cfg_ini->TxFlowHighWaterMarkOffset; WLANTL_SetAdapterMaxQDepth(pHddCtx->pvosContext, diff --git a/CORE/MAC/inc/qwlan_version.h b/CORE/MAC/inc/qwlan_version.h index f0c867f993af..976592555f83 100644 --- a/CORE/MAC/inc/qwlan_version.h +++ b/CORE/MAC/inc/qwlan_version.h @@ -42,9 +42,9 @@ BRIEF DESCRIPTION: #define QWLAN_VERSION_MINOR 0 #define QWLAN_VERSION_PATCH 0 #define QWLAN_VERSION_EXTRA "" -#define QWLAN_VERSION_BUILD 218 +#define QWLAN_VERSION_BUILD 219 -#define QWLAN_VERSIONSTR "1.0.0.218" +#define QWLAN_VERSIONSTR "1.0.0.219" #define AR6320_REV1_VERSION 0x5000000 |