From 33c421115ff5449ce6a18e00af0f3b0006dd9722 Mon Sep 17 00:00:00 2001 From: Yuanyuan Liu Date: Fri, 29 Aug 2014 17:25:02 -0700 Subject: qcacld: CL 1074397 - update fw debug log file FW debug id changes for EOS. Change-Id: I59be9cb33f2c5e31c27b2770fc79554cdce7f290 CRs-Fixed: 717600 (cherry picked from commit ac4c4e054841b1127c3eacd77602ca4c327c355c) --- CORE/SERVICES/COMMON/dbglog_id.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CORE/SERVICES/COMMON/dbglog_id.h b/CORE/SERVICES/COMMON/dbglog_id.h index f450147401ff..619db5ee406d 100644 --- a/CORE/SERVICES/COMMON/dbglog_id.h +++ b/CORE/SERVICES/COMMON/dbglog_id.h @@ -688,7 +688,19 @@ extern "C" { #define WAL_DBGID_RESUME 67 #define WAL_DBGID_PEER_TX_FAIL_CNT_THRES_EXCEEDED 68 #define WAL_DBGID_RX_FULL_REORDER_SUPPORT 69 +#if defined(AR900B) +#define WAL_DBGID_HCM_BIN 70 +#define WAL_DBGID_HCM_BIN_PENALIZE 71 +#define WAL_DBGID_HCM_BIN_DEPENALIZE 72 +#define WAL_DBGID_AST_UPDATE_WDS_ENTRY 73 +#define WAL_DBGID_PEER_EXT_STATS 74 +#define WAL_DBGID_TX_AC_BUFFER_SET 75 +#define WAL_DBGID_AST_ENTRY_EXIST 76 +#define WAL_DBGID_AST_ENTRY_FULL 77 +#define WAL_DBGID_DEFINITION_END 78 +#else #define WAL_DBGID_DEFINITION_END 70 +#endif #define ANI_DBGID_POLL 0 #define ANI_DBGID_CONTROL 1 -- cgit v1.2.3 From bbe2b6c73176811a3200ce46be3f6da2a5a0d5cf Mon Sep 17 00:00:00 2001 From: Yuanyuan Liu Date: Wed, 27 Aug 2014 19:31:59 -0700 Subject: qcacld: CL 1068659 - update fw debug log file Added several new DBGLOG IDs for NAN. Change-Id: Ib2e5e2f3679f7976a2617f150a8181f1d4c324be CRs-Fixed: 716456 (cherry picked from commit 089d6fc4837bb646034d85a8304bc4062a33e003) --- CORE/SERVICES/COMMON/dbglog_id.h | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/CORE/SERVICES/COMMON/dbglog_id.h b/CORE/SERVICES/COMMON/dbglog_id.h index 619db5ee406d..bcfdb01a8f24 100644 --- a/CORE/SERVICES/COMMON/dbglog_id.h +++ b/CORE/SERVICES/COMMON/dbglog_id.h @@ -1271,26 +1271,42 @@ extern "C" { #define NAN_DBGID_TW_PARAMS (NAN_DBGID_EVT_BASE + 65) /* args: */ #define NAN_DBGID_BEACON_SENDER (NAN_DBGID_EVT_BASE + 66) +/* args: currTsf, nextDwTsf */ +#define NAN_DBGID_TSF_DUMP (NAN_DBGID_EVT_BASE + 67) +/* args: chan, startSlot, numSlots, repeat */ +#define NAN_DBGID_FAW_CONFIG (NAN_DBGID_EVT_BASE + 68) /* args: */ -#define NAN_DBGID_SPARE_67 (NAN_DBGID_EVT_BASE + 67) +#define NAN_DBGID_FAW_START (NAN_DBGID_EVT_BASE + 69) /* args: */ -#define NAN_DBGID_SPARE_68 (NAN_DBGID_EVT_BASE + 68) -/* args: */ -#define NAN_DBGID_SPARE_69 (NAN_DBGID_EVT_BASE + 69) -/* args: */ -#define NAN_DBGID_SPARE_70 (NAN_DBGID_EVT_BASE + 70) +#define NAN_DBGID_FAW_END (NAN_DBGID_EVT_BASE + 70) +/* args: offset, oldval, newval */ +#define NAN_DBGID_CONFIG_PARAM_CHANGED (NAN_DBGID_EVT_BASE + 71) +/* args: */ +#define NAN_DBGID_CONN_CAP_ATTR_CLEARED (NAN_DBGID_EVT_BASE + 72) +/* args: connType */ +#define NAN_DBGID_POST_DISC_ATTR_CLEARED (NAN_DBGID_EVT_BASE + 73) +/* args: */ +#define NAN_DBGID_VENDOR_SPECIFIC_ATTR_CLEARED (NAN_DBGID_EVT_BASE + 74) +/* args: offset */ +#define NAN_DBGID_WLAN_INFRA_MAP_CTRL_OFFSET (NAN_DBGID_EVT_BASE + 75) +/* args: offset */ +#define NAN_DBGID_WLAN_INFRA_AI_BITMAP_OFFSET (NAN_DBGID_EVT_BASE + 76) +/* args: offset */ +#define NAN_DBGID_WLAN_INFRA_DEVICE_ROLE_OFFSET (NAN_DBGID_EVT_BASE + 77) +/* args: offset */ +#define NAN_DBGID_MESH_ID_OFFSET (NAN_DBGID_EVT_BASE + 78) /* args: */ -#define NAN_DBGID_SPARE_71 (NAN_DBGID_EVT_BASE + 71) +#define NAN_DBGID_SPARE_79 (NAN_DBGID_EVT_BASE + 79) /* args: */ -#define NAN_DBGID_SPARE_72 (NAN_DBGID_EVT_BASE + 72) +#define NAN_DBGID_SPARE_80 (NAN_DBGID_EVT_BASE + 80) /* args: */ -#define NAN_DBGID_SPARE_73 (NAN_DBGID_EVT_BASE + 73) +#define NAN_DBGID_SPARE_81 (NAN_DBGID_EVT_BASE + 81) /* args: */ -#define NAN_DBGID_SPARE_74 (NAN_DBGID_EVT_BASE + 74) +#define NAN_DBGID_SPARE_82 (NAN_DBGID_EVT_BASE + 82) /* args: */ -#define NAN_DBGID_SPARE_75 (NAN_DBGID_EVT_BASE + 75) +#define NAN_DBGID_SPARE_83 (NAN_DBGID_EVT_BASE + 83) /* PLEASE KEEP THIS ONE AT THE END */ -#define NAN_DBGID_EVT_LOG_LAST (NAN_DBGID_EVT_BASE + 76) +#define NAN_DBGID_EVT_LOG_LAST (NAN_DBGID_EVT_BASE + 84) /* Debug IDs for message logs. */ #define NAN_DBGID_API_MSG_BASE NAN_DBGID_EVT_LOG_LAST -- cgit v1.2.3 From 928a3a4b4b9aa3abca5be33e20085a238b035fd9 Mon Sep 17 00:00:00 2001 From: Ji-Huang Date: Wed, 3 Sep 2014 18:16:40 +0800 Subject: qcacld-new: Fix that FW backtrace only shows 15 registers 1. There're 60 registers passed by FW to host, and it's totally 240 bytes in length. Currently, we only passed FW_REG_DUMP_CNT which is 60 to print_hex_dump. 2. fw_ram_seg_addr currently save the starting address of struct fw_ramdump. We would like to save it as the starting address of the memory which saves FW RAM. Change-Id: I2215bd93d09ab120193ef490363a378e05149c89 CRs-Fixed: 718794 (cherry picked from commit 455a5d0245ce7a162b17c52aea4b6273cc9847d9) --- CORE/SERVICES/BMI/ol_fw.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CORE/SERVICES/BMI/ol_fw.c b/CORE/SERVICES/BMI/ol_fw.c index 59da1d752028..2fdce0428bf8 100644 --- a/CORE/SERVICES/BMI/ol_fw.c +++ b/CORE/SERVICES/BMI/ol_fw.c @@ -1025,7 +1025,7 @@ void ol_ramdump_handler(struct ol_softc *scn) pr_err("FW version: %d.%d.%d.%d", MSPId, mSPId, SIId, CRMId); reg = (A_UINT32 *) (data + 4); print_hex_dump(KERN_DEBUG, " ", DUMP_PREFIX_OFFSET, 16, 4, reg, - min_t(A_UINT32, len - 4, FW_REG_DUMP_CNT), + min_t(A_UINT32, len - 4, FW_REG_DUMP_CNT * 4), false); scn->fw_ram_dumping = 0; } @@ -1069,16 +1069,16 @@ void ol_ramdump_handler(struct ol_softc *scn) pr_err("Fail to allocate memory for ram dump"); VOS_BUG(0); } - fw_ram_seg_addr[i] = scn->ramdump[i]; + (scn->ramdump[i])->mem = + (A_UINT8 *) (scn->ramdump[i] + 1); + fw_ram_seg_addr[i] = (scn->ramdump[i])->mem; pr_err("FW %s start addr = %#08x\n", fw_ram_seg_name[i], *reg); pr_err("Memory addr for %s = %#08x\n", fw_ram_seg_name[i], - (A_UINT32) scn->ramdump[i]); + (A_UINT32) (scn->ramdump[i])->mem); (scn->ramdump[i])->start_addr = *reg; (scn->ramdump[i])->length = 0; - (scn->ramdump[i])->mem = - (A_UINT8 *) (scn->ramdump[i] + 1); } reg++; ram_ptr = (scn->ramdump[i])->mem + (scn->ramdump[i])->length; -- cgit v1.2.3 From d0b5d26b76a1e572cca5bd437c0bf9cf7c991b04 Mon Sep 17 00:00:00 2001 From: Xiaochang Duan Date: Thu, 13 Mar 2014 16:53:15 -0700 Subject: qcacld: channel 144 support:port extra changes from pronto Add channel number 144 to array index-channel mapping (I5ffd9d8ed3b535a12c5e5c4475fec225dec128a0) update 144 channel number to array index to channel mapping Change-Id: If820b6cea2683eb3b132b49a540441aac549016e CRs-Fixed: 628277 --- CORE/MAC/src/pe/lim/limUtils.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/CORE/MAC/src/pe/lim/limUtils.c b/CORE/MAC/src/pe/lim/limUtils.c index 887119edbc7c..850b111c8074 100644 --- a/CORE/MAC/src/pe/lim/limUtils.c +++ b/CORE/MAC/src/pe/lim/limUtils.c @@ -70,6 +70,28 @@ * this information. */ static tAniBool glimTriggerBackgroundScanDuringQuietBss_Status = eSIR_TRUE; +/* 11A Channel list to decode RX BD channel information */ +static const tANI_U8 abChannel[]= {36,40,44,48,52,56,60,64,100,104,108,112,116, + 120,124,128,132,136,140,149,153,157,161,165 +#ifdef FEATURE_WLAN_CH144 + ,144 +#endif +}; +#define abChannelSize (sizeof(abChannel)/ \ + sizeof(abChannel[0])) + +#ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD +static const tANI_U8 aUnsortedChannelList[]= {52,56,60,64,100,104,108,112,116, + 120,124,128,132,136,140,36,40,44,48,149,153,157,161,165 +#ifdef FEATURE_WLAN_CH144 + ,144 +#endif +}; +#define aUnsortedChannelListSize (sizeof(aUnsortedChannelList)/ \ + sizeof(aUnsortedChannelList[0])) +#endif + +#define SUCCESS 1 #define MAX_BA_WINDOW_SIZE_FOR_CISCO 25 -- cgit v1.2.3 From 299bef56f866934c63f2be25d46c9d7ad088c0d8 Mon Sep 17 00:00:00 2001 From: "Padma, Santhosh Kumar" Date: Mon, 23 Jun 2014 15:57:51 +0530 Subject: qcacld: Check for valid channels and enable channel 144 (I41423d7f29da02a38b3f19c7b242985c9ec96348) Check for valid and enabled channels while copying 11d scan channel list. Without this 11d scan is issued on all the channels. It also enables channel 144. Change-Id: I499d755dfa8488c26951d53a25f832cd05f738c0 CRs-Fixed: 628277 --- CORE/SME/src/csr/csrApiScan.c | 13 ++++++++++--- CORE/VOSS/src/vos_nvitem.c | 5 ++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c index c71c9f4e8f87..481c9750fe69 100644 --- a/CORE/SME/src/csr/csrApiScan.c +++ b/CORE/SME/src/csr/csrApiScan.c @@ -6147,6 +6147,7 @@ eHalStatus csrScanCopyRequest(tpAniSirGlobal pMac, tCsrScanRequest *pDstReq, tCs tANI_U32 len = sizeof(pMac->roam.validChannelList); tANI_U32 index = 0; tANI_U32 new_index = 0; + eNVChannelEnabledType NVchannel_state; do { @@ -6203,9 +6204,15 @@ eHalStatus csrScanCopyRequest(tpAniSirGlobal pMac, tCsrScanRequest *pDstReq, tCs { for ( index = 0; index < pSrcReq->ChannelInfo.numOfChannels ; index++ ) { - pDstReq->ChannelInfo.ChannelList[new_index] = - pSrcReq->ChannelInfo.ChannelList[index]; - new_index++; + NVchannel_state = vos_nv_getChannelEnabledState( + pSrcReq->ChannelInfo.ChannelList[index]); + if ((NV_CHANNEL_ENABLE == NVchannel_state) || + (NV_CHANNEL_DFS == NVchannel_state)) + { + pDstReq->ChannelInfo.ChannelList[new_index] = + pSrcReq->ChannelInfo.ChannelList[index]; + new_index++; + } } pDstReq->ChannelInfo.numOfChannels = new_index; } diff --git a/CORE/VOSS/src/vos_nvitem.c b/CORE/VOSS/src/vos_nvitem.c index aa1e70f1c4ee..70735063bb27 100644 --- a/CORE/VOSS/src/vos_nvitem.c +++ b/CORE/VOSS/src/vos_nvitem.c @@ -1013,7 +1013,6 @@ static int bw20_ch_index_to_bw40_ch_index(int k) return m; } - static int create_linux_regulatory_entry(struct wiphy *wiphy, v_U8_t nBandCapability); @@ -1430,8 +1429,8 @@ static int create_linux_regulatory_entry(struct wiphy *wiphy, } else /* Enable is only last flag we support */ { - pnvEFSTable->halnv.tables.regDomains[temp_reg_domain].channels[k].enabled = - NV_CHANNEL_ENABLE; + pnvEFSTable->halnv.tables.regDomains[temp_reg_domain]. + channels[k].enabled = NV_CHANNEL_ENABLE; /* max_power is in dBm */ pnvEFSTable->halnv.tables.regDomains[temp_reg_domain].channels[k].pwrLimit = -- cgit v1.2.3 From 3a3e0ae69a8212a1f55d97f62d2c4ce40aa7a52d Mon Sep 17 00:00:00 2001 From: "Padma, Santhosh Kumar" Date: Mon, 28 Jul 2014 13:34:55 +0530 Subject: qcacld: Add channel 144 in 5GHz channel list It's an initial effort to support channel 144 on qcacld-new. This fix adds channel 144 in 5GHz channel list. Change-Id: I07cdd9f751858f0aac60d15f5f7ceca893e2659f CRs-Fixed: 628277 --- CORE/HDD/src/wlan_hdd_cfg80211.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c index a2bc6d675e14..986686e4d6dc 100644 --- a/CORE/HDD/src/wlan_hdd_cfg80211.c +++ b/CORE/HDD/src/wlan_hdd_cfg80211.c @@ -283,6 +283,9 @@ static struct ieee80211_channel hdd_channels_5_GHZ[] = HDD5GHZCHAN(5660,132, 0) , HDD5GHZCHAN(5680,136, 0) , HDD5GHZCHAN(5700,140, 0) , +#ifdef FEATURE_WLAN_CH144 + HDD5GHZCHAN(5720,144, 0) , +#endif /* FEATURE_WLAN_CH144 */ HDD5GHZCHAN(5745,149, 0) , HDD5GHZCHAN(5765,153, 0) , HDD5GHZCHAN(5785,157, 0) , -- cgit v1.2.3 From e04df502573a2a0f2b3b2849c29823dc1ae77070 Mon Sep 17 00:00:00 2001 From: "Padma, Santhosh Kumar" Date: Mon, 28 Jul 2014 15:46:07 +0530 Subject: qcacld: Update end channel of operating Band It's an initial effort to support channel 144 on qcacld-new. This fix adds channel 144 as end channel of operating band. Change-Id: Ia294e6a7b6099dec0593fe9ced7d3b8ea1589fad CRs-Fixed: 628277 --- CORE/SAP/src/sapFsm.c | 7 ++++++- CORE/SAP/src/sapModule.c | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CORE/SAP/src/sapFsm.c b/CORE/SAP/src/sapFsm.c index 39cad7f1fc7a..de4a87fc6254 100644 --- a/CORE/SAP/src/sapFsm.c +++ b/CORE/SAP/src/sapFsm.c @@ -3341,9 +3341,14 @@ static VOS_STATUS sapGetChannelList(ptSapContext sapContext, case eSAP_RF_SUBBAND_5_MID_GHZ: bandStartChannel = RF_CHAN_100; - bandEndChannel = RF_CHAN_140; startChannelNum = (startChannelNum - 12) > 100 ? (startChannelNum - 12):100; +#ifndef FEATURE_WLAN_CH144 + bandEndChannel = RF_CHAN_140; endChannelNum = (endChannelNum + 12) <= 140? (endChannelNum + 12):140; +#else + bandEndChannel = RF_CHAN_144; + endChannelNum = (endChannelNum + 12) <= 144? (endChannelNum + 12):144; +#endif /* FEATURE_WLAN_CH144 */ break; case eSAP_RF_SUBBAND_5_HIGH_GHZ: diff --git a/CORE/SAP/src/sapModule.c b/CORE/SAP/src/sapModule.c index 621e71e26cda..d72c1eef3eca 100644 --- a/CORE/SAP/src/sapModule.c +++ b/CORE/SAP/src/sapModule.c @@ -1712,7 +1712,11 @@ WLANSAP_SetChannelRange(tHalHandle hHal,v_U8_t startChannel, v_U8_t endChannel, case eSAP_RF_SUBBAND_5_MID_GHZ: bandStartChannel = RF_CHAN_100; +#ifndef FEATURE_WLAN_CH144 bandEndChannel = RF_CHAN_140; +#else + bandEndChannel = RF_CHAN_144; +#endif /* FEATURE_WLAN_CH144 */ break; case eSAP_RF_SUBBAND_5_HIGH_GHZ: -- cgit v1.2.3 From 3eeea5eccda197918066e6cbffdc1da2f4a586e0 Mon Sep 17 00:00:00 2001 From: "Padma, Santhosh Kumar" Date: Mon, 28 Jul 2014 15:49:27 +0530 Subject: qcacld: Update 5GHz channel bonding mode It's an initial effort to support channel 144 on qcacld-new. This fix includes the check for channel 144 and updates channelBondingMode5GHz accordingly. Change-Id: I27e617d91ba8abe9ae9ac4ca9411f55b4f18d1b1 CRs-Fixed: 628277 --- CORE/SME/src/sme_common/sme_Api.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c index 513832b30bf9..c0b042256652 100644 --- a/CORE/SME/src/sme_common/sme_Api.c +++ b/CORE/SME/src/sme_common/sme_Api.c @@ -11421,7 +11421,7 @@ VOS_STATUS sme_SelectCBMode(tHalHandle hHal, eCsrPhyMode eCsrPhyMode, tANI_U8 ch eCSR_INI_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_HIGH; } else if ( channel == 48 || channel == 64 || channel == 112 || - channel == 128 || channel == 161 ) + channel == 128 || channel == 144 || channel == 161 ) { smeConfig.csrConfig.channelBondingMode5GHz = eCSR_INI_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_HIGH; -- cgit v1.2.3 From 39c9dc1591d5eb17eeecd33aeb3b1d20399edfc7 Mon Sep 17 00:00:00 2001 From: Xiaochang Duan Date: Wed, 12 Mar 2014 00:23:45 -0700 Subject: qcacld-new: Update Kbuild and remove hardcoding for eRfChannels It's an initial effort to support channel 144 on qcacld-new. This fix updates Kbuild to support channel 144. It also removes the hardcoded values for the enum eRfChannels. Change-Id: I6f2b9133ab3f6cabf23953cdcd87d86cc4e5f315 CRs-Fixed: 628277 --- Kbuild | 3 +- wcnss/inc/wlan_nv.h | 172 ++++++++++++++++++++++++++++------------------------ 2 files changed, 94 insertions(+), 81 deletions(-) diff --git a/Kbuild b/Kbuild index 68397042fcf6..8a62edcc735c 100644 --- a/Kbuild +++ b/Kbuild @@ -917,7 +917,8 @@ CDEFINES := -DANI_LITTLE_BYTE_ENDIAN \ -DWLAN_LOGGING_SOCK_SVC_ENABLE \ -DFEATURE_WLAN_EXTSCAN \ -DQCA_LL_TX_FLOW_CT \ - -DFEATURE_WLAN_LFR + -DFEATURE_WLAN_LFR \ + -DFEATURE_WLAN_CH144 ifeq ($(CONFIG_QCA_WIFI_SDIO), 1) CDEFINES += -DCONFIG_HL_SUPPORT \ diff --git a/wcnss/inc/wlan_nv.h b/wcnss/inc/wlan_nv.h index 86150f286018..475a6eae039b 100644 --- a/wcnss/inc/wlan_nv.h +++ b/wcnss/inc/wlan_nv.h @@ -107,9 +107,16 @@ typedef enum #define NV_VERSION_11N_11AC_COUPER_TYPE 0 #define NV_VERSION_11N_11AC_FW_CONFIG 1 #define NV_VERSION_LPDC_FW_CONFIG 2 +#ifdef FEATURE_WLAN_CH144 +#define NV_VERSION_CH144_CONFIG 3 +#endif /* FEATURE_WLAN_CH144 */ #ifdef WCN_PRONTO +#ifdef FEATURE_WLAN_CH144 +#define WLAN_NV_VERSION NV_VERSION_CH144_CONFIG +#else #define WLAN_NV_VERSION NV_VERSION_LPDC_FW_CONFIG +#endif /* FEATURE_WLAN_CH144 */ #else //WCN_PRONTO #define WLAN_NV_VERSION NV_VERSION_11N_11AC_FW_CONFIG #endif //WCN_PRONTO @@ -223,95 +230,101 @@ typedef enum { //2.4GHz Band RF_CHAN_1 = 0, - RF_CHAN_2 = 1, - RF_CHAN_3 = 2, - RF_CHAN_4 = 3, - RF_CHAN_5 = 4, - RF_CHAN_6 = 5, - RF_CHAN_7 = 6, - RF_CHAN_8 = 7, - RF_CHAN_9 = 8, - RF_CHAN_10 = 9, - RF_CHAN_11 = 10, - RF_CHAN_12 = 11, - RF_CHAN_13 = 12, - RF_CHAN_14 = 13, + RF_CHAN_2, + RF_CHAN_3, + RF_CHAN_4, + RF_CHAN_5, + RF_CHAN_6, + RF_CHAN_7, + RF_CHAN_8, + RF_CHAN_9, + RF_CHAN_10, + RF_CHAN_11, + RF_CHAN_12, + RF_CHAN_13, + RF_CHAN_14, //4.9GHz Band - RF_CHAN_240 = 14, - RF_CHAN_244 = 15, - RF_CHAN_248 = 16, - RF_CHAN_252 = 17, - RF_CHAN_208 = 18, - RF_CHAN_212 = 19, - RF_CHAN_216 = 20, + RF_CHAN_240, + RF_CHAN_244, + RF_CHAN_248, + RF_CHAN_252, + RF_CHAN_208, + RF_CHAN_212, + RF_CHAN_216, //5GHz Low & Mid U-NII Band - RF_CHAN_36 = 21, - RF_CHAN_40 = 22, - RF_CHAN_44 = 23, - RF_CHAN_48 = 24, - RF_CHAN_52 = 25, - RF_CHAN_56 = 26, - RF_CHAN_60 = 27, - RF_CHAN_64 = 28, + RF_CHAN_36, + RF_CHAN_40, + RF_CHAN_44, + RF_CHAN_48, + RF_CHAN_52, + RF_CHAN_56, + RF_CHAN_60, + RF_CHAN_64, //5GHz Mid Band - ETSI & FCC - RF_CHAN_100 = 29, - RF_CHAN_104 = 30, - RF_CHAN_108 = 31, - RF_CHAN_112 = 32, - RF_CHAN_116 = 33, - RF_CHAN_120 = 34, - RF_CHAN_124 = 35, - RF_CHAN_128 = 36, - RF_CHAN_132 = 37, - RF_CHAN_136 = 38, - RF_CHAN_140 = 39, + RF_CHAN_100, + RF_CHAN_104, + RF_CHAN_108, + RF_CHAN_112, + RF_CHAN_116, + RF_CHAN_120, + RF_CHAN_124, + RF_CHAN_128, + RF_CHAN_132, + RF_CHAN_136, + RF_CHAN_140, +#ifdef FEATURE_WLAN_CH144 + RF_CHAN_144, +#endif /* FEATURE_WLAN_CH144 */ //5GHz High U-NII Band - RF_CHAN_149 = 40, - RF_CHAN_153 = 41, - RF_CHAN_157 = 42, - RF_CHAN_161 = 43, - RF_CHAN_165 = 44, + RF_CHAN_149, + RF_CHAN_153, + RF_CHAN_157, + RF_CHAN_161, + RF_CHAN_165, //CHANNEL BONDED CHANNELS - RF_CHAN_BOND_3 = 45, - RF_CHAN_BOND_4 = 46, - RF_CHAN_BOND_5 = 47, - RF_CHAN_BOND_6 = 48, - RF_CHAN_BOND_7 = 49, - RF_CHAN_BOND_8 = 50, - RF_CHAN_BOND_9 = 51, - RF_CHAN_BOND_10 = 52, - RF_CHAN_BOND_11 = 53, - RF_CHAN_BOND_242 = 54, //4.9GHz Band - RF_CHAN_BOND_246 = 55, - RF_CHAN_BOND_250 = 56, - RF_CHAN_BOND_210 = 57, - RF_CHAN_BOND_214 = 58, - RF_CHAN_BOND_38 = 59, //5GHz Low & Mid U-NII Band - RF_CHAN_BOND_42 = 60, - RF_CHAN_BOND_46 = 61, - RF_CHAN_BOND_50 = 62, - RF_CHAN_BOND_54 = 63, - RF_CHAN_BOND_58 = 64, - RF_CHAN_BOND_62 = 65, - RF_CHAN_BOND_102 = 66, //5GHz Mid Band - ETSI & FCC - RF_CHAN_BOND_106 = 67, - RF_CHAN_BOND_110 = 68, - RF_CHAN_BOND_114 = 69, - RF_CHAN_BOND_118 = 70, - RF_CHAN_BOND_122 = 71, - RF_CHAN_BOND_126 = 72, - RF_CHAN_BOND_130 = 73, - RF_CHAN_BOND_134 = 74, - RF_CHAN_BOND_138 = 75, - RF_CHAN_BOND_151 = 76, //5GHz High U-NII Band - RF_CHAN_BOND_155 = 77, - RF_CHAN_BOND_159 = 78, - RF_CHAN_BOND_163 = 79, + RF_CHAN_BOND_3, + RF_CHAN_BOND_4, + RF_CHAN_BOND_5, + RF_CHAN_BOND_6, + RF_CHAN_BOND_7, + RF_CHAN_BOND_8, + RF_CHAN_BOND_9, + RF_CHAN_BOND_10, + RF_CHAN_BOND_11, + RF_CHAN_BOND_242, //4.9GHz Band + RF_CHAN_BOND_246, + RF_CHAN_BOND_250, + RF_CHAN_BOND_210, + RF_CHAN_BOND_214, + RF_CHAN_BOND_38, //5GHz Low & Mid U-NII Band + RF_CHAN_BOND_42, + RF_CHAN_BOND_46, + RF_CHAN_BOND_50, + RF_CHAN_BOND_54, + RF_CHAN_BOND_58, + RF_CHAN_BOND_62, + RF_CHAN_BOND_102, //5GHz Mid Band - ETSI & FCC + RF_CHAN_BOND_106, + RF_CHAN_BOND_110, + RF_CHAN_BOND_114, + RF_CHAN_BOND_118, + RF_CHAN_BOND_122, + RF_CHAN_BOND_126, + RF_CHAN_BOND_130, + RF_CHAN_BOND_134, + RF_CHAN_BOND_138, +#ifdef FEATURE_WLAN_CH144 + RF_CHAN_BOND_142, +#endif /* FEATURE_WLAN_CH144 */ + RF_CHAN_BOND_151, //5GHz High U-NII Band + RF_CHAN_BOND_155, + RF_CHAN_BOND_159, + RF_CHAN_BOND_163, NUM_RF_CHANNELS, @@ -417,7 +430,6 @@ typedef enum #define HW_VAL_VALUES_VALID_CUSTOM_TCXO_REG8_MASK 0x10 #define HW_VAL_VALUES_VALID_CUSTOM_TCXO_REG9_MASK 0x20 - //From wlanfw/inc/halPhyCalMemory.h typedef PACKED_PRE struct PACKED_POST { -- cgit v1.2.3 From 253e38e35e54205b853f2565892b07b219afd203 Mon Sep 17 00:00:00 2001 From: "Padma, Santhosh Kumar" Date: Mon, 28 Jul 2014 15:53:15 +0530 Subject: qcacld: Update rfChannels and channel index It's an initial effort to support channel 144 on qcacld-new. This fix mainly updates the array rfChannels and channel indices to include channel 144 support. Change-Id: I18fd65672f2e44b5dcb3291f1f1fbd191985ea3c CRs-Fixed: 628277 --- CORE/VOSS/src/vos_nvitem.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/CORE/VOSS/src/vos_nvitem.c b/CORE/VOSS/src/vos_nvitem.c index 70735063bb27..d8542a65768d 100644 --- a/CORE/VOSS/src/vos_nvitem.c +++ b/CORE/VOSS/src/vos_nvitem.c @@ -389,6 +389,9 @@ const tRfChannelProps rfChannels[NUM_RF_CHANNELS] = { 5660, 132, RF_SUBBAND_5_MID_GHZ}, //RF_CHAN_132, { 5680, 136, RF_SUBBAND_5_MID_GHZ}, //RF_CHAN_136, { 5700, 140, RF_SUBBAND_5_MID_GHZ}, //RF_CHAN_140, +#ifdef FEATURE_WLAN_CH144 + { 5720, 144, RF_SUBBAND_5_MID_GHZ}, //RF_CHAN_144, +#endif /* FEATURE_WLAN_CH144 */ { 5745, 149, RF_SUBBAND_5_HIGH_GHZ}, //RF_CHAN_149, { 5765, 153, RF_SUBBAND_5_HIGH_GHZ}, //RF_CHAN_153, { 5785, 157, RF_SUBBAND_5_HIGH_GHZ}, //RF_CHAN_157, @@ -425,6 +428,9 @@ const tRfChannelProps rfChannels[NUM_RF_CHANNELS] = { 5650, 130, NUM_RF_SUBBANDS}, //RF_CHAN_BOND_130, { 5670, 134, NUM_RF_SUBBANDS}, //RF_CHAN_BOND_134, { 5690, 138, NUM_RF_SUBBANDS}, //RF_CHAN_BOND_138, +#ifdef FEATURE_WLAN_CH144 + { 5710, 142, NUM_RF_SUBBANDS}, //RF_CHAN_BOND_142, +#endif /* FEATURE_WLAN_CH144 */ { 5755, 151, NUM_RF_SUBBANDS}, //RF_CHAN_BOND_151, { 5775, 155, NUM_RF_SUBBANDS}, //RF_CHAN_BOND_155, { 5795, 159, NUM_RF_SUBBANDS}, //RF_CHAN_BOND_159, @@ -737,6 +743,13 @@ static void vos_update_reg_info(hdd_context_t *pHddCtx) return; } +/**------------------------------------------------------------------------ + \brief vos_nv_open() - Open NV operation + Read NV bin file and prepare NV common structure + \return VOS_STATUS_SUCCESS - module is initialized successfully + otherwise - module is not initialized + \sa + -------------------------------------------------------------------------*/ VOS_STATUS vos_nv_open(void) { /* Allocate memory to global NV table */ @@ -998,11 +1011,20 @@ static int bw20_ch_index_to_bw40_ch_index(int k) if (m > RF_CHAN_BOND_62) m = RF_CHAN_BOND_62; } +#ifdef FEATURE_WLAN_CH144 + else if (k >= RF_CHAN_100 && k <= RF_CHAN_144) +#else else if (k >= RF_CHAN_100 && k <= RF_CHAN_140) +#endif /* FEATURE_WLAN_CH144 */ { m = k - RF_CHAN_100 + RF_CHAN_BOND_102; +#ifdef FEATURE_WLAN_CH144 + if (m > RF_CHAN_BOND_142) + m = RF_CHAN_BOND_142; +#else if (m > RF_CHAN_BOND_138) m = RF_CHAN_BOND_138; +#endif /* FEATURE_WLAN_CH144 */ } else if (k >= RF_CHAN_149 && k <= RF_CHAN_165) { -- cgit v1.2.3 From 314fa04c2098e25a87e90dc9f27ca2dee8855b31 Mon Sep 17 00:00:00 2001 From: Santhosh Kumar Padma Date: Mon, 17 Mar 2014 20:34:41 -0700 Subject: qcacld-new:update channel list if FW supports channel 144 If the FW supports channel 144, update the channel list with channel 144 enabled. The channel list will be passed to the FW. Change-Id: Ied1c7ce89964199524089a79b84f570806ea786a CRs-Fixed: 628277 --- CORE/VOSS/src/vos_nvitem.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CORE/VOSS/src/vos_nvitem.c b/CORE/VOSS/src/vos_nvitem.c index d8542a65768d..69b4204279cc 100644 --- a/CORE/VOSS/src/vos_nvitem.c +++ b/CORE/VOSS/src/vos_nvitem.c @@ -1494,6 +1494,14 @@ static int create_linux_regulatory_entry(struct wiphy *wiphy, } } +#ifdef FEATURE_WLAN_CH144 + /* Disable RF_CHAN_144 entry if FW does not support channel 144. */ + if ( 0 == (pHddCtx->reg.eeprom_rd_ext & (1 << WHAL_REG_EXT_FCC_CH_144))) { + pnvEFSTable->halnv.tables.regDomains[temp_reg_domain]. + channels[RF_CHAN_144].enabled = NV_CHANNEL_DISABLE; + } +#endif + if (k == 0) return -1; -- cgit v1.2.3 From 5a105f04dc98e15129a502217be7b880e2d5eac8 Mon Sep 17 00:00:00 2001 From: AnjaneeDevi Kapparapu Date: Thu, 4 Sep 2014 13:05:53 +0530 Subject: Cafstaging Release 1.0.0.184 Cafstaging Release 1.0.0.184 Change-Id: If82f8f4a884bf1a42fbbee4abac792479ad35a06 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 7befc341d79a..edf06f4b695e 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 183 +#define QWLAN_VERSION_BUILD 184 -#define QWLAN_VERSIONSTR "1.0.0.183" +#define QWLAN_VERSIONSTR "1.0.0.184" #define AR6320_REV1_VERSION 0x5000000 -- cgit v1.2.3