rtlwifi: btcoex: let btcoex get wifi rssi and link status

Instead of rssi status, the btcoex also needs to get the link status of
the wifi. In addition, some of the rssi status can be merged into link
status.

Signed-off-by: Yan-Hsuan Chuang <yhchuang@realtek.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Ping-Ke Shih <pkshih@realtek.com>
Cc: Birming Chiu <birming@realtek.com>
Cc: Shaofu <shaofu@realtek.com>
Cc: Steven Ting <steventing@realtek.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c
index 53a43dfdecbab30735b6675c50a5bb839609461f..f00d6e6ab69b411755d4e864ccbcc98a10a3ace0 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c
@@ -36,6 +36,20 @@ u32 btc_dbg_type[BTC_MSG_MAX];
 /***************************************************
  *             Debug related function
  ***************************************************/
+
+const char *const gl_btc_wifi_bw_string[] = {
+       "11bg",
+       "HT20",
+       "HT40",
+       "HT80",
+       "HT160"
+};
+
+const char *const gl_btc_wifi_freq_string[] = {
+       "2.4G",
+       "5G"
+};
+
 static bool halbtc_is_bt_coexist_available(struct btc_coexist *btcoexist)
 {
        if (!btcoexist->binded || NULL == btcoexist->adapter)
@@ -54,28 +68,39 @@ static bool halbtc_is_wifi_busy(struct rtl_priv *rtlpriv)
 
 static void halbtc_dbg_init(void)
 {
-       u8 i;
-
-       for (i = 0; i < BTC_MSG_MAX; i++)
-               btc_dbg_type[i] = 0;
-
-       btc_dbg_type[BTC_MSG_INTERFACE] =
-/*                     INTF_INIT                               | */
-/*                     INTF_NOTIFY                             | */
-                       0;
+}
 
-       btc_dbg_type[BTC_MSG_ALGORITHM] =
-/*                     ALGO_BT_RSSI_STATE                      | */
-/*                     ALGO_WIFI_RSSI_STATE                    | */
-/*                     ALGO_BT_MONITOR                         | */
-/*                     ALGO_TRACE                              | */
-/*                     ALGO_TRACE_FW                           | */
-/*                     ALGO_TRACE_FW_DETAIL                    | */
-/*                     ALGO_TRACE_FW_EXEC                      | */
-/*                     ALGO_TRACE_SW                           | */
-/*                     ALGO_TRACE_SW_DETAIL                    | */
-/*                     ALGO_TRACE_SW_EXEC                      | */
-                       0;
+/***************************************************
+ *             helper function
+ ***************************************************/
+static bool is_any_client_connect_to_ap(struct btc_coexist *btcoexist)
+{
+       struct rtl_priv *rtlpriv = btcoexist->adapter;
+       struct rtl_mac *mac = rtl_mac(rtlpriv);
+       struct rtl_sta_info *drv_priv;
+       u8 cnt = 0;
+
+       if (mac->opmode == NL80211_IFTYPE_ADHOC ||
+           mac->opmode == NL80211_IFTYPE_MESH_POINT ||
+           mac->opmode == NL80211_IFTYPE_AP) {
+               if (in_interrupt() > 0) {
+                       list_for_each_entry(drv_priv, &rtlpriv->entry_list,
+                                           list) {
+                               cnt++;
+                       }
+               } else {
+                       spin_lock_bh(&rtlpriv->locks.entry_list_lock);
+                       list_for_each_entry(drv_priv, &rtlpriv->entry_list,
+                                           list) {
+                               cnt++;
+                       }
+                       spin_unlock_bh(&rtlpriv->locks.entry_list_lock);
+               }
+       }
+       if (cnt > 0)
+               return true;
+       else
+               return false;
 }
 
 static bool halbtc_is_bt40(struct rtl_priv *adapter)
@@ -188,12 +213,14 @@ static void halbtc_leave_lps(struct btc_coexist *btcoexist)
                           &ap_enable);
 
        if (ap_enable) {
-               pr_info("halbtc_leave_lps()<--dont leave lps under AP mode\n");
+               RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
+                        "%s()<--dont leave lps under AP mode\n", __func__);
                return;
        }
 
        btcoexist->bt_info.bt_ctrl_lps = true;
        btcoexist->bt_info.bt_lps_on = false;
+       rtl_lps_leave(rtlpriv->mac80211.hw);
 }
 
 static void halbtc_enter_lps(struct btc_coexist *btcoexist)
@@ -209,12 +236,14 @@ static void halbtc_enter_lps(struct btc_coexist *btcoexist)
                           &ap_enable);
 
        if (ap_enable) {
-               pr_info("halbtc_enter_lps()<--dont enter lps under AP mode\n");
+               RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
+                        "%s()<--dont enter lps under AP mode\n", __func__);
                return;
        }
 
        btcoexist->bt_info.bt_ctrl_lps = true;
        btcoexist->bt_info.bt_lps_on = false;
+       rtl_lps_enter(rtlpriv->mac80211.hw);
 }
 
 static void halbtc_normal_lps(struct btc_coexist *btcoexist)
@@ -233,12 +262,50 @@ static void halbtc_normal_low_power(struct btc_coexist *btcoexist)
 {
 }
 
-static void halbtc_disable_low_power(void)
+static void halbtc_disable_low_power(struct btc_coexist *btcoexist,
+                                    bool low_pwr_disable)
 {
+       /* TODO: original/leave 32k low power */
+       btcoexist->bt_info.bt_disable_low_pwr = low_pwr_disable;
 }
 
-static void halbtc_aggregation_check(void)
+static void halbtc_aggregation_check(struct btc_coexist *btcoexist)
 {
+       bool need_to_act = false;
+
+       /* To void continuous deleteBA=>addBA=>deleteBA=>addBA
+        * This function is not allowed to continuous called
+        * It can only be called after 8 seconds
+        */
+
+       if (btcoexist->bt_info.reject_agg_pkt) {
+               ;/* TODO: reject */
+               btcoexist->bt_info.pre_reject_agg_pkt =
+                       btcoexist->bt_info.reject_agg_pkt;
+       } else {
+               if (btcoexist->bt_info.pre_reject_agg_pkt) {
+                       need_to_act = true;
+                       btcoexist->bt_info.pre_reject_agg_pkt =
+                               btcoexist->bt_info.reject_agg_pkt;
+               }
+
+               if (btcoexist->bt_info.pre_bt_ctrl_agg_buf_size !=
+                   btcoexist->bt_info.bt_ctrl_agg_buf_size) {
+                       need_to_act = true;
+                       btcoexist->bt_info.pre_bt_ctrl_agg_buf_size =
+                               btcoexist->bt_info.bt_ctrl_agg_buf_size;
+               }
+
+               if (btcoexist->bt_info.bt_ctrl_agg_buf_size) {
+                       if (btcoexist->bt_info.pre_agg_buf_size !=
+                           btcoexist->bt_info.agg_buf_size) {
+                               need_to_act = true;
+                       }
+                       btcoexist->bt_info.pre_agg_buf_size =
+                               btcoexist->bt_info.agg_buf_size;
+               }
+       }
+
 }
 
 static u32 halbtc_get_bt_patch_version(struct btc_coexist *btcoexist)
@@ -246,10 +313,37 @@ static u32 halbtc_get_bt_patch_version(struct btc_coexist *btcoexist)
        return 0;
 }
 
-static s32 halbtc_get_wifi_rssi(struct rtl_priv *adapter)
+u32 halbtc_get_wifi_link_status(struct btc_coexist *btcoexist)
 {
-       struct rtl_priv *rtlpriv = adapter;
-       s32     undec_sm_pwdb = 0;
+       /* return value:
+        * [31:16] => connected port number
+        * [15:0]  => port connected bit define
+        */
+       struct rtl_priv *rtlpriv = btcoexist->adapter;
+       struct rtl_mac *mac = rtl_mac(rtlpriv);
+       u32 ret_val = 0;
+       u32 port_connected_status = 0, num_of_connected_port = 0;
+
+       if (mac->opmode == NL80211_IFTYPE_STATION &&
+           mac->link_state >= MAC80211_LINKED) {
+               port_connected_status |= WIFI_STA_CONNECTED;
+               num_of_connected_port++;
+       }
+       /* AP & ADHOC & MESH */
+       if (is_any_client_connect_to_ap(btcoexist)) {
+               port_connected_status |= WIFI_AP_CONNECTED;
+               num_of_connected_port++;
+       }
+       /* TODO: P2P Connected Status */
+
+       ret_val = (num_of_connected_port << 16) | port_connected_status;
+
+       return ret_val;
+}
+
+static s32 halbtc_get_wifi_rssi(struct rtl_priv *rtlpriv)
+{
+       int undec_sm_pwdb = 0;
 
        if (rtlpriv->mac80211.link_state >= MAC80211_LINKED)
                undec_sm_pwdb = rtlpriv->dm.undec_sm_pwdb;
@@ -282,7 +376,10 @@ static bool halbtc_get(void *void_btcoexist, u8 get_type, void *out_buf)
                *bool_tmp = false;
                break;
        case BTC_GET_BL_WIFI_CONNECTED:
-               if (rtlpriv->mac80211.link_state >= MAC80211_LINKED)
+               if (rtlpriv->mac80211.opmode == NL80211_IFTYPE_STATION &&
+                   rtlpriv->mac80211.link_state >= MAC80211_LINKED)
+                       tmp = true;
+               if (is_any_client_connect_to_ap(btcoexist))
                        tmp = true;
                *bool_tmp = tmp;
                break;
@@ -304,28 +401,18 @@ static bool halbtc_get(void *void_btcoexist, u8 get_type, void *out_buf)
                else
                        *bool_tmp = false;
                break;
-       case BTC_GET_BL_WIFI_ROAM:      /*TODO*/
+       case BTC_GET_BL_WIFI_ROAM:
                if (mac->link_state == MAC80211_LINKING)
                        *bool_tmp = true;
                else
                        *bool_tmp = false;
                break;
-       case BTC_GET_BL_WIFI_4_WAY_PROGRESS:    /*TODO*/
-                       *bool_tmp = false;
-
-               break;
-       case BTC_GET_BL_WIFI_UNDER_5G:
-               *bool_tmp = false; /*TODO*/
-
-       case BTC_GET_BL_WIFI_DHCP:      /*TODO*/
-               break;
-       case BTC_GET_BL_WIFI_SOFTAP_IDLE:
-               *bool_tmp = true;
-               break;
-       case BTC_GET_BL_WIFI_SOFTAP_LINKING:
+       case BTC_GET_BL_WIFI_4_WAY_PROGRESS:
+               /* TODO */
                *bool_tmp = false;
                break;
-       case BTC_GET_BL_WIFI_IN_EARLY_SUSPEND:
+       case BTC_GET_BL_WIFI_UNDER_5G:
+               /* TODO */
                *bool_tmp = false;
                break;
        case BTC_GET_BL_WIFI_AP_MODE_ENABLE:
@@ -338,15 +425,25 @@ static bool halbtc_get(void *void_btcoexist, u8 get_type, void *out_buf)
                        *bool_tmp = true;
                break;
        case BTC_GET_BL_WIFI_UNDER_B_MODE:
-               *bool_tmp = false; /*TODO*/
+               if (rtlpriv->mac80211.mode == WIRELESS_MODE_B)
+                       *bool_tmp = true;
+               else
+                       *bool_tmp = false;
                break;
        case BTC_GET_BL_EXT_SWITCH:
                *bool_tmp = false;
                break;
+       case BTC_GET_BL_WIFI_IS_IN_MP_MODE:
+               *bool_tmp = false;
+               break;
+       case BTC_GET_BL_IS_ASUS_8723B:
+               *bool_tmp = false;
+               break;
        case BTC_GET_S4_WIFI_RSSI:
                *s32_tmp = halbtc_get_wifi_rssi(rtlpriv);
                break;
-       case BTC_GET_S4_HS_RSSI:        /*TODO*/
+       case BTC_GET_S4_HS_RSSI:
+               /* TODO */
                *s32_tmp = halbtc_get_wifi_rssi(rtlpriv);
                break;
        case BTC_GET_U4_WIFI_BW:
@@ -359,7 +456,10 @@ static bool halbtc_get(void *void_btcoexist, u8 get_type, void *out_buf)
                        *u32_tmp = BTC_WIFI_TRAFFIC_RX;
                break;
        case BTC_GET_U4_WIFI_FW_VER:
-               *u32_tmp = rtlhal->fw_version;
+               *u32_tmp = (rtlhal->fw_version << 16) | rtlhal->fw_subversion;
+               break;
+       case BTC_GET_U4_WIFI_LINK_STATUS:
+               *u32_tmp = halbtc_get_wifi_link_status(btcoexist);
                break;
        case BTC_GET_U4_BT_PATCH_VER:
                *u32_tmp = halbtc_get_bt_patch_version(btcoexist);
@@ -374,10 +474,19 @@ static bool halbtc_get(void *void_btcoexist, u8 get_type, void *out_buf)
                *u8_tmp = halbtc_get_wifi_central_chnl(btcoexist);
                break;
        case BTC_GET_U1_WIFI_HS_CHNL:
-               *u8_tmp = 1;/*BT_OperateChnl(rtlpriv);*/
+               *u8_tmp = 1;
                break;
-       case BTC_GET_U1_MAC_PHY_MODE:
-               *u8_tmp = BTC_MP_UNKNOWN;
+       case BTC_GET_U1_AP_NUM:
+               /* driver do not know AP num,
+                * so the return value here is not right
+                */
+               *u8_tmp = 1;
+               break;
+       case BTC_GET_U1_ANT_TYPE:
+               *u8_tmp = (u8)BTC_ANT_TYPE_0;
+               break;
+       case BTC_GET_U1_IOT_PEER:
+               *u8_tmp = 0;
                break;
 
                /************* 1Ant **************/
@@ -420,11 +529,17 @@ static bool halbtc_set(void *void_btcoexist, u8 set_type, void *in_buf)
                btcoexist->bt_info.reject_agg_pkt = *bool_tmp;
                break;
        case BTC_SET_BL_BT_CTRL_AGG_SIZE:
-               btcoexist->bt_info.bt_ctrl_buf_size = *bool_tmp;
+               btcoexist->bt_info.bt_ctrl_agg_buf_size = *bool_tmp;
                break;
        case BTC_SET_BL_INC_SCAN_DEV_NUM:
                btcoexist->bt_info.increase_scan_dev_num = *bool_tmp;
                break;
+       case BTC_SET_BL_BT_TX_RX_MASK:
+               btcoexist->bt_info.bt_tx_rx_mask = *bool_tmp;
+               break;
+       case BTC_SET_BL_MIRACAST_PLUS_BT:
+               btcoexist->bt_info.miracast_plus_bt = *bool_tmp;
+               break;
                /* set some u1Byte type variables. */
        case BTC_SET_U1_RSSI_ADJ_VAL_FOR_AGC_TABLE_ON:
                btcoexist->bt_info.rssi_adjust_for_agc_table_on = *u8_tmp;
@@ -432,25 +547,24 @@ static bool halbtc_set(void *void_btcoexist, u8 set_type, void *in_buf)
        case BTC_SET_U1_AGG_BUF_SIZE:
                btcoexist->bt_info.agg_buf_size = *u8_tmp;
                break;
-               /* the following are some action which will be triggered */
+
+       /* the following are some action which will be triggered */
        case BTC_SET_ACT_GET_BT_RSSI:
-               /*BTHCI_SendGetBtRssiEvent(rtlpriv);*/
                break;
        case BTC_SET_ACT_AGGREGATE_CTRL:
-               halbtc_aggregation_check();
+               halbtc_aggregation_check(btcoexist);
                break;
 
-               /* 1Ant */
+       /* 1Ant */
        case BTC_SET_U1_RSSI_ADJ_VAL_FOR_1ANT_COEX_TYPE:
                btcoexist->bt_info.rssi_adjust_for_1ant_coex_type = *u8_tmp;
                break;
        case BTC_SET_UI_SCAN_SIG_COMPENSATION:
-       /*      rtlpriv->mlmepriv.scan_compensation = *u8_tmp;  */
                break;
-       case BTC_SET_U1_1ANT_LPS:
+       case BTC_SET_U1_LPS_VAL:
                btcoexist->bt_info.lps_val = *u8_tmp;
                break;
-       case BTC_SET_U1_1ANT_RPWM:
+       case BTC_SET_U1_RPWM_VAL:
                btcoexist->bt_info.rpwm_val = *u8_tmp;
                break;
        /* the following are some action which will be triggered  */
@@ -464,20 +578,19 @@ static bool halbtc_set(void *void_btcoexist, u8 set_type, void *in_buf)
                halbtc_normal_lps(btcoexist);
                break;
        case BTC_SET_ACT_DISABLE_LOW_POWER:
-               halbtc_disable_low_power();
+               halbtc_disable_low_power(btcoexist, *bool_tmp);
                break;
        case BTC_SET_ACT_UPDATE_RAMASK:
                btcoexist->bt_info.ra_mask = *u32_tmp;
                break;
        case BTC_SET_ACT_SEND_MIMO_PS:
                break;
-       case BTC_SET_ACT_INC_FORCE_EXEC_PWR_CMD_CNT:
-               btcoexist->bt_info.force_exec_pwr_cmd_cnt++;
-               break;
        case BTC_SET_ACT_CTRL_BT_INFO: /*wait for 8812/8821*/
                break;
        case BTC_SET_ACT_CTRL_BT_COEX:
                break;
+       case BTC_SET_ACT_CTRL_8723B_ANT:
+               break;
        default:
                break;
        }
@@ -558,6 +671,35 @@ static void halbtc_write_4byte(void *bt_context, u32 reg_addr, u32 data)
        rtl_write_dword(rtlpriv, reg_addr, data);
 }
 
+void halbtc_write_local_reg_1byte(void *btc_context, u32 reg_addr, u8 data)
+{
+       struct btc_coexist *btcoexist = (struct btc_coexist *)btc_context;
+       struct rtl_priv *rtlpriv = btcoexist->adapter;
+
+       if (btcoexist->chip_interface == BTC_INTF_SDIO)
+               ;
+       else if (btcoexist->chip_interface == BTC_INTF_PCI)
+               rtl_write_byte(rtlpriv, reg_addr, data);
+       else if (btcoexist->chip_interface == BTC_INTF_USB)
+               rtl_write_byte(rtlpriv, reg_addr, data);
+}
+
+void halbtc_set_macreg(void *btc_context, u32 reg_addr, u32 bit_mask, u32 data)
+{
+       struct btc_coexist *btcoexist = (struct btc_coexist *)btc_context;
+       struct rtl_priv *rtlpriv = btcoexist->adapter;
+
+       rtl_set_bbreg(rtlpriv->mac80211.hw, reg_addr, bit_mask, data);
+}
+
+u32 halbtc_get_macreg(void *btc_context, u32 reg_addr, u32 bit_mask)
+{
+       struct btc_coexist *btcoexist = (struct btc_coexist *)btc_context;
+       struct rtl_priv *rtlpriv = btcoexist->adapter;
+
+       return rtl_get_bbreg(rtlpriv->mac80211.hw, reg_addr, bit_mask);
+}
+
 static void halbtc_set_bbreg(void *bt_context, u32 reg_addr, u32 bit_mask,
                             u32 data)
 {
@@ -603,6 +745,37 @@ static void halbtc_fill_h2c_cmd(void *bt_context, u8 element_id,
                                        cmd_len, cmd_buf);
 }
 
+void halbtc_set_bt_reg(void *btc_context, u8 reg_type, u32 offset, u32 set_val)
+{
+       struct btc_coexist *btcoexist = (struct btc_coexist *)btc_context;
+       struct rtl_priv *rtlpriv = btcoexist->adapter;
+       u8 cmd_buffer1[4] = {0};
+       u8 cmd_buffer2[4] = {0};
+       u8 *addr_to_set = (u8 *)&offset;
+       u8 *value_to_set = (u8 *)&set_val;
+       u8 oper_ver = 0;
+       u8 req_num = 0;
+
+       if (IS_HARDWARE_TYPE_8723B(btcoexist->adapter)) {
+               cmd_buffer1[0] |= (oper_ver & 0x0f);    /* Set OperVer */
+               cmd_buffer1[0] |= ((req_num << 4) & 0xf0);      /* Set ReqNum */
+               cmd_buffer1[1] = 0x0d;  /* OpCode: BT_LO_OP_WRITE_REG_VALUE */
+               cmd_buffer1[2] = value_to_set[0];       /* Set WriteRegValue */
+               rtlpriv->cfg->ops->fill_h2c_cmd(rtlpriv->mac80211.hw, 0x67, 4,
+                                               &cmd_buffer1[0]);
+
+               msleep(200);
+               req_num++;
+
+               cmd_buffer2[0] |= (oper_ver & 0x0f);    /* Set OperVer */
+               cmd_buffer2[0] |= ((req_num << 4) & 0xf0);      /* Set ReqNum */
+               cmd_buffer2[1] = 0x0c;  /* OpCode: BT_LO_OP_WRITE_REG_ADDR */
+               cmd_buffer2[3] = addr_to_set[0];        /* Set WriteRegAddr */
+               rtlpriv->cfg->ops->fill_h2c_cmd(rtlpriv->mac80211.hw, 0x67, 4,
+                                               &cmd_buffer2[0]);
+       }
+}
+
 bool halbtc_under_ips(struct btc_coexist *btcoexist)
 {
        struct rtl_priv *rtlpriv = btcoexist->adapter;
@@ -624,26 +797,14 @@ bool halbtc_under_ips(struct btc_coexist *btcoexist)
 /*****************************************************************
  *         Extern functions called by other module
  *****************************************************************/
-bool exhalbtc_initlize_variables(struct rtl_priv *adapter)
+bool exhalbtc_initlize_variables(void)
 {
        struct btc_coexist *btcoexist = &gl_bt_coexist;
 
-       btcoexist->statistics.cnt_bind++;
-
        halbtc_dbg_init();
 
-       if (btcoexist->binded)
-               return false;
-       else
-               btcoexist->binded = true;
-
        btcoexist->chip_interface = BTC_INTF_UNKNOWN;
 
-       if (NULL == btcoexist->adapter)
-               btcoexist->adapter = adapter;
-
-       btcoexist->stack_info.profile_notified = false;
-
        btcoexist->btc_read_1byte = halbtc_read_1byte;
        btcoexist->btc_write_1byte = halbtc_write_1byte;
        btcoexist->btc_write_1byte_bitmask = halbtc_bitmask_write_1byte;
@@ -651,6 +812,7 @@ bool exhalbtc_initlize_variables(struct rtl_priv *adapter)
        btcoexist->btc_write_2byte = halbtc_write_2byte;
        btcoexist->btc_read_4byte = halbtc_read_4byte;
        btcoexist->btc_write_4byte = halbtc_write_4byte;
+       btcoexist->btc_write_local_reg_1byte = halbtc_write_local_reg_1byte;
 
        btcoexist->btc_set_bb_reg = halbtc_set_bbreg;
        btcoexist->btc_get_bb_reg = halbtc_get_bbreg;
@@ -662,6 +824,8 @@ bool exhalbtc_initlize_variables(struct rtl_priv *adapter)
 
        btcoexist->btc_get = halbtc_get;
        btcoexist->btc_set = halbtc_set;
+       btcoexist->btc_set_bt_reg = halbtc_set_bt_reg;
+
 
        btcoexist->bt_info.bt_ctrl_buf_size = false;
        btcoexist->bt_info.agg_buf_size = 5;
@@ -1240,11 +1404,6 @@ void exhalbtc_set_bt_patch_version(u16 bt_hci_version, u16 bt_patch_version)
        btcoexist->bt_info.bt_hci_ver = bt_hci_version;
 }
 
-void exhalbtc_set_bt_exist(bool bt_exist)
-{
-       gl_bt_coexist.board_info.bt_exist = bt_exist;
-}
-
 void exhalbtc_set_chip_type(u8 chip_type)
 {
        switch (chip_type) {
@@ -1278,25 +1437,8 @@ void exhalbtc_set_ant_num(struct rtl_priv *rtlpriv, u8 type, u8 ant_num)
        if (BT_COEX_ANT_TYPE_PG == type) {
                gl_bt_coexist.board_info.pg_ant_num = ant_num;
                gl_bt_coexist.board_info.btdm_ant_num = ant_num;
-               /* The antenna position:
-                * Main (default) or Aux for pgAntNum=2 && btdmAntNum =1.
-                * The antenna position should be determined by
-                * auto-detect mechanism.
-                * The following is assumed to main,
-                * and those must be modified
-                * if y auto-detect mechanism is ready
-                */
-               if ((gl_bt_coexist.board_info.pg_ant_num == 2) &&
-                   (gl_bt_coexist.board_info.btdm_ant_num == 1))
-                       gl_bt_coexist.board_info.btdm_ant_pos =
-                                                      BTC_ANTENNA_AT_MAIN_PORT;
-               else
-                       gl_bt_coexist.board_info.btdm_ant_pos =
-                                                      BTC_ANTENNA_AT_MAIN_PORT;
        } else if (BT_COEX_ANT_TYPE_ANTDIV == type) {
                gl_bt_coexist.board_info.btdm_ant_num = ant_num;
-               gl_bt_coexist.board_info.btdm_ant_pos =
-                                                      BTC_ANTENNA_AT_MAIN_PORT;
        } else if (type == BT_COEX_ANT_TYPE_DETECTED) {
                gl_bt_coexist.board_info.btdm_ant_num = ant_num;
                if (rtlpriv->cfg->mod_params->ant_sel == 1)
@@ -1316,11 +1458,25 @@ void exhalbtc_set_single_ant_path(u8 single_ant_path)
 
 void exhalbtc_display_bt_coex_info(struct btc_coexist *btcoexist)
 {
-       struct rtl_priv *rtlpriv = btcoexist->adapter;
-       struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
        if (!halbtc_is_bt_coexist_available(btcoexist))
                return;
 
-       if (rtlhal->hw_type == HARDWARE_TYPE_RTL8723BE)
-               ex_btc8723b2ant_display_coex_info(btcoexist);
+       halbtc_leave_low_power(btcoexist);
+
+       if (IS_HARDWARE_TYPE_8821(btcoexist->adapter)) {
+               if (btcoexist->board_info.btdm_ant_num == 2)
+                       ex_btc8821a2ant_display_coex_info(btcoexist);
+               else if (btcoexist->board_info.btdm_ant_num == 1)
+                       ex_btc8821a1ant_display_coex_info(btcoexist);
+       } else if (IS_HARDWARE_TYPE_8723B(btcoexist->adapter)) {
+               if (btcoexist->board_info.btdm_ant_num == 2)
+                       ex_btc8723b2ant_display_coex_info(btcoexist);
+               else if (btcoexist->board_info.btdm_ant_num == 1)
+                       ex_btc8723b1ant_display_coex_info(btcoexist);
+       } else if (IS_HARDWARE_TYPE_8192E(btcoexist->adapter)) {
+               if (btcoexist->board_info.btdm_ant_num == 2)
+                       ex_btc8192e2ant_display_coex_info(btcoexist);
+       }
+
+       halbtc_normal_low_power(btcoexist);
 }

diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h
index 3d34cf83d7fc4c12be5a0cf67a0ae34a095fa852..32cbbd0595ed1c21f899a6981246e78cb2d5b4de 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h
@@ -218,6 +218,26 @@ enum btc_iot_peer {
        BTC_IOT_PEER_MAX,
 };
 
+/* for 8723b-d cut large current issue */
+enum bt_wifi_coex_state {
+       BTC_WIFI_STAT_INIT,
+       BTC_WIFI_STAT_IQK,
+       BTC_WIFI_STAT_NORMAL_OFF,
+       BTC_WIFI_STAT_MP_OFF,
+       BTC_WIFI_STAT_NORMAL,
+       BTC_WIFI_STAT_ANT_DIV,
+       BTC_WIFI_STAT_MAX
+};
+
+enum bt_ant_type {
+       BTC_ANT_TYPE_0,
+       BTC_ANT_TYPE_1,
+       BTC_ANT_TYPE_2,
+       BTC_ANT_TYPE_3,
+       BTC_ANT_TYPE_4,
+       BTC_ANT_TYPE_MAX
+};
+
 enum btc_get_type {
        /* type bool */
        BTC_GET_BL_HS_OPERATION,
@@ -238,6 +258,9 @@ enum btc_get_type {
        BTC_GET_BL_WIFI_UNDER_B_MODE,
        BTC_GET_BL_EXT_SWITCH,
        BTC_GET_BL_WIFI_IS_IN_MP_MODE,
+       BTC_GET_BL_IS_ASUS_8723B,
+       BTC_GET_BL_FW_READY,
+       BTC_GET_BL_RF4CE_CONNECTED,
 
        /* type s4Byte */
        BTC_GET_S4_WIFI_RSSI,
@@ -250,6 +273,11 @@ enum btc_get_type {
        BTC_GET_U4_WIFI_LINK_STATUS,
        BTC_GET_U4_BT_PATCH_VER,
        BTC_GET_U4_VENDOR,
+       BTC_GET_U4_SUPPORTED_VERSION,
+       BTC_GET_U4_SUPPORTED_FEATURE,
+       BTC_GET_U4_WIFI_IQK_TOTAL,
+       BTC_GET_U4_WIFI_IQK_OK,
+       BTC_GET_U4_WIFI_IQK_FAIL,
 
        /* type u1Byte */
        BTC_GET_U1_WIFI_DOT11_CHNL,
@@ -257,6 +285,7 @@ enum btc_get_type {
        BTC_GET_U1_WIFI_HS_CHNL,
        BTC_GET_U1_MAC_PHY_MODE,
        BTC_GET_U1_AP_NUM,
+       BTC_GET_U1_ANT_TYPE,
        BTC_GET_U1_IOT_PEER,
 
        /* for 1Ant */
@@ -316,6 +345,7 @@ enum btc_set_type {
        /* BT Coex related */
        BTC_SET_ACT_CTRL_BT_INFO,
        BTC_SET_ACT_CTRL_BT_COEX,
+       BTC_SET_ACT_CTRL_8723B_ANT,
        /***************************/
        BTC_SET_MAX
 };
@@ -569,7 +599,7 @@ bool halbtc_is_wifi_uplink(struct rtl_priv *adapter);
 
 extern struct btc_coexist gl_bt_coexist;
 
-bool exhalbtc_initlize_variables(struct rtl_priv *adapter);
+bool exhalbtc_initlize_variables(void);
 void exhalbtc_init_hw_config(struct btc_coexist *btcoexist);
 void exhalbtc_init_coex_dm(struct btc_coexist *btcoexist);
 void exhalbtc_ips_notify(struct btc_coexist *btcoexist, u8 type);

diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.c
index dec9d83f87af5b2909e2c13030df350ce034f023..3ab0cfe26513f0d5360496d9c4b58bcb48b3e335 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.c
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.c
@@ -49,7 +49,7 @@ static struct rtl_btc_ops rtl_btc_operation = {
 
 void rtl_btc_init_variables(struct rtl_priv *rtlpriv)
 {
-       exhalbtc_initlize_variables(rtlpriv);
+       exhalbtc_initlize_variables();
 }
 
 void rtl_btc_init_hal_vars(struct rtl_priv *rtlpriv)
@@ -105,7 +105,9 @@ void rtl_btc_periodical(struct rtl_priv *rtlpriv)
 
 void rtl_btc_halt_notify(void)
 {
-       exhalbtc_halt_notify(&gl_bt_coexist);
+       struct btc_coexist *btcoexist = &gl_bt_coexist;
+
+       exhalbtc_halt_notify(btcoexist);
 }
 
 void rtl_btc_btinfo_notify(struct rtl_priv *rtlpriv, u8 *tmp_buf, u8 length)