ARM64: DTS: Add rk3399-firefly uart4 device, node as /dev/ttyS1
[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / rockchip_wlan / rtl8189es / core / rtw_cmd.c
old mode 100644 (file)
new mode 100755 (executable)
index 0f9068e..b94f93f
@@ -209,6 +209,9 @@ since only spin_lock is used.
 ISR/Call-Back functions can't call this sub-function.
 
 */
+#ifdef DBG_CMD_QUEUE
+extern u8 dump_cmd_id;
+#endif
 
 sint   _rtw_enqueue_cmd(_queue *queue, struct cmd_obj *obj)
 {
@@ -219,11 +222,52 @@ _func_enter_;
        if (obj == NULL)
                goto exit;
 
+       if(obj->cmdsz > MAX_CMDSZ ){
+               DBG_871X("%s failed due to obj->cmdsz(%d) > MAX_CMDSZ(%d) \n",__FUNCTION__, obj->cmdsz,MAX_CMDSZ);
+               goto exit;
+       }
        //_enter_critical_bh(&queue->lock, &irqL);
        _enter_critical(&queue->lock, &irqL);   
 
        rtw_list_insert_tail(&obj->list, &queue->queue);
 
+       #ifdef DBG_CMD_QUEUE
+       if(dump_cmd_id){
+               printk("%s===> cmdcode:0x%02x\n",__FUNCTION__,obj->cmdcode);
+               if(obj->cmdcode == GEN_CMD_CODE(_Set_MLME_EVT)){
+                       if(obj->parmbuf){
+                               struct C2HEvent_Header *pc2h_evt_hdr = (struct C2HEvent_Header *)(obj->parmbuf);
+                               printk("pc2h_evt_hdr->ID:0x%02x(%d)\n",pc2h_evt_hdr->ID,pc2h_evt_hdr->ID);
+                       }
+               }
+               if(obj->cmdcode == GEN_CMD_CODE(_Set_Drv_Extra)){
+                       if(obj->parmbuf){
+                               struct drvextra_cmd_parm *pdrvextra_cmd_parm =(struct drvextra_cmd_parm*)(obj->parmbuf);
+                               printk("pdrvextra_cmd_parm->ec_id:0x%02x\n",pdrvextra_cmd_parm->ec_id);
+                       }
+               }
+       }       
+       
+       if (queue->queue.prev->next != &queue->queue)
+       {
+               DBG_871X("[%d] head %p, tail %p, tail->prev->next %p[tail], tail->next %p[head]\n", __LINE__,
+            &queue->queue, queue->queue.prev, queue->queue.prev->prev->next, queue->queue.prev->next);
+               
+               DBG_871X("==========%s============\n",__FUNCTION__);
+               DBG_871X("head:%p,obj_addr:%p\n",&queue->queue,obj);
+               DBG_871X("padapter: %p\n",obj->padapter);
+               DBG_871X("cmdcode: 0x%02x\n",obj->cmdcode);
+               DBG_871X("res: %d\n",obj->res);
+               DBG_871X("parmbuf: %p\n",obj->parmbuf);
+               DBG_871X("cmdsz: %d\n",obj->cmdsz);
+               DBG_871X("rsp: %p\n",obj->rsp);
+               DBG_871X("rspsz: %d\n",obj->rspsz);
+               DBG_871X("sctx: %p\n",obj->sctx);
+               DBG_871X("list->next: %p\n",obj->list.next);
+               DBG_871X("list->prev: %p\n",obj->list.prev);
+       }
+       #endif //DBG_CMD_QUEUE
+       
        //_exit_critical_bh(&queue->lock, &irqL);       
        _exit_critical(&queue->lock, &irqL);
 
@@ -243,11 +287,51 @@ _func_enter_;
 
        //_enter_critical_bh(&(queue->lock), &irqL);
        _enter_critical(&queue->lock, &irqL);
-       if (rtw_is_list_empty(&(queue->queue)))
+       
+       #ifdef DBG_CMD_QUEUE
+       if (queue->queue.prev->next != &queue->queue)
+       {
+                DBG_871X("[%d] head %p, tail %p, tail->prev->next %p[tail], tail->next %p[head]\n", __LINE__,
+            &queue->queue, queue->queue.prev, queue->queue.prev->prev->next, queue->queue.prev->next);
+       }
+       #endif //DBG_CMD_QUEUE
+
+
+       if (rtw_is_list_empty(&(queue->queue))){
                obj = NULL;
+       }
        else
        {
                obj = LIST_CONTAINOR(get_next(&(queue->queue)), struct cmd_obj, list);
+
+               #ifdef DBG_CMD_QUEUE
+               if (queue->queue.prev->next != &queue->queue){
+                               DBG_871X("==========%s============\n",__FUNCTION__);
+                          DBG_871X("head:%p,obj_addr:%p\n",&queue->queue,obj);
+                               DBG_871X("padapter: %p\n",obj->padapter);
+                               DBG_871X("cmdcode: 0x%02x\n",obj->cmdcode);
+                               DBG_871X("res: %d\n",obj->res);
+                               DBG_871X("parmbuf: %p\n",obj->parmbuf);
+                               DBG_871X("cmdsz: %d\n",obj->cmdsz);
+                               DBG_871X("rsp: %p\n",obj->rsp);
+                               DBG_871X("rspsz: %d\n",obj->rspsz);
+                               DBG_871X("sctx: %p\n",obj->sctx);                               
+                               DBG_871X("list->next: %p\n",obj->list.next);
+                               DBG_871X("list->prev: %p\n",obj->list.prev);
+               }
+               
+               if(dump_cmd_id){
+                       DBG_871X("%s===> cmdcode:0x%02x\n",__FUNCTION__,obj->cmdcode);
+                       if(obj->cmdcode == GEN_CMD_CODE(_Set_Drv_Extra)){
+                               if(obj->parmbuf){
+                                struct drvextra_cmd_parm *pdrvextra_cmd_parm =(struct drvextra_cmd_parm*)(obj->parmbuf);
+                                printk("pdrvextra_cmd_parm->ec_id:0x%02x\n",pdrvextra_cmd_parm->ec_id);
+                        }
+                       }
+
+               }       
+               #endif //DBG_CMD_QUEUE
+               
                rtw_list_delete(&obj->list);
        }
 
@@ -329,7 +413,6 @@ int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)
        if(cmd_obj->cmdcode == GEN_CMD_CODE(_SetChannelPlan))
                bAllow = _TRUE;
 
-
        if( (pcmdpriv->padapter->hw_init_completed ==_FALSE && bAllow == _FALSE)
                || ATOMIC_READ(&(pcmdpriv->cmdthd_running)) == _FALSE   //com_thread not running
        )
@@ -352,7 +435,7 @@ u32 rtw_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)
        int res = _FAIL;
        PADAPTER padapter = pcmdpriv->padapter;
        
-_func_enter_;
+_func_enter_;  
        
        if (cmd_obj == NULL) {
                goto exit;
@@ -373,7 +456,6 @@ _func_enter_;
 
        res = _rtw_enqueue_cmd(&pcmdpriv->cmd_queue, cmd_obj);
 
-       
        if(res == _SUCCESS)
                _rtw_up_sema(&pcmdpriv->cmd_queue_sema);
        
@@ -389,6 +471,7 @@ struct      cmd_obj *rtw_dequeue_cmd(struct cmd_priv *pcmdpriv)
        struct cmd_obj *cmd_obj;
        
 _func_enter_;          
+
        cmd_obj = _rtw_dequeue_cmd(&pcmdpriv->cmd_queue);
                
 _func_exit_;                   
@@ -405,14 +488,16 @@ _func_exit_;
 
 void rtw_free_cmd_obj(struct cmd_obj *pcmd)
 {
+       struct drvextra_cmd_parm *extra_parm = NULL;
 _func_enter_;
 
-       if((pcmd->cmdcode!=_JoinBss_CMD_) &&(pcmd->cmdcode!= _CreateBss_CMD_))
-       {
-               //free parmbuf in cmd_obj
-               rtw_mfree((unsigned char*)pcmd->parmbuf, pcmd->cmdsz);
-       }       
-       
+       if(pcmd->parmbuf != NULL){
+               if((pcmd->cmdcode!=_JoinBss_CMD_) &&(pcmd->cmdcode!= _CreateBss_CMD_))
+               {
+                       //free parmbuf in cmd_obj
+                       rtw_mfree((unsigned char*)pcmd->parmbuf, pcmd->cmdsz);
+               }       
+       }
        if(pcmd->rsp!=NULL)
        {
                if(pcmd->rspsz!= 0)
@@ -431,19 +516,12 @@ _func_exit_;
 
 void rtw_stop_cmd_thread(_adapter *adapter)
 {
-       struct cmd_priv *pcmdpriv = &(adapter->cmdpriv);
-       u8 res;
-
        if(adapter->cmdThread &&
                ATOMIC_READ(&(adapter->cmdpriv.cmdthd_running)) == _TRUE &&
                adapter->cmdpriv.stop_req == 0)
        {
-               DBG_871X("%s: up sema\n", __func__);
                adapter->cmdpriv.stop_req = 1;
                _rtw_up_sema(&adapter->cmdpriv.cmd_queue_sema);
-               DBG_871X("%s: terminate_cmdthread_sema: %d\n",
-                       __func__,
-                       adapter->cmdpriv.terminate_cmdthread_sema.count);
                _rtw_down_sema(&adapter->cmdpriv.terminate_cmdthread_sema);
        }
 }
@@ -460,7 +538,7 @@ thread_return rtw_cmd_thread(thread_context context)
        PADAPTER padapter = (PADAPTER)context;
        struct cmd_priv *pcmdpriv = &(padapter->cmdpriv);
        struct drvextra_cmd_parm *extra_parm = NULL;
-       
+       _irqL irqL;
 _func_enter_;
 
        thread_enter("RTW_CMD_THREAD");
@@ -485,8 +563,6 @@ _func_enter_;
                {
                        DBG_871X_LEVEL(_drv_always_, "%s: DriverStopped(%d) SurpriseRemoved(%d) break at line %d\n",
                                __FUNCTION__, padapter->bDriverStopped, padapter->bSurpriseRemoved, __LINE__);
-                       DBG_871X("%s: terminate_cmdthread_sema: %d\n", __func__,
-                               padapter->cmdpriv.terminate_cmdthread_sema.count);
                        break;
                }
 
@@ -495,11 +571,14 @@ _func_enter_;
                        break;
                }
                
+               _enter_critical(&pcmdpriv->cmd_queue.lock, &irqL);
                if(rtw_is_list_empty(&(pcmdpriv->cmd_queue.queue)))
                {
                        //DBG_871X("%s: cmd queue is empty!\n", __func__);
+                       _exit_critical(&pcmdpriv->cmd_queue.lock, &irqL);
                        continue;
                }
+               _exit_critical(&pcmdpriv->cmd_queue.lock, &irqL);
 
 #ifdef CONFIG_LPS_LCLK
                if (rtw_register_cmd_alive(padapter) != _SUCCESS)
@@ -530,6 +609,11 @@ _next:
                if( _FAIL == rtw_cmd_filter(pcmdpriv, pcmd) )
                {
                        pcmd->res = H2C_DROPPED;
+                       if (pcmd->cmdcode == GEN_CMD_CODE(_Set_Drv_Extra)) {
+                               extra_parm = (struct drvextra_cmd_parm *)pcmd->parmbuf;
+                               if (extra_parm && extra_parm->pbuf && extra_parm->size > 0)
+                                       rtw_mfree(extra_parm->pbuf, extra_parm->size);
+                       }
                        goto post_process;
                }
 
@@ -537,6 +621,10 @@ _next:
 
                pcmd->cmdsz = _RND4((pcmd->cmdsz));//_RND4
 
+               if(pcmd->cmdsz > MAX_CMDSZ ){
+                       DBG_871X("%s cmdsz:%d > MAX_CMDSZ:%d\n",__FUNCTION__,pcmd->cmdsz,MAX_CMDSZ);
+               }
+
                _rtw_memcpy(pcmdbuf, pcmd->parmbuf, pcmd->cmdsz);
 
                if(pcmd->cmdcode < (sizeof(wlancmds) /sizeof(struct cmd_hdl)))
@@ -626,11 +714,9 @@ post_process:
 #ifdef CONFIG_LPS_LCLK
                        rtw_unregister_cmd_alive(padapter);
 #endif
-                       DBG_871X("%s: pcmd==NULL\n", __FUNCTION__);
                        break;
                }
-
-               DBG_871X("%s: leaving... drop cmdcode:%u size:%d\n", __FUNCTION__, pcmd->cmdcode, pcmd->cmdsz);
+               //DBG_871X("%s: leaving... drop cmdcode:%u size:%d\n", __FUNCTION__, pcmd->cmdcode, pcmd->cmdsz);
 
                if (pcmd->cmdcode == GEN_CMD_CODE(_Set_Drv_Extra)) {
                        extra_parm = (struct drvextra_cmd_parm *)pcmd->parmbuf;
@@ -639,13 +725,16 @@ post_process:
                        }
                }
 
-               rtw_free_cmd_obj(pcmd);
+               rtw_free_cmd_obj(pcmd); 
        }while(1);
 
        _rtw_up_sema(&pcmdpriv->terminate_cmdthread_sema);
+       ATOMIC_SET(&(pcmdpriv->cmdthd_running), _FALSE);
 
 _func_exit_;
+
        thread_exit();
+
 }
 
 
@@ -774,6 +863,10 @@ u8 rtw_sitesurvey_cmd(_adapter  *padapter, NDIS_802_11_SSID *ssid, int ssid_num,
        struct rtw_ieee80211_channel *ch, int ch_num)
 {
        u8 res = _FAIL;
+#ifdef CONFIG_STA_MODE_SCAN_UNDER_AP_MODE
+       u8 wireless_mode = 0;
+       u32 mlmext_info_state = 0;
+#endif
        struct cmd_obj          *ph2c;
        struct sitesurvey_parm  *psurveyPara;
        struct cmd_priv         *pcmdpriv = &padapter->cmdpriv;
@@ -850,12 +943,19 @@ _func_enter_;
        if(res == _SUCCESS) {
 
                pmlmepriv->scan_start_time = rtw_get_current_time();
-
 #ifdef CONFIG_STA_MODE_SCAN_UNDER_AP_MODE
-               if((padapter->pbuddy_adapter->mlmeextpriv.mlmext_info.state&0x03) == WIFI_FW_AP_STATE)
-                       _set_timer(&pmlmepriv->scan_to_timer, SURVEY_TO * 
-                                               ( padapter->mlmeextpriv.max_chan_nums + ( padapter->mlmeextpriv.max_chan_nums / RTW_SCAN_NUM_OF_CH ) * RTW_STAY_AP_CH_MILLISECOND ) + 1000 );
-               else
+               mlmext_info_state =
+                       padapter->pbuddy_adapter->mlmeextpriv.mlmext_info.state;
+               wireless_mode = padapter->registrypriv.wireless_mode;
+
+               if((mlmext_info_state & 0x03) == WIFI_FW_AP_STATE) {
+                       if(IsSupported5G(wireless_mode) && IsSupported24G(wireless_mode))
+                               _set_timer(&pmlmepriv->scan_to_timer,
+                                               CONC_SCANNING_TIMEOUT_DUAL_BAND);
+                       else
+                               _set_timer(&pmlmepriv->scan_to_timer,
+                                               CONC_SCANNING_TIMEOUT_SINGLE_BAND);
+               } else
 #endif //CONFIG_STA_MODE_SCAN_UNDER_AP_MODE
                        _set_timer(&pmlmepriv->scan_to_timer, SCANNING_TIMEOUT);
 
@@ -1353,6 +1453,8 @@ _func_enter_;
                }
        }
 
+       pmlmeinfo->assoc_AP_vendor = check_assoc_AP(pnetwork->network.IEs, pnetwork->network.IELength);
+
        psecnetwork=(WLAN_BSSID_EX *)&psecuritypriv->sec_bss;
        if(psecnetwork==NULL)
        {
@@ -1424,7 +1526,7 @@ _func_enter_;
                {
                        rtw_ht_use_default_setting(padapter);
 
-                       rtw_build_wmm_ie_ht(padapter, &psecnetwork->IEs[12], &psecnetwork->IELength);
+                       rtw_build_wmm_ie_ht(padapter, &psecnetwork->IEs[0], &psecnetwork->IELength);
 
                        //rtw_restructure_ht_ie
                        rtw_restructure_ht_ie(padapter, &pnetwork->network.IEs[12], &psecnetwork->IEs[0], 
@@ -1445,8 +1547,6 @@ _func_enter_;
 
 #endif //CONFIG_80211N_HT
 
-       pmlmeinfo->assoc_AP_vendor = check_assoc_AP(pnetwork->network.IEs, pnetwork->network.IELength);
-
        #if 0
        psecuritypriv->supplicant_ie[0]=(u8)psecnetwork->IELength;
 
@@ -1659,7 +1759,6 @@ _func_exit_;
 }
 
 u8 rtw_clearstakey_cmd(_adapter *padapter, struct sta_info *sta, u8 enqueue)
-
 {
        struct cmd_obj*                 ph2c;
        struct set_stakey_parm  *psetstakey_para;
@@ -1679,7 +1778,6 @@ _func_enter_;
                        clear_cam_entry(padapter, cam_id);
                        rtw_camid_free(padapter, cam_id);
                }
-
        }
        else
        {
@@ -2114,15 +2212,11 @@ _func_enter_;
        else
        {
                //no need to enqueue, do the cmd hdl directly and free cmd parameter
-               if( H2C_SUCCESS !=set_chplan_hdl(padapter, (unsigned char *)setChannelPlan_param) )
+               if( H2C_SUCCESS != set_chplan_hdl(padapter, (unsigned char *)setChannelPlan_param) )
                        res = _FAIL;
                
                rtw_mfree((u8 *)setChannelPlan_param, sizeof(struct SetChannelPlan_param));
        }
-
-       //do something based on res...
-       if(res == _SUCCESS)
-               padapter->mlmepriv.ChannelPlan = chplan;
        
 exit:
 
@@ -2296,10 +2390,18 @@ static void collect_traffic_statistics(_adapter *padapter)
        pdvobjpriv->traffic_stat.cur_rx_tp = (u32)(pdvobjpriv->traffic_stat.cur_rx_bytes *8/2/1024/1024);
 }
 
+//from_timer == 1 means driver is in LPS
 u8 traffic_status_watchdog(_adapter *padapter, u8 from_timer)
 {
        u8      bEnterPS = _FALSE;
-       u16     BusyThreshold = 100;
+#ifdef CONFIG_BT_COEXIST
+       u16     BusyThresholdHigh = 25;
+       u16     BusyThresholdLow = 10;
+#else
+       u16     BusyThresholdHigh = 100;
+       u16     BusyThresholdLow = 75;
+#endif
+       u16     BusyThreshold = BusyThresholdHigh;
        u8      bBusyTraffic = _FALSE, bTxBusyTraffic = _FALSE, bRxBusyTraffic = _FALSE;
        u8      bHigherBusyTraffic = _FALSE, bHigherBusyRxTraffic = _FALSE, bHigherBusyTxTraffic = _FALSE;
 
@@ -2320,16 +2422,12 @@ u8 traffic_status_watchdog(_adapter *padapter, u8 from_timer)
        if((check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE) 
                /*&& !MgntInitAdapterInProgress(pMgntInfo)*/)
        {
-#ifdef CONFIG_BT_COEXIST
-               if( pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > 25 ||
-                       pmlmepriv->LinkDetectInfo.NumTxOkInPeriod > 25 )
-#else // !CONFIG_BT_COEXIST
                // if we raise bBusyTraffic in last watchdog, using lower threshold.
                if (pmlmepriv->LinkDetectInfo.bBusyTraffic)
-                       BusyThreshold = 75;
+                               BusyThreshold = BusyThresholdLow;
+
                if( pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > BusyThreshold ||
                        pmlmepriv->LinkDetectInfo.NumTxOkInPeriod > BusyThreshold )
-#endif // !CONFIG_BT_COEXIST
                {
                        bBusyTraffic = _TRUE;
 
@@ -2383,11 +2481,16 @@ u8 traffic_status_watchdog(_adapter *padapter, u8 from_timer)
 #ifdef CONFIG_LPS
                // check traffic for  powersaving.
                if( ((pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod + pmlmepriv->LinkDetectInfo.NumTxOkInPeriod) > 8 ) ||
-                       (pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod > 2) )
+#ifdef CONFIG_LPS_SLOW_TRANSITION                      
+                       (pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod > 2) 
+#else //CONFIG_LPS_SLOW_TRANSITION
+                       (pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod > 4) 
+#endif //CONFIG_LPS_SLOW_TRANSITION
+                       )
                {
                        //DBG_871X("(-)Tx = %d, Rx = %d \n",pmlmepriv->LinkDetectInfo.NumTxOkInPeriod,pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod);
                        bEnterPS= _FALSE;
-
+#ifdef CONFIG_LPS_SLOW_TRANSITION
                        if(bBusyTraffic == _TRUE)
                        {
                                if(pmlmepriv->LinkDetectInfo.TrafficTransitionCount <= 4)
@@ -2402,11 +2505,13 @@ u8 traffic_status_watchdog(_adapter *padapter, u8 from_timer)
                                        pmlmepriv->LinkDetectInfo.TrafficTransitionCount = 30;
                                }       
                        }
+#endif //CONFIG_LPS_SLOW_TRANSITION
+       
                }
                else
                {
                        //DBG_871X("(+)Tx = %d, Rx = %d \n",pmlmepriv->LinkDetectInfo.NumTxOkInPeriod,pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod);
-
+#ifdef CONFIG_LPS_SLOW_TRANSITION
                        if(pmlmepriv->LinkDetectInfo.TrafficTransitionCount>=2)
                                pmlmepriv->LinkDetectInfo.TrafficTransitionCount -=2;
                        else
@@ -2414,6 +2519,9 @@ u8 traffic_status_watchdog(_adapter *padapter, u8 from_timer)
 
                        if(pmlmepriv->LinkDetectInfo.TrafficTransitionCount == 0)
                                bEnterPS= _TRUE;
+#else //CONFIG_LPS_SLOW_TRANSITION
+                               bEnterPS= _TRUE;
+#endif //CONFIG_LPS_SLOW_TRANSITION
                }
 
 #ifdef CONFIG_DYNAMIC_DTIM
@@ -2530,8 +2638,9 @@ void dynamic_chk_wk_hdl(_adapter *padapter)
 
        //if(check_fwstate(pmlmepriv, _FW_UNDER_LINKING|_FW_UNDER_SURVEY)==_FALSE)
        {
-               linked_status_chk(padapter);    
+               linked_status_chk(padapter, 0); 
                traffic_status_watchdog(padapter, 0);
+               dm_DynamicUsbTxAgg(padapter, 0);
        }
 
 #ifdef CONFIG_BEAMFORMING
@@ -2624,6 +2733,16 @@ _func_enter_;
                        break;
                case LPS_CTRL_TRAFFIC_BUSY:
                        LPS_Leave(padapter, "LPS_CTRL_TRAFFIC_BUSY");
+                       break;
+               case LPS_CTRL_TX_TRAFFIC_LEAVE:
+                       LPS_Leave(padapter, "LPS_CTRL_TX_TRAFFIC_LEAVE");
+                       break;
+               case LPS_CTRL_RX_TRAFFIC_LEAVE:
+                       LPS_Leave(padapter, "LPS_CTRL_RX_TRAFFIC_LEAVE");
+                       break;
+               case LPS_CTRL_ENTER:
+                       LPS_Enter(padapter, "TRAFFIC_IDLE_1");
+                       break;
                default:
                        break;
        }
@@ -3053,8 +3172,6 @@ _func_exit_;
 
 #ifdef CONFIG_AP_MODE
 
-extern u32 g_wait_hiq_empty;
-
 static void rtw_chk_hi_queue_hdl(_adapter *padapter)
 {
        struct sta_info *psta_bmc;
@@ -3068,7 +3185,7 @@ static void rtw_chk_hi_queue_hdl(_adapter *padapter)
 
        rtw_hal_get_hwreg(padapter, HW_VAR_CHK_HI_QUEUE_EMPTY, &empty);
 
-       while(_FALSE == empty && rtw_get_passing_time_ms(start) < g_wait_hiq_empty)
+       while(_FALSE == empty && rtw_get_passing_time_ms(start) < rtw_get_wait_hiq_empty_ms())
        {
                rtw_msleep_os(100);
                rtw_hal_get_hwreg(padapter, HW_VAR_CHK_HI_QUEUE_EMPTY, &empty);
@@ -3087,7 +3204,7 @@ static void rtw_chk_hi_queue_hdl(_adapter *padapter)
                        pstapriv->sta_dz_bitmap &= ~BIT(0);
 
                        if (update_tim == _TRUE)
-                               update_beacon(padapter, _TIM_IE_, NULL, _TRUE);
+                               _update_beacon(padapter, _TIM_IE_, NULL, _TRUE, "bmc sleepq and HIQ empty");
                }
                else //re check again
                {
@@ -3134,6 +3251,147 @@ exit:
 }
 #endif
 
+#ifdef CONFIG_BT_COEXIST
+struct btinfo {
+       u8 cid;
+       u8 len;
+
+       u8 bConnection:1;
+       u8 bSCOeSCO:1;
+       u8 bInQPage:1;
+       u8 bACLBusy:1;
+       u8 bSCOBusy:1;
+       u8 bHID:1;
+       u8 bA2DP:1;
+       u8 bFTP:1;
+
+       u8 retry_cnt:4;
+       u8 rsvd_34:1;
+       u8 rsvd_35:1;
+       u8 rsvd_36:1;
+       u8 rsvd_37:1;
+
+       u8 rssi;
+
+       u8 rsvd_50:1;
+       u8 rsvd_51:1;
+       u8 rsvd_52:1;
+       u8 rsvd_53:1;
+       u8 rsvd_54:1;
+       u8 rsvd_55:1;
+       u8 eSCO_SCO:1;
+       u8 Master_Slave:1;
+
+       u8 rsvd_6;
+       u8 rsvd_7;
+};
+
+void btinfo_evt_dump(void *sel, void *buf)
+{
+       struct btinfo *info = (struct btinfo *)buf;
+       
+       DBG_871X_SEL_NL(sel, "cid:0x%02x, len:%u\n", info->cid, info->len);
+
+       if (info->len > 2)
+       DBG_871X_SEL_NL(sel, "byte2:%s%s%s%s%s%s%s%s\n"
+               , info->bConnection?"bConnection ":""
+               , info->bSCOeSCO?"bSCOeSCO ":""
+               , info->bInQPage?"bInQPage ":""
+               , info->bACLBusy?"bACLBusy ":""
+               , info->bSCOBusy?"bSCOBusy ":""
+               , info->bHID?"bHID ":""
+               , info->bA2DP?"bA2DP ":""
+               , info->bFTP?"bFTP":""
+       );
+
+       if (info->len > 3)
+       DBG_871X_SEL_NL(sel, "retry_cnt:%u\n", info->retry_cnt);
+
+       if (info->len > 4)
+       DBG_871X_SEL_NL(sel, "rssi:%u\n", info->rssi);
+
+       if (info->len > 5)
+       DBG_871X_SEL_NL(sel, "byte5:%s%s\n"
+               , info->eSCO_SCO?"eSCO_SCO ":""
+               , info->Master_Slave?"Master_Slave ":""
+       );
+}
+
+static void rtw_btinfo_hdl(_adapter *adapter, u8 *buf, u16 buf_len)
+{
+       #define BTINFO_WIFI_FETCH 0x23
+       #define BTINFO_BT_AUTO_RPT 0x27
+       struct btinfo *info = (struct btinfo *)buf;
+       u8 cmd_idx;
+       u8 len;
+
+       cmd_idx = info->cid;
+
+       if (info->len > buf_len-2) {
+               rtw_warn_on(1);
+               len = buf_len-2;
+       } else {
+               len = info->len;
+       }
+
+//#define DBG_PROC_SET_BTINFO_EVT
+#ifdef DBG_PROC_SET_BTINFO_EVT
+       btinfo_evt_dump(RTW_DBGDUMP, info);
+#endif
+
+       /* transform BT-FW btinfo to WiFI-FW C2H format and notify */
+       if (cmd_idx == BTINFO_WIFI_FETCH)
+               buf[1] = 0;
+       else if (cmd_idx == BTINFO_BT_AUTO_RPT)
+               buf[1] = 2;
+       rtw_btcoex_BtInfoNotify(adapter ,len+1, &buf[1]);
+}
+
+u8 rtw_btinfo_cmd(_adapter *adapter, u8 *buf, u16 len)
+{
+       struct cmd_obj *ph2c;
+       struct drvextra_cmd_parm *pdrvextra_cmd_parm;
+       u8 *btinfo;
+       struct cmd_priv *pcmdpriv = &adapter->cmdpriv;
+       u8      res = _SUCCESS;
+
+       ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
+       if (ph2c == NULL) {
+               res = _FAIL;
+               goto exit;
+       }
+
+       pdrvextra_cmd_parm = (struct drvextra_cmd_parm*)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
+       if (pdrvextra_cmd_parm == NULL) {
+               rtw_mfree((u8*)ph2c, sizeof(struct cmd_obj));
+               res = _FAIL;
+               goto exit;
+       }
+
+       btinfo = rtw_zmalloc(len);
+       if (btinfo == NULL) {
+               rtw_mfree((u8*)ph2c, sizeof(struct cmd_obj));
+               rtw_mfree((u8*)pdrvextra_cmd_parm, sizeof(struct drvextra_cmd_parm));
+               res = _FAIL;
+               goto exit;
+       }
+
+       pdrvextra_cmd_parm->ec_id = BTINFO_WK_CID;
+       pdrvextra_cmd_parm->type = 0;
+       pdrvextra_cmd_parm->size = len;
+       pdrvextra_cmd_parm->pbuf = btinfo;
+
+       _rtw_memcpy(btinfo, buf, len);
+
+       init_h2fwcmd_w_parm_no_rsp(ph2c, pdrvextra_cmd_parm, GEN_CMD_CODE(_Set_Drv_Extra));
+
+       res = rtw_enqueue_cmd(pcmdpriv, ph2c);
+
+exit:
+       return res;
+}
+#endif
+
 //#ifdef CONFIG_C2H_PACKET_EN
 u8 rtw_c2h_packet_wk_cmd(PADAPTER padapter, u8 *pbuf, u16 length)
 {
@@ -3207,6 +3465,42 @@ exit:
 }
 //#endif //CONFIG_C2H_PACKET_EN
 
+u8 rtw_run_in_thread_cmd(PADAPTER padapter, void (*func)(void*), void* context)
+{
+       struct cmd_priv *pcmdpriv;
+       struct cmd_obj *ph2c;
+       struct RunInThread_param *parm;
+       s32 res = _SUCCESS;
+
+_func_enter_;
+
+       pcmdpriv = &padapter->cmdpriv;
+
+       ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
+       if (NULL == ph2c) {
+               res = _FAIL;
+               goto exit;
+       }
+
+       parm = (struct RunInThread_param*)rtw_zmalloc(sizeof(struct RunInThread_param));
+       if (NULL == parm) {
+               rtw_mfree((u8*)ph2c, sizeof(struct cmd_obj));
+               res = _FAIL;
+               goto exit;
+       }
+
+       parm->func = func;
+       parm->context = context;
+       init_h2fwcmd_w_parm_no_rsp(ph2c, parm, GEN_CMD_CODE(_RunInThreadCMD));
+
+       res = rtw_enqueue_cmd(pcmdpriv, ph2c);
+exit:
+
+_func_exit_;
+
+       return res;
+}
+
 s32 c2h_evt_hdl(_adapter *adapter, u8 *c2h_evt, c2h_id_filter filter)
 {
        s32 ret = _FAIL;
@@ -3366,7 +3660,11 @@ u8 rtw_drvextra_cmd_hdl(_adapter *padapter, unsigned char *pbuf)
                case DM_RA_MSK_WK_CID:
                        rtw_dm_ra_mask_hdl(padapter, (struct sta_info *)pdrvextra_cmd->pbuf);
                        break;
-
+#ifdef CONFIG_BT_COEXIST
+               case BTINFO_WK_CID:
+                       rtw_btinfo_hdl(padapter ,pdrvextra_cmd->pbuf, pdrvextra_cmd->size);
+                       break;
+#endif
                default:
                        break;
        }
@@ -3404,16 +3702,16 @@ _func_exit_;
 void rtw_disassoc_cmd_callback(_adapter*       padapter,  struct cmd_obj *pcmd)
 {
        _irqL   irqL;
-       struct  mlme_priv *pmlmepriv = &padapter->mlmepriv;
-
-_func_enter_;
+       struct  mlme_priv *pmlmepriv = &padapter->mlmepriv;
+       
+_func_enter_;  
 
        if (pcmd->res != H2C_SUCCESS)
        {
                _enter_critical_bh(&pmlmepriv->lock, &irqL);
                set_fwstate(pmlmepriv, _FW_LINKED);
                _exit_critical_bh(&pmlmepriv->lock, &irqL);
-
+                               
                RT_TRACE(_module_rtl871x_cmd_c_,_drv_err_,("\n ***Error: disconnect_cmd_callback Fail ***\n."));
 
                goto exit;
@@ -3425,16 +3723,16 @@ _func_enter_;
 
        // free cmd
        rtw_free_cmd_obj(pcmd);
-
+       
 exit:
-
-_func_exit_;
+       
+_func_exit_;   
 }
 
 
 void rtw_joinbss_cmd_callback(_adapter*        padapter,  struct cmd_obj *pcmd)
 {
-       struct  mlme_priv       *pmlmepriv = &padapter->mlmepriv;
+       struct  mlme_priv *pmlmepriv = &padapter->mlmepriv;
        struct  mlme_ext_priv   *pmlmeext = &padapter->mlmeextpriv;
        struct  mlme_ext_info   *pmlmeinfo = &(pmlmeext->mlmext_info);
        u16     val;