From da43bc50a8d51895c851d7f6cab7618efa4f43ba Mon Sep 17 00:00:00 2001 From: Yue Ma Date: Fri, 22 Aug 2014 16:05:59 -0700 Subject: qca_cld: Fix WMA compilation errors for SDIO Fix WMA compilation errors for SDIO due to resent changes. Change-Id: I56ee127824887d578e2b4e762770c76a2bb72440 CRs-fixed: 712603 --- CORE/SERVICES/WMA/wma.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CORE/SERVICES/WMA/wma.c b/CORE/SERVICES/WMA/wma.c index 952e16f8ce94..ca07cf718789 100644 --- a/CORE/SERVICES/WMA/wma.c +++ b/CORE/SERVICES/WMA/wma.c @@ -16650,8 +16650,10 @@ int wma_enable_wow_in_fw(WMA_HANDLE handle) struct ol_softc *scn; int host_credits; int wmi_pending_cmds; +#ifdef CONFIG_CNSS tpAniSirGlobal pMac = (tpAniSirGlobal)vos_get_context(VOS_MODULE_ID_PE, wma->vos_context); +#endif #ifdef FEATURE_WLAN_D0WOW if (wma->ap_client_cnt > 0) { @@ -16713,6 +16715,8 @@ int wma_enable_wow_in_fw(WMA_HANDLE handle) if (pMac->sme.enableSelfRecovery) { vos_set_logp_in_progress(VOS_MODULE_ID_HIF, TRUE); cnss_schedule_recovery_work(); + } else { + VOS_BUG(0); } #else VOS_BUG(0); @@ -17649,8 +17653,10 @@ static VOS_STATUS wma_send_host_wakeup_ind_to_fw(tp_wma_handle wma) VOS_STATUS vos_status = VOS_STATUS_SUCCESS; int32_t len; int ret; +#ifdef CONFIG_CNSS tpAniSirGlobal pMac = (tpAniSirGlobal)vos_get_context(VOS_MODULE_ID_PE, wma->vos_context); +#endif len = sizeof(wmi_wow_hostwakeup_from_sleep_cmd_fixed_param); @@ -17692,6 +17698,8 @@ static VOS_STATUS wma_send_host_wakeup_ind_to_fw(tp_wma_handle wma) vos_set_logp_in_progress(VOS_MODULE_ID_HIF, TRUE); cnss_schedule_recovery_work(); + } else { + VOS_BUG(0); } #else VOS_BUG(0); -- cgit v1.2.3 From 1871fbdef53131bd62b34dd76636b0046af28ad7 Mon Sep 17 00:00:00 2001 From: Krishna Kumaar Natarajan Date: Tue, 19 Aug 2014 14:10:24 -0700 Subject: qcacld: adding ini parameter for IBSS power save mode This commit will add ini config parameter for Inactivity time to end TX Service Period while in IBSS power save mode. Default value is set to 10ms. Change-Id: Icc00067b9b7a79e2dadfb9febe5b9175bb294095 CRs-Fixed: 711739 --- firmware_bin/WCNSS_qcom_cfg.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/firmware_bin/WCNSS_qcom_cfg.ini b/firmware_bin/WCNSS_qcom_cfg.ini index 11d08636418a..c7c297aeb913 100755 --- a/firmware_bin/WCNSS_qcom_cfg.ini +++ b/firmware_bin/WCNSS_qcom_cfg.ini @@ -597,6 +597,9 @@ gEnableMuBformee=1 # 1 - enable gSapSccChanAvoidance=0 +# Inactivity time (in ms) to end TX Service Period while in IBSS power save mode +gIbssTxSpEndInactivityTime=10 + END # Note: Configuration parser would not read anything past the END marker -- cgit v1.2.3 From e9c16275a9c4068cb2566b92b432d78d6a8f58e4 Mon Sep 17 00:00:00 2001 From: Randy Chiu Date: Mon, 18 Aug 2014 17:37:35 +0800 Subject: qcacld: Tx bit rate information is incorrect with "iw wlan0 link" It mainly fixes carry multiple flags at the same time (htCapable, vhtCapable and RATE_INFO_FLAGS_MCS, RATE_INFO_FLAGS_VHT_MCS) and causes the tx bit rate information incorrect with "iw wlan0 link" Change-Id: I971461c686a61a100fddb54a65652c7494eedcc7 CRs-Fixed: 710850 --- CORE/HDD/src/wlan_hdd_cfg80211.c | 3 ++- CORE/SERVICES/WMA/wma.c | 14 ++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c index 9df38aff3f17..9ebb55e93bc9 100644 --- a/CORE/HDD/src/wlan_hdd_cfg80211.c +++ b/CORE/HDD/src/wlan_hdd_cfg80211.c @@ -10890,7 +10890,8 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy, } if (rate_flags & eHAL_TX_RATE_SGI) { - sinfo->txrate.flags |= RATE_INFO_FLAGS_MCS; + if (!(sinfo->txrate.flags & RATE_INFO_FLAGS_VHT_MCS)) + sinfo->txrate.flags |= RATE_INFO_FLAGS_MCS; sinfo->txrate.flags |= RATE_INFO_FLAGS_SHORT_GI; } diff --git a/CORE/SERVICES/WMA/wma.c b/CORE/SERVICES/WMA/wma.c index ca07cf718789..c848b92a2744 100644 --- a/CORE/SERVICES/WMA/wma.c +++ b/CORE/SERVICES/WMA/wma.c @@ -12175,12 +12175,6 @@ static void wma_set_bss_rate_flags(struct wma_txrx_node *iface, tpAddBssParams add_bss) { iface->rate_flags = 0; - if (add_bss->htCapable) { - if (add_bss->txChannelWidthSet) - iface->rate_flags |= eHAL_TX_RATE_HT40; - else - iface->rate_flags |= eHAL_TX_RATE_HT20; - } #ifdef WLAN_FEATURE_11AC if (add_bss->vhtCapable) { @@ -12191,7 +12185,15 @@ static void wma_set_bss_rate_flags(struct wma_txrx_node *iface, else iface->rate_flags |= eHAL_TX_RATE_VHT20; } + /* avoid to conflict with htCapable flag */ + else #endif + if (add_bss->htCapable) { + if (add_bss->txChannelWidthSet) + iface->rate_flags |= eHAL_TX_RATE_HT40; + else + iface->rate_flags |= eHAL_TX_RATE_HT20; + } if (add_bss->staContext.fShortGI20Mhz || add_bss->staContext.fShortGI40Mhz) -- cgit v1.2.3 From 092051819eaa30f70f50fb1164eadc16a1163f8a Mon Sep 17 00:00:00 2001 From: Komal Seelam Date: Fri, 11 Jul 2014 11:43:26 +0530 Subject: qcacld: FR: CLD Support for Code Swap Feature CLD Host Support for Code Swap Feature Supported only for Rome 3.x version. evicted30.bin should be pushed to /firmware/image. The changes support the demand paging for firmware code in host memory Unit Test Report: Read the value at 0xa0000: athdiag --get --address=0xa0000 Should match to the contents of codeswap_codeseg_info 1. Load/Unload 2. Connect/Disconnect on STA, P2P, SAP 3. After SSR 4. Suspend/Resume 5. FTM Driver Load/Unload CRs-Fixed: 705380 Change-Id: Ib4e4faee94928d0823a9179237731d6042055901 --- CORE/SERVICES/BMI/ol_fw.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/CORE/SERVICES/BMI/ol_fw.c b/CORE/SERVICES/BMI/ol_fw.c index 920a26a7857b..44283be59c55 100644 --- a/CORE/SERVICES/BMI/ol_fw.c +++ b/CORE/SERVICES/BMI/ol_fw.c @@ -1766,6 +1766,36 @@ A_STATUS ol_patch_pll_switch(struct ol_softc * scn) } #endif +#ifdef CONFIG_CNSS +/* AXI Start Address */ +#define TARGET_ADDR (0xa0000) + +void ol_transfer_codeswap_struct(struct ol_softc *scn) { + struct hif_pci_softc *sc = scn->hif_sc; + struct codeswap_codeseg_info wlan_codeswap; + A_STATUS rv; + + if (!sc || !sc->hif_device) { + pr_err("%s: hif_pci_softc is null\n", __func__); + return; + } + + if (cnss_get_codeswap_struct(&wlan_codeswap)) { + pr_err("%s: failed to get codeswap structure\n", __func__); + return; + } + + rv = BMIWriteMemory(scn->hif_hdl, TARGET_ADDR, + (u_int8_t *)&wlan_codeswap, sizeof(wlan_codeswap), scn); + + if (rv != A_OK) { + pr_err("Failed to Write 0xa0000 for Target Memory Expansion\n"); + return; + } + pr_info("%s:codeswap structure is successfully downloaded\n", __func__); +} +#endif + int ol_download_firmware(struct ol_softc *scn) { u_int32_t param, address = 0; @@ -1837,6 +1867,10 @@ int ol_download_firmware(struct ol_softc *scn) printk("%s: Using 0x%x for the remainder of init\n", __func__, address); if ( scn->enablesinglebinary == FALSE ) { +#ifdef CONFIG_CNSS + ol_transfer_codeswap_struct(scn); +#endif + status = ol_transfer_bin_file(scn, ATH_OTP_FILE, address, TRUE); if (status == EOK) { -- cgit v1.2.3 From fb3cdfeeecb72ccfbbb5de6a29bf38f09225d2f2 Mon Sep 17 00:00:00 2001 From: Akash Patel Date: Mon, 25 Aug 2014 11:52:39 -0700 Subject: Cafstaging Release 1.0.0.177 Cafstaging Release 1.0.0.177 Change-Id: I27378e4b3dba14199703507ff4233c0ab95bd053 CRs-Fixed: 688141 --- CORE/MAC/inc/qwlan_version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CORE/MAC/inc/qwlan_version.h b/CORE/MAC/inc/qwlan_version.h index 139e7b7d94d9..c37e9a350462 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 176 +#define QWLAN_VERSION_BUILD 177 -#define QWLAN_VERSIONSTR "1.0.0.176" +#define QWLAN_VERSIONSTR "1.0.0.177" #define AR6320_REV1_VERSION 0x5000000 -- cgit v1.2.3