aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Finger <Larry.Finger@lwfinger.net>2014-09-12 16:50:58 -0400
committerJohn W. Linville <linville@tuxdriver.com>2014-09-15 15:00:53 -0400
commit5eef40e5687da4ad0123e231e4fe952a12655f0b (patch)
treed4b25e8a99c9ae7791592413263cace4bcddb987
parent737f657f71b6e4bcb07478eb0a32eb92c80eaf4b (diff)
rtlwifi: btcoexist: Change local debugging macros CL_*** into the standard varieties
Macros CL_SNPRINTF and CL_PRINTF are always used in that order. The first formats info into a buffer, and the second dumps it with printk. As the debug system in rtlwifi has a macro that does this with a single call, it seems reasonable to use it instead. An additional benefit is that the debug level can be set when loading the driver used by the wifi device. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat
-rw-r--r--drivers/net/wireless/rtlwifi/btcoexist/halbtc8192e2ant.c119
-rw-r--r--drivers/net/wireless/rtlwifi/btcoexist/halbtc8723b1ant.c125
-rw-r--r--drivers/net/wireless/rtlwifi/btcoexist/halbtc8723b2ant.c105
-rw-r--r--drivers/net/wireless/rtlwifi/btcoexist/halbtc8821a1ant.c122
-rw-r--r--drivers/net/wireless/rtlwifi/btcoexist/halbtc8821a2ant.c107
-rw-r--r--drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c3
-rw-r--r--drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h4
7 files changed, 194 insertions, 391 deletions
diff --git a/drivers/net/wireless/rtlwifi/btcoexist/halbtc8192e2ant.c b/drivers/net/wireless/rtlwifi/btcoexist/halbtc8192e2ant.c
index af3f604d0bd5..53261d6f8578 100644
--- a/drivers/net/wireless/rtlwifi/btcoexist/halbtc8192e2ant.c
+++ b/drivers/net/wireless/rtlwifi/btcoexist/halbtc8192e2ant.c
@@ -3305,7 +3305,7 @@ void ex_halbtc8192e2ant_display_coex_info(struct btc_coexist *btcoexist)
3305{ 3305{
3306 struct btc_board_info *board_info = &btcoexist->board_info; 3306 struct btc_board_info *board_info = &btcoexist->board_info;
3307 struct btc_stack_info *stack_info = &btcoexist->stack_info; 3307 struct btc_stack_info *stack_info = &btcoexist->stack_info;
3308 u8 *cli_buf = btcoexist->cli_buf; 3308 struct rtl_priv *rtlpriv = btcoexist->adapter;
3309 u8 u8tmp[4], i, bt_info_ext, ps_tdma_case = 0; 3309 u8 u8tmp[4], i, bt_info_ext, ps_tdma_case = 0;
3310 u16 u16tmp[4]; 3310 u16 u16tmp[4];
3311 u32 u32tmp[4]; 3311 u32 u32tmp[4];
@@ -3316,87 +3316,75 @@ void ex_halbtc8192e2ant_display_coex_info(struct btc_coexist *btcoexist)
3316 u8 wifi_dot11_chnl, wifi_hs_chnl; 3316 u8 wifi_dot11_chnl, wifi_hs_chnl;
3317 u32 fw_ver = 0, bt_patch_ver = 0; 3317 u32 fw_ver = 0, bt_patch_ver = 0;
3318 3318
3319 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 3319 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
3320 "\r\n ============[BT Coexist info]============"); 3320 "\r\n ============[BT Coexist info]============");
3321 CL_PRINTF(cli_buf);
3322 3321
3323 if (btcoexist->manual_control) { 3322 if (btcoexist->manual_control) {
3324 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 3323 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
3325 "\r\n ===========[Under Manual Control]==========="); 3324 "\r\n ===========[Under Manual Control]===========");
3326 CL_PRINTF(cli_buf); 3325 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
3327 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE,
3328 "\r\n =========================================="); 3326 "\r\n ==========================================");
3329 CL_PRINTF(cli_buf);
3330 } 3327 }
3331 3328
3332 if (!board_info->bt_exist) { 3329 if (!board_info->bt_exist) {
3333 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n BT not exists !!!"); 3330 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n BT not exists !!!");
3334 CL_PRINTF(cli_buf);
3335 return; 3331 return;
3336 } 3332 }
3337 3333
3338 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 3334 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
3339 "\r\n %-35s = %d/ %d ", "Ant PG number/ Ant mechanism:", 3335 "\r\n %-35s = %d/ %d ", "Ant PG number/ Ant mechanism:",
3340 board_info->pg_ant_num, board_info->btdm_ant_num); 3336 board_info->pg_ant_num, board_info->btdm_ant_num);
3341 CL_PRINTF(cli_buf);
3342 3337
3343 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %s / %d", 3338 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %s / %d",
3344 "BT stack/ hci ext ver", 3339 "BT stack/ hci ext ver",
3345 ((stack_info->profile_notified) ? "Yes" : "No"), 3340 ((stack_info->profile_notified) ? "Yes" : "No"),
3346 stack_info->hci_version); 3341 stack_info->hci_version);
3347 CL_PRINTF(cli_buf);
3348 3342
3349 btcoexist->btc_get(btcoexist, BTC_GET_U4_BT_PATCH_VER, &bt_patch_ver); 3343 btcoexist->btc_get(btcoexist, BTC_GET_U4_BT_PATCH_VER, &bt_patch_ver);
3350 btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_FW_VER, &fw_ver); 3344 btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_FW_VER, &fw_ver);
3351 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 3345 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
3352 "\r\n %-35s = %d_%d/ 0x%x/ 0x%x(%d)", 3346 "\r\n %-35s = %d_%d/ 0x%x/ 0x%x(%d)",
3353 "CoexVer/ FwVer/ PatchVer", 3347 "CoexVer/ FwVer/ PatchVer",
3354 glcoex_ver_date_8192e_2ant, glcoex_ver_8192e_2ant, 3348 glcoex_ver_date_8192e_2ant, glcoex_ver_8192e_2ant,
3355 fw_ver, bt_patch_ver, bt_patch_ver); 3349 fw_ver, bt_patch_ver, bt_patch_ver);
3356 CL_PRINTF(cli_buf);
3357 3350
3358 btcoexist->btc_get(btcoexist, BTC_GET_BL_HS_OPERATION, &bt_hson); 3351 btcoexist->btc_get(btcoexist, BTC_GET_BL_HS_OPERATION, &bt_hson);
3359 btcoexist->btc_get(btcoexist, BTC_GET_U1_WIFI_DOT11_CHNL, 3352 btcoexist->btc_get(btcoexist, BTC_GET_U1_WIFI_DOT11_CHNL,
3360 &wifi_dot11_chnl); 3353 &wifi_dot11_chnl);
3361 btcoexist->btc_get(btcoexist, BTC_GET_U1_WIFI_HS_CHNL, &wifi_hs_chnl); 3354 btcoexist->btc_get(btcoexist, BTC_GET_U1_WIFI_HS_CHNL, &wifi_hs_chnl);
3362 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %d / %d(%d)", 3355 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %d / %d(%d)",
3363 "Dot11 channel / HsMode(HsChnl)", 3356 "Dot11 channel / HsMode(HsChnl)",
3364 wifi_dot11_chnl, bt_hson, wifi_hs_chnl); 3357 wifi_dot11_chnl, bt_hson, wifi_hs_chnl);
3365 CL_PRINTF(cli_buf);
3366 3358
3367 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %02x %02x %02x ", 3359 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %02x %02x %02x ",
3368 "H2C Wifi inform bt chnl Info", coex_dm->wifi_chnl_info[0], 3360 "H2C Wifi inform bt chnl Info", coex_dm->wifi_chnl_info[0],
3369 coex_dm->wifi_chnl_info[1], coex_dm->wifi_chnl_info[2]); 3361 coex_dm->wifi_chnl_info[1], coex_dm->wifi_chnl_info[2]);
3370 CL_PRINTF(cli_buf);
3371 3362
3372 btcoexist->btc_get(btcoexist, BTC_GET_S4_WIFI_RSSI, &wifirssi); 3363 btcoexist->btc_get(btcoexist, BTC_GET_S4_WIFI_RSSI, &wifirssi);
3373 btcoexist->btc_get(btcoexist, BTC_GET_S4_HS_RSSI, &bt_hs_rssi); 3364 btcoexist->btc_get(btcoexist, BTC_GET_S4_HS_RSSI, &bt_hs_rssi);
3374 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %d/ %d", 3365 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %d/ %d",
3375 "Wifi rssi/ HS rssi", wifirssi, bt_hs_rssi); 3366 "Wifi rssi/ HS rssi", wifirssi, bt_hs_rssi);
3376 CL_PRINTF(cli_buf);
3377 3367
3378 btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_SCAN, &scan); 3368 btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_SCAN, &scan);
3379 btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_LINK, &link); 3369 btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_LINK, &link);
3380 btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_ROAM, &roam); 3370 btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_ROAM, &roam);
3381 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %d/ %d/ %d ", 3371 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %d/ %d/ %d ",
3382 "Wifi link/ roam/ scan", link, roam, scan); 3372 "Wifi link/ roam/ scan", link, roam, scan);
3383 CL_PRINTF(cli_buf);
3384 3373
3385 btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_UNDER_5G, &wifi_under_5g); 3374 btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_UNDER_5G, &wifi_under_5g);
3386 btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_BW, &wifi_bw); 3375 btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_BW, &wifi_bw);
3387 btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_BUSY, &wifi_busy); 3376 btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_BUSY, &wifi_busy);
3388 btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_TRAFFIC_DIRECTION, 3377 btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_TRAFFIC_DIRECTION,
3389 &wifi_traffic_dir); 3378 &wifi_traffic_dir);
3390 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %s / %s/ %s ", 3379 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %s / %s/ %s ",
3391 "Wifi status", (wifi_under_5g ? "5G" : "2.4G"), 3380 "Wifi status", (wifi_under_5g ? "5G" : "2.4G"),
3392 ((BTC_WIFI_BW_LEGACY == wifi_bw) ? "Legacy" : 3381 ((BTC_WIFI_BW_LEGACY == wifi_bw) ? "Legacy" :
3393 (((BTC_WIFI_BW_HT40 == wifi_bw) ? "HT40" : "HT20"))), 3382 (((BTC_WIFI_BW_HT40 == wifi_bw) ? "HT40" : "HT20"))),
3394 ((!wifi_busy) ? "idle" : 3383 ((!wifi_busy) ? "idle" :
3395 ((BTC_WIFI_TRAFFIC_TX == wifi_traffic_dir) ? 3384 ((BTC_WIFI_TRAFFIC_TX == wifi_traffic_dir) ?
3396 "uplink" : "downlink"))); 3385 "uplink" : "downlink")));
3397 CL_PRINTF(cli_buf);
3398 3386
3399 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = [%s/ %d/ %d] ", 3387 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = [%s/ %d/ %d] ",
3400 "BT [status/ rssi/ retryCnt]", 3388 "BT [status/ rssi/ retryCnt]",
3401 ((btcoexist->bt_info.bt_disabled) ? ("disabled") : 3389 ((btcoexist->bt_info.bt_disabled) ? ("disabled") :
3402 ((coex_sta->c2h_bt_inquiry_page) ? 3390 ((coex_sta->c2h_bt_inquiry_page) ?
@@ -3406,166 +3394,139 @@ void ex_halbtc8192e2ant_display_coex_info(struct btc_coexist *btcoexist)
3406 ((BT_8192E_2ANT_BT_STATUS_CONNECTED_IDLE == 3394 ((BT_8192E_2ANT_BT_STATUS_CONNECTED_IDLE ==
3407 coex_dm->bt_status) ? "connected-idle" : "busy")))), 3395 coex_dm->bt_status) ? "connected-idle" : "busy")))),
3408 coex_sta->bt_rssi, coex_sta->bt_retry_cnt); 3396 coex_sta->bt_rssi, coex_sta->bt_retry_cnt);
3409 CL_PRINTF(cli_buf);
3410 3397
3411 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %d / %d / %d / %d", 3398 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %d / %d / %d / %d",
3412 "SCO/HID/PAN/A2DP", stack_info->sco_exist, 3399 "SCO/HID/PAN/A2DP", stack_info->sco_exist,
3413 stack_info->hid_exist, stack_info->pan_exist, 3400 stack_info->hid_exist, stack_info->pan_exist,
3414 stack_info->a2dp_exist); 3401 stack_info->a2dp_exist);
3415 CL_PRINTF(cli_buf);
3416 btcoexist->btc_disp_dbg_msg(btcoexist, BTC_DBG_DISP_BT_LINK_INFO); 3402 btcoexist->btc_disp_dbg_msg(btcoexist, BTC_DBG_DISP_BT_LINK_INFO);
3417 3403
3418 bt_info_ext = coex_sta->bt_info_ext; 3404 bt_info_ext = coex_sta->bt_info_ext;
3419 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %s", 3405 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %s",
3420 "BT Info A2DP rate", 3406 "BT Info A2DP rate",
3421 (bt_info_ext&BIT0) ? "Basic rate" : "EDR rate"); 3407 (bt_info_ext&BIT0) ? "Basic rate" : "EDR rate");
3422 CL_PRINTF(cli_buf);
3423 3408
3424 for (i = 0; i < BT_INFO_SRC_8192E_2ANT_MAX; i++) { 3409 for (i = 0; i < BT_INFO_SRC_8192E_2ANT_MAX; i++) {
3425 if (coex_sta->bt_info_c2h_cnt[i]) { 3410 if (coex_sta->bt_info_c2h_cnt[i]) {
3426 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 3411 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
3427 "\r\n %-35s = %02x %02x %02x %02x ", 3412 "\r\n %-35s = %02x %02x %02x %02x ",
3428 GLBtInfoSrc8192e2Ant[i], 3413 GLBtInfoSrc8192e2Ant[i],
3429 coex_sta->bt_info_c2h[i][0], 3414 coex_sta->bt_info_c2h[i][0],
3430 coex_sta->bt_info_c2h[i][1], 3415 coex_sta->bt_info_c2h[i][1],
3431 coex_sta->bt_info_c2h[i][2], 3416 coex_sta->bt_info_c2h[i][2],
3432 coex_sta->bt_info_c2h[i][3]); 3417 coex_sta->bt_info_c2h[i][3]);
3433 CL_PRINTF(cli_buf); 3418 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
3434 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE,
3435 "%02x %02x %02x(%d)", 3419 "%02x %02x %02x(%d)",
3436 coex_sta->bt_info_c2h[i][4], 3420 coex_sta->bt_info_c2h[i][4],
3437 coex_sta->bt_info_c2h[i][5], 3421 coex_sta->bt_info_c2h[i][5],
3438 coex_sta->bt_info_c2h[i][6], 3422 coex_sta->bt_info_c2h[i][6],
3439 coex_sta->bt_info_c2h_cnt[i]); 3423 coex_sta->bt_info_c2h_cnt[i]);
3440 CL_PRINTF(cli_buf);
3441 } 3424 }
3442 } 3425 }
3443 3426
3444 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %s/%s", 3427 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %s/%s",
3445 "PS state, IPS/LPS", 3428 "PS state, IPS/LPS",
3446 ((coex_sta->under_ips ? "IPS ON" : "IPS OFF")), 3429 ((coex_sta->under_ips ? "IPS ON" : "IPS OFF")),
3447 ((coex_sta->under_lps ? "LPS ON" : "LPS OFF"))); 3430 ((coex_sta->under_lps ? "LPS ON" : "LPS OFF")));
3448 CL_PRINTF(cli_buf);
3449 btcoexist->btc_disp_dbg_msg(btcoexist, BTC_DBG_DISP_FW_PWR_MODE_CMD); 3431 btcoexist->btc_disp_dbg_msg(btcoexist, BTC_DBG_DISP_FW_PWR_MODE_CMD);
3450 3432
3451 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = 0x%x ", "SS Type", 3433 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = 0x%x ", "SS Type",
3452 coex_dm->cur_sstype); 3434 coex_dm->cur_sstype);
3453 CL_PRINTF(cli_buf);
3454 3435
3455 /* Sw mechanism */ 3436 /* Sw mechanism */
3456 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s", 3437 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s",
3457 "============[Sw mechanism]============"); 3438 "============[Sw mechanism]============");
3458 CL_PRINTF(cli_buf); 3439 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %d/ %d/ %d ",
3459 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %d/ %d/ %d ",
3460 "SM1[ShRf/ LpRA/ LimDig]", coex_dm->cur_rf_rx_lpf_shrink, 3440 "SM1[ShRf/ LpRA/ LimDig]", coex_dm->cur_rf_rx_lpf_shrink,
3461 coex_dm->cur_low_penalty_ra, coex_dm->limited_dig); 3441 coex_dm->cur_low_penalty_ra, coex_dm->limited_dig);
3462 CL_PRINTF(cli_buf); 3442 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %d/ %d/ %d(0x%x) ",
3463 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %d/ %d/ %d(0x%x) ",
3464 "SM2[AgcT/ AdcB/ SwDacSwing(lvl)]", 3443 "SM2[AgcT/ AdcB/ SwDacSwing(lvl)]",
3465 coex_dm->cur_agc_table_en, coex_dm->cur_adc_back_off, 3444 coex_dm->cur_agc_table_en, coex_dm->cur_adc_back_off,
3466 coex_dm->cur_dac_swing_on, coex_dm->cur_dac_swing_lvl); 3445 coex_dm->cur_dac_swing_on, coex_dm->cur_dac_swing_lvl);
3467 CL_PRINTF(cli_buf);
3468 3446
3469 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = 0x%x ", "Rate Mask", 3447 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = 0x%x ", "Rate Mask",
3470 btcoexist->bt_info.ra_mask); 3448 btcoexist->bt_info.ra_mask);
3471 CL_PRINTF(cli_buf);
3472 3449
3473 /* Fw mechanism */ 3450 /* Fw mechanism */
3474 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s", 3451 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s",
3475 "============[Fw mechanism]============"); 3452 "============[Fw mechanism]============");
3476 CL_PRINTF(cli_buf);
3477 3453
3478 ps_tdma_case = coex_dm->cur_ps_tdma; 3454 ps_tdma_case = coex_dm->cur_ps_tdma;
3479 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 3455 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
3480 "\r\n %-35s = %02x %02x %02x %02x %02x case-%d (auto:%d)", 3456 "\r\n %-35s = %02x %02x %02x %02x %02x case-%d (auto:%d)",
3481 "PS TDMA", coex_dm->ps_tdma_para[0], 3457 "PS TDMA", coex_dm->ps_tdma_para[0],
3482 coex_dm->ps_tdma_para[1], coex_dm->ps_tdma_para[2], 3458 coex_dm->ps_tdma_para[1], coex_dm->ps_tdma_para[2],
3483 coex_dm->ps_tdma_para[3], coex_dm->ps_tdma_para[4], 3459 coex_dm->ps_tdma_para[3], coex_dm->ps_tdma_para[4],
3484 ps_tdma_case, coex_dm->auto_tdma_adjust); 3460 ps_tdma_case, coex_dm->auto_tdma_adjust);
3485 CL_PRINTF(cli_buf);
3486 3461
3487 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %d/ %d ", 3462 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %d/ %d ",
3488 "DecBtPwr/ IgnWlanAct", 3463 "DecBtPwr/ IgnWlanAct",
3489 coex_dm->cur_dec_bt_pwr, coex_dm->cur_ignore_wlan_act); 3464 coex_dm->cur_dec_bt_pwr, coex_dm->cur_ignore_wlan_act);
3490 CL_PRINTF(cli_buf);
3491 3465
3492 /* Hw setting */ 3466 /* Hw setting */
3493 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s", 3467 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s",
3494 "============[Hw setting]============"); 3468 "============[Hw setting]============");
3495 CL_PRINTF(cli_buf);
3496 3469
3497 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = 0x%x", 3470 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = 0x%x",
3498 "RF-A, 0x1e initVal", coex_dm->bt_rf0x1e_backup); 3471 "RF-A, 0x1e initVal", coex_dm->bt_rf0x1e_backup);
3499 CL_PRINTF(cli_buf);
3500 3472
3501 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = 0x%x/0x%x/0x%x/0x%x", 3473 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = 0x%x/0x%x/0x%x/0x%x",
3502 "backup ARFR1/ARFR2/RL/AMaxTime", coex_dm->backup_arfr_cnt1, 3474 "backup ARFR1/ARFR2/RL/AMaxTime", coex_dm->backup_arfr_cnt1,
3503 coex_dm->backup_arfr_cnt2, coex_dm->backup_retrylimit, 3475 coex_dm->backup_arfr_cnt2, coex_dm->backup_retrylimit,
3504 coex_dm->backup_ampdu_maxtime); 3476 coex_dm->backup_ampdu_maxtime);
3505 CL_PRINTF(cli_buf);
3506 3477
3507 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x430); 3478 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x430);
3508 u32tmp[1] = btcoexist->btc_read_4byte(btcoexist, 0x434); 3479 u32tmp[1] = btcoexist->btc_read_4byte(btcoexist, 0x434);
3509 u16tmp[0] = btcoexist->btc_read_2byte(btcoexist, 0x42a); 3480 u16tmp[0] = btcoexist->btc_read_2byte(btcoexist, 0x42a);
3510 u8tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x456); 3481 u8tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x456);
3511 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = 0x%x/0x%x/0x%x/0x%x", 3482 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = 0x%x/0x%x/0x%x/0x%x",
3512 "0x430/0x434/0x42a/0x456", 3483 "0x430/0x434/0x42a/0x456",
3513 u32tmp[0], u32tmp[1], u16tmp[0], u8tmp[0]); 3484 u32tmp[0], u32tmp[1], u16tmp[0], u8tmp[0]);
3514 CL_PRINTF(cli_buf);
3515 3485
3516 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0xc04); 3486 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0xc04);
3517 u32tmp[1] = btcoexist->btc_read_4byte(btcoexist, 0xd04); 3487 u32tmp[1] = btcoexist->btc_read_4byte(btcoexist, 0xd04);
3518 u32tmp[2] = btcoexist->btc_read_4byte(btcoexist, 0x90c); 3488 u32tmp[2] = btcoexist->btc_read_4byte(btcoexist, 0x90c);
3519 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = 0x%x/ 0x%x/ 0x%x", 3489 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = 0x%x/ 0x%x/ 0x%x",
3520 "0xc04/ 0xd04/ 0x90c", u32tmp[0], u32tmp[1], u32tmp[2]); 3490 "0xc04/ 0xd04/ 0x90c", u32tmp[0], u32tmp[1], u32tmp[2]);
3521 CL_PRINTF(cli_buf);
3522 3491
3523 u8tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x778); 3492 u8tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x778);
3524 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = 0x%x", "0x778", 3493 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = 0x%x", "0x778",
3525 u8tmp[0]); 3494 u8tmp[0]);
3526 CL_PRINTF(cli_buf);
3527 3495
3528 u8tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x92c); 3496 u8tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x92c);
3529 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x930); 3497 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x930);
3530 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = 0x%x/ 0x%x", 3498 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = 0x%x/ 0x%x",
3531 "0x92c/ 0x930", (u8tmp[0]), u32tmp[0]); 3499 "0x92c/ 0x930", (u8tmp[0]), u32tmp[0]);
3532 CL_PRINTF(cli_buf);
3533 3500
3534 u8tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x40); 3501 u8tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x40);
3535 u8tmp[1] = btcoexist->btc_read_1byte(btcoexist, 0x4f); 3502 u8tmp[1] = btcoexist->btc_read_1byte(btcoexist, 0x4f);
3536 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = 0x%x/ 0x%x", 3503 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = 0x%x/ 0x%x",
3537 "0x40/ 0x4f", u8tmp[0], u8tmp[1]); 3504 "0x40/ 0x4f", u8tmp[0], u8tmp[1]);
3538 CL_PRINTF(cli_buf);
3539 3505
3540 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x550); 3506 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x550);
3541 u8tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x522); 3507 u8tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x522);
3542 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = 0x%x/ 0x%x", 3508 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = 0x%x/ 0x%x",
3543 "0x550(bcn ctrl)/0x522", u32tmp[0], u8tmp[0]); 3509 "0x550(bcn ctrl)/0x522", u32tmp[0], u8tmp[0]);
3544 CL_PRINTF(cli_buf);
3545 3510
3546 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0xc50); 3511 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0xc50);
3547 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = 0x%x", "0xc50(dig)", 3512 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = 0x%x", "0xc50(dig)",
3548 u32tmp[0]); 3513 u32tmp[0]);
3549 CL_PRINTF(cli_buf);
3550 3514
3551 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x6c0); 3515 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x6c0);
3552 u32tmp[1] = btcoexist->btc_read_4byte(btcoexist, 0x6c4); 3516 u32tmp[1] = btcoexist->btc_read_4byte(btcoexist, 0x6c4);
3553 u32tmp[2] = btcoexist->btc_read_4byte(btcoexist, 0x6c8); 3517 u32tmp[2] = btcoexist->btc_read_4byte(btcoexist, 0x6c8);
3554 u8tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x6cc); 3518 u8tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x6cc);
3555 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 3519 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
3556 "\r\n %-35s = 0x%x/ 0x%x/ 0x%x/ 0x%x", 3520 "\r\n %-35s = 0x%x/ 0x%x/ 0x%x/ 0x%x",
3557 "0x6c0/0x6c4/0x6c8/0x6cc(coexTable)", 3521 "0x6c0/0x6c4/0x6c8/0x6cc(coexTable)",
3558 u32tmp[0], u32tmp[1], u32tmp[2], u8tmp[0]); 3522 u32tmp[0], u32tmp[1], u32tmp[2], u8tmp[0]);
3559 CL_PRINTF(cli_buf);
3560 3523
3561 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %d/ %d", 3524 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %d/ %d",
3562 "0x770(hp rx[31:16]/tx[15:0])", 3525 "0x770(hp rx[31:16]/tx[15:0])",
3563 coex_sta->high_priority_rx, coex_sta->high_priority_tx); 3526 coex_sta->high_priority_rx, coex_sta->high_priority_tx);
3564 CL_PRINTF(cli_buf); 3527 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %d/ %d",
3565 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %d/ %d",
3566 "0x774(lp rx[31:16]/tx[15:0])", 3528 "0x774(lp rx[31:16]/tx[15:0])",
3567 coex_sta->low_priority_rx, coex_sta->low_priority_tx); 3529 coex_sta->low_priority_rx, coex_sta->low_priority_tx);
3568 CL_PRINTF(cli_buf);
3569#if (BT_AUTO_REPORT_ONLY_8192E_2ANT == 1) 3530#if (BT_AUTO_REPORT_ONLY_8192E_2ANT == 1)
3570 halbtc8192e2ant_monitor_bt_ctr(btcoexist); 3531 halbtc8192e2ant_monitor_bt_ctr(btcoexist);
3571#endif 3532#endif
diff --git a/drivers/net/wireless/rtlwifi/btcoexist/halbtc8723b1ant.c b/drivers/net/wireless/rtlwifi/btcoexist/halbtc8723b1ant.c
index e4948c893157..c4acd403e5f6 100644
--- a/drivers/net/wireless/rtlwifi/btcoexist/halbtc8723b1ant.c
+++ b/drivers/net/wireless/rtlwifi/btcoexist/halbtc8723b1ant.c
@@ -2398,7 +2398,7 @@ void ex_halbtc8723b1ant_display_coex_info(struct btc_coexist *btcoexist)
2398 struct btc_board_info *board_info = &btcoexist->board_info; 2398 struct btc_board_info *board_info = &btcoexist->board_info;
2399 struct btc_stack_info *stack_info = &btcoexist->stack_info; 2399 struct btc_stack_info *stack_info = &btcoexist->stack_info;
2400 struct btc_bt_link_info *bt_link_info = &btcoexist->bt_link_info; 2400 struct btc_bt_link_info *bt_link_info = &btcoexist->bt_link_info;
2401 u8 *cli_buf = btcoexist->cli_buf; 2401 struct rtl_priv *rtlpriv = btcoexist->adapter;
2402 u8 u8tmp[4], i, bt_info_ext, pstdmacase = 0; 2402 u8 u8tmp[4], i, bt_info_ext, pstdmacase = 0;
2403 u16 u16tmp[4]; 2403 u16 u16tmp[4];
2404 u32 u32tmp[4]; 2404 u32 u32tmp[4];
@@ -2410,81 +2410,68 @@ void ex_halbtc8723b1ant_display_coex_info(struct btc_coexist *btcoexist)
2410 u8 wifi_dot11_chnl, wifi_hs_chnl; 2410 u8 wifi_dot11_chnl, wifi_hs_chnl;
2411 u32 fw_ver = 0, bt_patch_ver = 0; 2411 u32 fw_ver = 0, bt_patch_ver = 0;
2412 2412
2413 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2413 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2414 "\r\n ============[BT Coexist info]============"); 2414 "\r\n ============[BT Coexist info]============");
2415 CL_PRINTF(cli_buf);
2416 2415
2417 if (btcoexist->manual_control) { 2416 if (btcoexist->manual_control) {
2418 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2417 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2419 "\r\n ============[Under Manual Control]=========="); 2418 "\r\n ============[Under Manual Control]==========");
2420 CL_PRINTF(cli_buf); 2419 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2421 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE,
2422 "\r\n =========================================="); 2420 "\r\n ==========================================");
2423 CL_PRINTF(cli_buf);
2424 } 2421 }
2425 if (btcoexist->stop_coex_dm) { 2422 if (btcoexist->stop_coex_dm) {
2426 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2423 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2427 "\r\n ============[Coex is STOPPED]============"); 2424 "\r\n ============[Coex is STOPPED]============");
2428 CL_PRINTF(cli_buf); 2425 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2429 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE,
2430 "\r\n =========================================="); 2426 "\r\n ==========================================");
2431 CL_PRINTF(cli_buf);
2432 } 2427 }
2433 2428
2434 if (!board_info->bt_exist) { 2429 if (!board_info->bt_exist) {
2435 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n BT not exists !!!"); 2430 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n BT not exists !!!");
2436 CL_PRINTF(cli_buf);
2437 return; 2431 return;
2438 } 2432 }
2439 2433
2440 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %d/ %d/ %d", 2434 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %d/ %d/ %d",
2441 "Ant PG Num/ Ant Mech/ Ant Pos:", 2435 "Ant PG Num/ Ant Mech/ Ant Pos:",
2442 board_info->pg_ant_num, board_info->btdm_ant_num, 2436 board_info->pg_ant_num, board_info->btdm_ant_num,
2443 board_info->btdm_ant_pos); 2437 board_info->btdm_ant_pos);
2444 CL_PRINTF(cli_buf);
2445 2438
2446 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %s / %d", 2439 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %s / %d",
2447 "BT stack/ hci ext ver", 2440 "BT stack/ hci ext ver",
2448 ((stack_info->profile_notified) ? "Yes" : "No"), 2441 ((stack_info->profile_notified) ? "Yes" : "No"),
2449 stack_info->hci_version); 2442 stack_info->hci_version);
2450 CL_PRINTF(cli_buf);
2451 2443
2452 btcoexist->btc_get(btcoexist, BTC_GET_U4_BT_PATCH_VER, &bt_patch_ver); 2444 btcoexist->btc_get(btcoexist, BTC_GET_U4_BT_PATCH_VER, &bt_patch_ver);
2453 btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_FW_VER, &fw_ver); 2445 btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_FW_VER, &fw_ver);
2454 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2446 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2455 "\r\n %-35s = %d_%x/ 0x%x/ 0x%x(%d)", 2447 "\r\n %-35s = %d_%x/ 0x%x/ 0x%x(%d)",
2456 "CoexVer/ FwVer/ PatchVer", 2448 "CoexVer/ FwVer/ PatchVer",
2457 glcoex_ver_date_8723b_1ant, glcoex_ver_8723b_1ant, 2449 glcoex_ver_date_8723b_1ant, glcoex_ver_8723b_1ant,
2458 fw_ver, bt_patch_ver, bt_patch_ver); 2450 fw_ver, bt_patch_ver, bt_patch_ver);
2459 CL_PRINTF(cli_buf);
2460 2451
2461 btcoexist->btc_get(btcoexist, BTC_GET_BL_HS_OPERATION, &bt_hs_on); 2452 btcoexist->btc_get(btcoexist, BTC_GET_BL_HS_OPERATION, &bt_hs_on);
2462 btcoexist->btc_get(btcoexist, BTC_GET_U1_WIFI_DOT11_CHNL, 2453 btcoexist->btc_get(btcoexist, BTC_GET_U1_WIFI_DOT11_CHNL,
2463 &wifi_dot11_chnl); 2454 &wifi_dot11_chnl);
2464 btcoexist->btc_get(btcoexist, BTC_GET_U1_WIFI_HS_CHNL, &wifi_hs_chnl); 2455 btcoexist->btc_get(btcoexist, BTC_GET_U1_WIFI_HS_CHNL, &wifi_hs_chnl);
2465 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %d / %d(%d)", 2456 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %d / %d(%d)",
2466 "Dot11 channel / HsChnl(HsMode)", 2457 "Dot11 channel / HsChnl(HsMode)",
2467 wifi_dot11_chnl, wifi_hs_chnl, bt_hs_on); 2458 wifi_dot11_chnl, wifi_hs_chnl, bt_hs_on);
2468 CL_PRINTF(cli_buf);
2469 2459
2470 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %02x %02x %02x ", 2460 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %02x %02x %02x ",
2471 "H2C Wifi inform bt chnl Info", 2461 "H2C Wifi inform bt chnl Info",
2472 coex_dm->wifi_chnl_info[0], coex_dm->wifi_chnl_info[1], 2462 coex_dm->wifi_chnl_info[0], coex_dm->wifi_chnl_info[1],
2473 coex_dm->wifi_chnl_info[2]); 2463 coex_dm->wifi_chnl_info[2]);
2474 CL_PRINTF(cli_buf);
2475 2464
2476 btcoexist->btc_get(btcoexist, BTC_GET_S4_WIFI_RSSI, &wifi_rssi); 2465 btcoexist->btc_get(btcoexist, BTC_GET_S4_WIFI_RSSI, &wifi_rssi);
2477 btcoexist->btc_get(btcoexist, BTC_GET_S4_HS_RSSI, &bt_hs_rssi); 2466 btcoexist->btc_get(btcoexist, BTC_GET_S4_HS_RSSI, &bt_hs_rssi);
2478 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %d/ %d", 2467 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %d/ %d",
2479 "Wifi rssi/ HS rssi", wifi_rssi, bt_hs_rssi); 2468 "Wifi rssi/ HS rssi", wifi_rssi, bt_hs_rssi);
2480 CL_PRINTF(cli_buf);
2481 2469
2482 btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_SCAN, &scan); 2470 btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_SCAN, &scan);
2483 btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_LINK, &link); 2471 btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_LINK, &link);
2484 btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_ROAM, &roam); 2472 btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_ROAM, &roam);
2485 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %d/ %d/ %d ", 2473 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %d/ %d/ %d ",
2486 "Wifi link/ roam/ scan", link, roam, scan); 2474 "Wifi link/ roam/ scan", link, roam, scan);
2487 CL_PRINTF(cli_buf);
2488 2475
2489 btcoexist->btc_get(btcoexist , BTC_GET_BL_WIFI_UNDER_5G, 2476 btcoexist->btc_get(btcoexist , BTC_GET_BL_WIFI_UNDER_5G,
2490 &wifi_under_5g); 2477 &wifi_under_5g);
@@ -2493,27 +2480,25 @@ void ex_halbtc8723b1ant_display_coex_info(struct btc_coexist *btcoexist)
2493 btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_TRAFFIC_DIRECTION, 2480 btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_TRAFFIC_DIRECTION,
2494 &wifi_traffic_dir); 2481 &wifi_traffic_dir);
2495 2482
2496 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %s / %s/ %s ", 2483 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %s / %s/ %s ",
2497 "Wifi status", (wifi_under_5g ? "5G" : "2.4G"), 2484 "Wifi status", (wifi_under_5g ? "5G" : "2.4G"),
2498 ((BTC_WIFI_BW_LEGACY == wifi_bw) ? "Legacy" : 2485 ((BTC_WIFI_BW_LEGACY == wifi_bw) ? "Legacy" :
2499 (((BTC_WIFI_BW_HT40 == wifi_bw) ? "HT40" : "HT20"))), 2486 (((BTC_WIFI_BW_HT40 == wifi_bw) ? "HT40" : "HT20"))),
2500 ((!wifi_busy) ? "idle" : 2487 ((!wifi_busy) ? "idle" :
2501 ((BTC_WIFI_TRAFFIC_TX == wifi_traffic_dir) ? 2488 ((BTC_WIFI_TRAFFIC_TX == wifi_traffic_dir) ?
2502 "uplink" : "downlink"))); 2489 "uplink" : "downlink")));
2503 CL_PRINTF(cli_buf);
2504 2490
2505 btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_LINK_STATUS, 2491 btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_LINK_STATUS,
2506 &wifi_link_status); 2492 &wifi_link_status);
2507 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %d/ %d/ %d/ %d/ %d", 2493 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %d/ %d/ %d/ %d/ %d",
2508 "sta/vwifi/hs/p2pGo/p2pGc", 2494 "sta/vwifi/hs/p2pGo/p2pGc",
2509 ((wifi_link_status & WIFI_STA_CONNECTED) ? 1 : 0), 2495 ((wifi_link_status & WIFI_STA_CONNECTED) ? 1 : 0),
2510 ((wifi_link_status & WIFI_AP_CONNECTED) ? 1 : 0), 2496 ((wifi_link_status & WIFI_AP_CONNECTED) ? 1 : 0),
2511 ((wifi_link_status & WIFI_HS_CONNECTED) ? 1 : 0), 2497 ((wifi_link_status & WIFI_HS_CONNECTED) ? 1 : 0),
2512 ((wifi_link_status & WIFI_P2P_GO_CONNECTED) ? 1 : 0), 2498 ((wifi_link_status & WIFI_P2P_GO_CONNECTED) ? 1 : 0),
2513 ((wifi_link_status & WIFI_P2P_GC_CONNECTED) ? 1 : 0)); 2499 ((wifi_link_status & WIFI_P2P_GC_CONNECTED) ? 1 : 0));
2514 CL_PRINTF(cli_buf);
2515 2500
2516 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = [%s/ %d/ %d] ", 2501 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = [%s/ %d/ %d] ",
2517 "BT [status/ rssi/ retryCnt]", 2502 "BT [status/ rssi/ retryCnt]",
2518 ((btcoexist->bt_info.bt_disabled) ? ("disabled") : 2503 ((btcoexist->bt_info.bt_disabled) ? ("disabled") :
2519 ((coex_sta->c2h_bt_inquiry_page) ? ("inquiry/page scan") : 2504 ((coex_sta->c2h_bt_inquiry_page) ? ("inquiry/page scan") :
@@ -2524,25 +2509,22 @@ void ex_halbtc8723b1ant_display_coex_info(struct btc_coexist *btcoexist)
2524 coex_dm->bt_status) ? 2509 coex_dm->bt_status) ?
2525 "connected-idle" : "busy")))), 2510 "connected-idle" : "busy")))),
2526 coex_sta->bt_rssi, coex_sta->bt_retry_cnt); 2511 coex_sta->bt_rssi, coex_sta->bt_retry_cnt);
2527 CL_PRINTF(cli_buf);
2528 2512
2529 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2513 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2530 "\r\n %-35s = %d / %d / %d / %d", 2514 "\r\n %-35s = %d / %d / %d / %d",
2531 "SCO/HID/PAN/A2DP", bt_link_info->sco_exist, 2515 "SCO/HID/PAN/A2DP", bt_link_info->sco_exist,
2532 bt_link_info->hid_exist, bt_link_info->pan_exist, 2516 bt_link_info->hid_exist, bt_link_info->pan_exist,
2533 bt_link_info->a2dp_exist); 2517 bt_link_info->a2dp_exist);
2534 CL_PRINTF(cli_buf);
2535 btcoexist->btc_disp_dbg_msg(btcoexist, BTC_DBG_DISP_BT_LINK_INFO); 2518 btcoexist->btc_disp_dbg_msg(btcoexist, BTC_DBG_DISP_BT_LINK_INFO);
2536 2519
2537 bt_info_ext = coex_sta->bt_info_ext; 2520 bt_info_ext = coex_sta->bt_info_ext;
2538 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %s", 2521 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %s",
2539 "BT Info A2DP rate", 2522 "BT Info A2DP rate",
2540 (bt_info_ext & BIT0) ? "Basic rate" : "EDR rate"); 2523 (bt_info_ext & BIT0) ? "Basic rate" : "EDR rate");
2541 CL_PRINTF(cli_buf);
2542 2524
2543 for (i = 0; i < BT_INFO_SRC_8723B_1ANT_MAX; i++) { 2525 for (i = 0; i < BT_INFO_SRC_8723B_1ANT_MAX; i++) {
2544 if (coex_sta->bt_info_c2h_cnt[i]) { 2526 if (coex_sta->bt_info_c2h_cnt[i]) {
2545 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2527 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2546 "\r\n %-35s = %02x %02x %02x %02x %02x %02x %02x(%d)", 2528 "\r\n %-35s = %02x %02x %02x %02x %02x %02x %02x(%d)",
2547 GLBtInfoSrc8723b1Ant[i], 2529 GLBtInfoSrc8723b1Ant[i],
2548 coex_sta->bt_info_c2h[i][0], 2530 coex_sta->bt_info_c2h[i][0],
@@ -2553,130 +2535,111 @@ void ex_halbtc8723b1ant_display_coex_info(struct btc_coexist *btcoexist)
2553 coex_sta->bt_info_c2h[i][5], 2535 coex_sta->bt_info_c2h[i][5],
2554 coex_sta->bt_info_c2h[i][6], 2536 coex_sta->bt_info_c2h[i][6],
2555 coex_sta->bt_info_c2h_cnt[i]); 2537 coex_sta->bt_info_c2h_cnt[i]);
2556 CL_PRINTF(cli_buf);
2557 } 2538 }
2558 } 2539 }
2559 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2540 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2560 "\r\n %-35s = %s/%s, (0x%x/0x%x)", 2541 "\r\n %-35s = %s/%s, (0x%x/0x%x)",
2561 "PS state, IPS/LPS, (lps/rpwm)", 2542 "PS state, IPS/LPS, (lps/rpwm)",
2562 ((coex_sta->under_ips ? "IPS ON" : "IPS OFF")), 2543 ((coex_sta->under_ips ? "IPS ON" : "IPS OFF")),
2563 ((coex_sta->under_lps ? "LPS ON" : "LPS OFF")), 2544 ((coex_sta->under_lps ? "LPS ON" : "LPS OFF")),
2564 btcoexist->bt_info.lps_val, 2545 btcoexist->bt_info.lps_val,
2565 btcoexist->bt_info.rpwm_val); 2546 btcoexist->bt_info.rpwm_val);
2566 CL_PRINTF(cli_buf);
2567 btcoexist->btc_disp_dbg_msg(btcoexist, BTC_DBG_DISP_FW_PWR_MODE_CMD); 2547 btcoexist->btc_disp_dbg_msg(btcoexist, BTC_DBG_DISP_FW_PWR_MODE_CMD);
2568 2548
2569 if (!btcoexist->manual_control) { 2549 if (!btcoexist->manual_control) {
2570 /* Sw mechanism */ 2550 /* Sw mechanism */
2571 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s", 2551 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s",
2572 "============[Sw mechanism]============"); 2552 "============[Sw mechanism]============");
2573 CL_PRINTF(cli_buf);
2574 2553
2575 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %d/", 2554 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %d/",
2576 "SM[LowPenaltyRA]", coex_dm->cur_low_penalty_ra); 2555 "SM[LowPenaltyRA]", coex_dm->cur_low_penalty_ra);
2577 CL_PRINTF(cli_buf);
2578 2556
2579 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %s/ %s/ %d ", 2557 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %s/ %s/ %d ",
2580 "DelBA/ BtCtrlAgg/ AggSize", 2558 "DelBA/ BtCtrlAgg/ AggSize",
2581 (btcoexist->bt_info.reject_agg_pkt ? "Yes" : "No"), 2559 (btcoexist->bt_info.reject_agg_pkt ? "Yes" : "No"),
2582 (btcoexist->bt_info.bt_ctrl_buf_size ? "Yes" : "No"), 2560 (btcoexist->bt_info.bt_ctrl_buf_size ? "Yes" : "No"),
2583 btcoexist->bt_info.agg_buf_size); 2561 btcoexist->bt_info.agg_buf_size);
2584 CL_PRINTF(cli_buf);
2585 2562
2586 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = 0x%x ", 2563 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = 0x%x ",
2587 "Rate Mask", btcoexist->bt_info.ra_mask); 2564 "Rate Mask", btcoexist->bt_info.ra_mask);
2588 CL_PRINTF(cli_buf);
2589 2565
2590 /* Fw mechanism */ 2566 /* Fw mechanism */
2591 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s", 2567 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s",
2592 "============[Fw mechanism]============"); 2568 "============[Fw mechanism]============");
2593 CL_PRINTF(cli_buf);
2594 2569
2595 pstdmacase = coex_dm->cur_ps_tdma; 2570 pstdmacase = coex_dm->cur_ps_tdma;
2596 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2571 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2597 "\r\n %-35s = %02x %02x %02x %02x %02x case-%d (auto:%d)", 2572 "\r\n %-35s = %02x %02x %02x %02x %02x case-%d (auto:%d)",
2598 "PS TDMA", coex_dm->ps_tdma_para[0], 2573 "PS TDMA", coex_dm->ps_tdma_para[0],
2599 coex_dm->ps_tdma_para[1], coex_dm->ps_tdma_para[2], 2574 coex_dm->ps_tdma_para[1], coex_dm->ps_tdma_para[2],
2600 coex_dm->ps_tdma_para[3], coex_dm->ps_tdma_para[4], 2575 coex_dm->ps_tdma_para[3], coex_dm->ps_tdma_para[4],
2601 pstdmacase, coex_dm->auto_tdma_adjust); 2576 pstdmacase, coex_dm->auto_tdma_adjust);
2602 CL_PRINTF(cli_buf);
2603 2577
2604 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %d ", 2578 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %d ",
2605 "IgnWlanAct", coex_dm->cur_ignore_wlan_act); 2579 "IgnWlanAct", coex_dm->cur_ignore_wlan_act);
2606 CL_PRINTF(cli_buf);
2607 2580
2608 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = 0x%x ", 2581 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = 0x%x ",
2609 "Latest error condition(should be 0)", 2582 "Latest error condition(should be 0)",
2610 coex_dm->error_condition); 2583 coex_dm->error_condition);
2611 CL_PRINTF(cli_buf);
2612 } 2584 }
2613 2585
2614 /* Hw setting */ 2586 /* Hw setting */
2615 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s", 2587 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s",
2616 "============[Hw setting]============"); 2588 "============[Hw setting]============");
2617 CL_PRINTF(cli_buf);
2618 2589
2619 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = 0x%x/0x%x/0x%x/0x%x", 2590 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = 0x%x/0x%x/0x%x/0x%x",
2620 "backup ARFR1/ARFR2/RL/AMaxTime", coex_dm->backup_arfr_cnt1, 2591 "backup ARFR1/ARFR2/RL/AMaxTime", coex_dm->backup_arfr_cnt1,
2621 coex_dm->backup_arfr_cnt2, coex_dm->backup_retry_limit, 2592 coex_dm->backup_arfr_cnt2, coex_dm->backup_retry_limit,
2622 coex_dm->backup_ampdu_max_time); 2593 coex_dm->backup_ampdu_max_time);
2623 CL_PRINTF(cli_buf);
2624 2594
2625 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x430); 2595 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x430);
2626 u32tmp[1] = btcoexist->btc_read_4byte(btcoexist, 0x434); 2596 u32tmp[1] = btcoexist->btc_read_4byte(btcoexist, 0x434);
2627 u16tmp[0] = btcoexist->btc_read_2byte(btcoexist, 0x42a); 2597 u16tmp[0] = btcoexist->btc_read_2byte(btcoexist, 0x42a);
2628 u8tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x456); 2598 u8tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x456);
2629 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = 0x%x/0x%x/0x%x/0x%x", 2599 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = 0x%x/0x%x/0x%x/0x%x",
2630 "0x430/0x434/0x42a/0x456", 2600 "0x430/0x434/0x42a/0x456",
2631 u32tmp[0], u32tmp[1], u16tmp[0], u8tmp[0]); 2601 u32tmp[0], u32tmp[1], u16tmp[0], u8tmp[0]);
2632 CL_PRINTF(cli_buf);
2633 2602
2634 u8tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x778); 2603 u8tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x778);
2635 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x6cc); 2604 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x6cc);
2636 u32tmp[1] = btcoexist->btc_read_4byte(btcoexist, 0x880); 2605 u32tmp[1] = btcoexist->btc_read_4byte(btcoexist, 0x880);
2637 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = 0x%x/ 0x%x/ 0x%x", 2606 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = 0x%x/ 0x%x/ 0x%x",
2638 "0x778/0x6cc/0x880[29:25]", u8tmp[0], u32tmp[0], 2607 "0x778/0x6cc/0x880[29:25]", u8tmp[0], u32tmp[0],
2639 (u32tmp[1] & 0x3e000000) >> 25); 2608 (u32tmp[1] & 0x3e000000) >> 25);
2640 CL_PRINTF(cli_buf);
2641 2609
2642 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x948); 2610 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x948);
2643 u8tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x67); 2611 u8tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x67);
2644 u8tmp[1] = btcoexist->btc_read_1byte(btcoexist, 0x765); 2612 u8tmp[1] = btcoexist->btc_read_1byte(btcoexist, 0x765);
2645 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = 0x%x/ 0x%x/ 0x%x", 2613 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = 0x%x/ 0x%x/ 0x%x",
2646 "0x948/ 0x67[5] / 0x765", 2614 "0x948/ 0x67[5] / 0x765",
2647 u32tmp[0], ((u8tmp[0] & 0x20) >> 5), u8tmp[1]); 2615 u32tmp[0], ((u8tmp[0] & 0x20) >> 5), u8tmp[1]);
2648 CL_PRINTF(cli_buf);
2649 2616
2650 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x92c); 2617 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x92c);
2651 u32tmp[1] = btcoexist->btc_read_4byte(btcoexist, 0x930); 2618 u32tmp[1] = btcoexist->btc_read_4byte(btcoexist, 0x930);
2652 u32tmp[2] = btcoexist->btc_read_4byte(btcoexist, 0x944); 2619 u32tmp[2] = btcoexist->btc_read_4byte(btcoexist, 0x944);
2653 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = 0x%x/ 0x%x/ 0x%x", 2620 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = 0x%x/ 0x%x/ 0x%x",
2654 "0x92c[1:0]/ 0x930[7:0]/0x944[1:0]", 2621 "0x92c[1:0]/ 0x930[7:0]/0x944[1:0]",
2655 u32tmp[0] & 0x3, u32tmp[1] & 0xff, u32tmp[2] & 0x3); 2622 u32tmp[0] & 0x3, u32tmp[1] & 0xff, u32tmp[2] & 0x3);
2656 CL_PRINTF(cli_buf);
2657 2623
2658 u8tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x39); 2624 u8tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x39);
2659 u8tmp[1] = btcoexist->btc_read_1byte(btcoexist, 0x40); 2625 u8tmp[1] = btcoexist->btc_read_1byte(btcoexist, 0x40);
2660 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x4c); 2626 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x4c);
2661 u8tmp[2] = btcoexist->btc_read_1byte(btcoexist, 0x64); 2627 u8tmp[2] = btcoexist->btc_read_1byte(btcoexist, 0x64);
2662 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2628 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2663 "\r\n %-35s = 0x%x/ 0x%x/ 0x%x/ 0x%x", 2629 "\r\n %-35s = 0x%x/ 0x%x/ 0x%x/ 0x%x",
2664 "0x38[11]/0x40/0x4c[24:23]/0x64[0]", 2630 "0x38[11]/0x40/0x4c[24:23]/0x64[0]",
2665 ((u8tmp[0] & 0x8)>>3), u8tmp[1], 2631 ((u8tmp[0] & 0x8)>>3), u8tmp[1],
2666 ((u32tmp[0] & 0x01800000) >> 23), u8tmp[2] & 0x1); 2632 ((u32tmp[0] & 0x01800000) >> 23), u8tmp[2] & 0x1);
2667 CL_PRINTF(cli_buf);
2668 2633
2669 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x550); 2634 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x550);
2670 u8tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x522); 2635 u8tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x522);
2671 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = 0x%x/ 0x%x", 2636 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = 0x%x/ 0x%x",
2672 "0x550(bcn ctrl)/0x522", u32tmp[0], u8tmp[0]); 2637 "0x550(bcn ctrl)/0x522", u32tmp[0], u8tmp[0]);
2673 CL_PRINTF(cli_buf);
2674 2638
2675 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0xc50); 2639 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0xc50);
2676 u8tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x49c); 2640 u8tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x49c);
2677 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = 0x%x/ 0x%x", 2641 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = 0x%x/ 0x%x",
2678 "0xc50(dig)/0x49c(null-drop)", u32tmp[0] & 0xff, u8tmp[0]); 2642 "0xc50(dig)/0x49c(null-drop)", u32tmp[0] & 0xff, u8tmp[0]);
2679 CL_PRINTF(cli_buf);
2680 2643
2681 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0xda0); 2644 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0xda0);
2682 u32tmp[1] = btcoexist->btc_read_4byte(btcoexist, 0xda4); 2645 u32tmp[1] = btcoexist->btc_read_4byte(btcoexist, 0xda4);
@@ -2694,27 +2657,23 @@ void ex_halbtc8723b1ant_display_coex_info(struct btc_coexist *btcoexist)
2694 (u32tmp[3] & 0xffff); 2657 (u32tmp[3] & 0xffff);
2695 fa_cck = (u8tmp[0] << 8) + u8tmp[1]; 2658 fa_cck = (u8tmp[0] << 8) + u8tmp[1];
2696 2659
2697 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = 0x%x/ 0x%x/ 0x%x", 2660 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = 0x%x/ 0x%x/ 0x%x",
2698 "OFDM-CCA/OFDM-FA/CCK-FA", 2661 "OFDM-CCA/OFDM-FA/CCK-FA",
2699 u32tmp[0] & 0xffff, fa_ofdm, fa_cck); 2662 u32tmp[0] & 0xffff, fa_ofdm, fa_cck);
2700 CL_PRINTF(cli_buf);
2701 2663
2702 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x6c0); 2664 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x6c0);
2703 u32tmp[1] = btcoexist->btc_read_4byte(btcoexist, 0x6c4); 2665 u32tmp[1] = btcoexist->btc_read_4byte(btcoexist, 0x6c4);
2704 u32tmp[2] = btcoexist->btc_read_4byte(btcoexist, 0x6c8); 2666 u32tmp[2] = btcoexist->btc_read_4byte(btcoexist, 0x6c8);
2705 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = 0x%x/ 0x%x/ 0x%x", 2667 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = 0x%x/ 0x%x/ 0x%x",
2706 "0x6c0/0x6c4/0x6c8(coexTable)", 2668 "0x6c0/0x6c4/0x6c8(coexTable)",
2707 u32tmp[0], u32tmp[1], u32tmp[2]); 2669 u32tmp[0], u32tmp[1], u32tmp[2]);
2708 CL_PRINTF(cli_buf);
2709 2670
2710 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %d/ %d", 2671 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %d/ %d",
2711 "0x770(high-pri rx/tx)", coex_sta->high_priority_rx, 2672 "0x770(high-pri rx/tx)", coex_sta->high_priority_rx,
2712 coex_sta->high_priority_tx); 2673 coex_sta->high_priority_tx);
2713 CL_PRINTF(cli_buf); 2674 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %d/ %d",
2714 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %d/ %d",
2715 "0x774(low-pri rx/tx)", coex_sta->low_priority_rx, 2675 "0x774(low-pri rx/tx)", coex_sta->low_priority_rx,
2716 coex_sta->low_priority_tx); 2676 coex_sta->low_priority_tx);
2717 CL_PRINTF(cli_buf);
2718#if (BT_AUTO_REPORT_ONLY_8723B_1ANT == 1) 2677#if (BT_AUTO_REPORT_ONLY_8723B_1ANT == 1)
2719 halbtc8723b1ant_monitor_bt_ctr(btcoexist); 2678 halbtc8723b1ant_monitor_bt_ctr(btcoexist);
2720#endif 2679#endif
diff --git a/drivers/net/wireless/rtlwifi/btcoexist/halbtc8723b2ant.c b/drivers/net/wireless/rtlwifi/btcoexist/halbtc8723b2ant.c
index bd37d65cca44..cefe26991421 100644
--- a/drivers/net/wireless/rtlwifi/btcoexist/halbtc8723b2ant.c
+++ b/drivers/net/wireless/rtlwifi/btcoexist/halbtc8723b2ant.c
@@ -3159,7 +3159,7 @@ void ex_btc8723b2ant_display_coex_info(struct btc_coexist *btcoexist)
3159 struct btc_board_info *board_info = &btcoexist->board_info; 3159 struct btc_board_info *board_info = &btcoexist->board_info;
3160 struct btc_stack_info *stack_info = &btcoexist->stack_info; 3160 struct btc_stack_info *stack_info = &btcoexist->stack_info;
3161 struct btc_bt_link_info *bt_link_info = &btcoexist->bt_link_info; 3161 struct btc_bt_link_info *bt_link_info = &btcoexist->bt_link_info;
3162 u8 *cli_buf = btcoexist->cli_buf; 3162 struct rtl_priv *rtlpriv = btcoexist->adapter;
3163 u8 u8tmp[4], i, bt_info_ext, ps_tdma_case = 0; 3163 u8 u8tmp[4], i, bt_info_ext, ps_tdma_case = 0;
3164 u32 u32tmp[4]; 3164 u32 u32tmp[4];
3165 bool roam = false, scan = false; 3165 bool roam = false, scan = false;
@@ -3171,106 +3171,91 @@ void ex_btc8723b2ant_display_coex_info(struct btc_coexist *btcoexist)
3171 u32 fw_ver = 0, bt_patch_ver = 0; 3171 u32 fw_ver = 0, bt_patch_ver = 0;
3172 u8 ap_num = 0; 3172 u8 ap_num = 0;
3173 3173
3174 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 3174 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
3175 "\r\n ============[BT Coexist info]============"); 3175 "\r\n ============[BT Coexist info]============");
3176 CL_PRINTF(cli_buf);
3177 3176
3178 if (btcoexist->manual_control) { 3177 if (btcoexist->manual_control) {
3179 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 3178 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
3180 "\r\n ==========[Under Manual Control]============"); 3179 "\r\n ==========[Under Manual Control]============");
3181 CL_PRINTF(cli_buf); 3180 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
3182 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE,
3183 "\r\n =========================================="); 3181 "\r\n ==========================================");
3184 CL_PRINTF(cli_buf);
3185 } 3182 }
3186 3183
3187 if (!board_info->bt_exist) { 3184 if (!board_info->bt_exist) {
3188 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n BT not exists !!!"); 3185 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n BT not exists !!!");
3189 CL_PRINTF(cli_buf);
3190 return; 3186 return;
3191 } 3187 }
3192 3188
3193 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %d/ %d ", 3189 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %d/ %d ",
3194 "Ant PG number/ Ant mechanism:", 3190 "Ant PG number/ Ant mechanism:",
3195 board_info->pg_ant_num, board_info->btdm_ant_num); 3191 board_info->pg_ant_num, board_info->btdm_ant_num);
3196 CL_PRINTF(cli_buf);
3197 3192
3198 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %s / %d", 3193 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %s / %d",
3199 "BT stack/ hci ext ver", 3194 "BT stack/ hci ext ver",
3200 ((stack_info->profile_notified) ? "Yes" : "No"), 3195 ((stack_info->profile_notified) ? "Yes" : "No"),
3201 stack_info->hci_version); 3196 stack_info->hci_version);
3202 CL_PRINTF(cli_buf);
3203 3197
3204 btcoexist->btc_get(btcoexist, BTC_GET_U4_BT_PATCH_VER, &bt_patch_ver); 3198 btcoexist->btc_get(btcoexist, BTC_GET_U4_BT_PATCH_VER, &bt_patch_ver);
3205 btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_FW_VER, &fw_ver); 3199 btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_FW_VER, &fw_ver);
3206 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 3200 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
3207 "\r\n %-35s = %d_%x/ 0x%x/ 0x%x(%d)", 3201 "\r\n %-35s = %d_%x/ 0x%x/ 0x%x(%d)",
3208 "CoexVer/ FwVer/ PatchVer", 3202 "CoexVer/ FwVer/ PatchVer",
3209 glcoex_ver_date_8723b_2ant, glcoex_ver_8723b_2ant, 3203 glcoex_ver_date_8723b_2ant, glcoex_ver_8723b_2ant,
3210 fw_ver, bt_patch_ver, bt_patch_ver); 3204 fw_ver, bt_patch_ver, bt_patch_ver);
3211 CL_PRINTF(cli_buf);
3212 3205
3213 btcoexist->btc_get(btcoexist, BTC_GET_BL_HS_OPERATION, &bt_hs_on); 3206 btcoexist->btc_get(btcoexist, BTC_GET_BL_HS_OPERATION, &bt_hs_on);
3214 btcoexist->btc_get(btcoexist, BTC_GET_U1_WIFI_DOT11_CHNL, 3207 btcoexist->btc_get(btcoexist, BTC_GET_U1_WIFI_DOT11_CHNL,
3215 &wifi_dot11_chnl); 3208 &wifi_dot11_chnl);
3216 btcoexist->btc_get(btcoexist, BTC_GET_U1_WIFI_HS_CHNL, &wifi_hs_chnl); 3209 btcoexist->btc_get(btcoexist, BTC_GET_U1_WIFI_HS_CHNL, &wifi_hs_chnl);
3217 3210
3218 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %d / %d(%d)", 3211 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %d / %d(%d)",
3219 "Dot11 channel / HsChnl(HsMode)", 3212 "Dot11 channel / HsChnl(HsMode)",
3220 wifi_dot11_chnl, wifi_hs_chnl, bt_hs_on); 3213 wifi_dot11_chnl, wifi_hs_chnl, bt_hs_on);
3221 CL_PRINTF(cli_buf);
3222 3214
3223 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %02x %02x %02x ", 3215 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %02x %02x %02x ",
3224 "H2C Wifi inform bt chnl Info", coex_dm->wifi_chnl_info[0], 3216 "H2C Wifi inform bt chnl Info", coex_dm->wifi_chnl_info[0],
3225 coex_dm->wifi_chnl_info[1], coex_dm->wifi_chnl_info[2]); 3217 coex_dm->wifi_chnl_info[1], coex_dm->wifi_chnl_info[2]);
3226 CL_PRINTF(cli_buf);
3227 3218
3228 btcoexist->btc_get(btcoexist, BTC_GET_S4_WIFI_RSSI, &wifi_rssi); 3219 btcoexist->btc_get(btcoexist, BTC_GET_S4_WIFI_RSSI, &wifi_rssi);
3229 btcoexist->btc_get(btcoexist, BTC_GET_S4_HS_RSSI, &bt_hs_rssi); 3220 btcoexist->btc_get(btcoexist, BTC_GET_S4_HS_RSSI, &bt_hs_rssi);
3230 btcoexist->btc_get(btcoexist, BTC_GET_U1_AP_NUM, &ap_num); 3221 btcoexist->btc_get(btcoexist, BTC_GET_U1_AP_NUM, &ap_num);
3231 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %d/ %d/ %d", 3222 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %d/ %d/ %d",
3232 "Wifi rssi/ HS rssi/ AP#", wifi_rssi, bt_hs_rssi, ap_num); 3223 "Wifi rssi/ HS rssi/ AP#", wifi_rssi, bt_hs_rssi, ap_num);
3233 CL_PRINTF(cli_buf);
3234 3224
3235 btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_SCAN, &scan); 3225 btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_SCAN, &scan);
3236 btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_LINK, &link); 3226 btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_LINK, &link);
3237 btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_ROAM, &roam); 3227 btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_ROAM, &roam);
3238 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %d/ %d/ %d ", 3228 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %d/ %d/ %d ",
3239 "Wifi link/ roam/ scan", link, roam, scan); 3229 "Wifi link/ roam/ scan", link, roam, scan);
3240 CL_PRINTF(cli_buf);
3241 3230
3242 btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_UNDER_5G, &wifi_under_5g); 3231 btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_UNDER_5G, &wifi_under_5g);
3243 btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_BW, &wifi_bw); 3232 btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_BW, &wifi_bw);
3244 btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_BUSY, &wifi_busy); 3233 btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_BUSY, &wifi_busy);
3245 btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_TRAFFIC_DIRECTION, 3234 btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_TRAFFIC_DIRECTION,
3246 &wifi_traffic_dir); 3235 &wifi_traffic_dir);
3247 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %s / %s/ %s ", 3236 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %s / %s/ %s ",
3248 "Wifi status", (wifi_under_5g ? "5G" : "2.4G"), 3237 "Wifi status", (wifi_under_5g ? "5G" : "2.4G"),
3249 ((BTC_WIFI_BW_LEGACY == wifi_bw) ? "Legacy" : 3238 ((BTC_WIFI_BW_LEGACY == wifi_bw) ? "Legacy" :
3250 (((BTC_WIFI_BW_HT40 == wifi_bw) ? "HT40" : "HT20"))), 3239 (((BTC_WIFI_BW_HT40 == wifi_bw) ? "HT40" : "HT20"))),
3251 ((!wifi_busy) ? "idle" : 3240 ((!wifi_busy) ? "idle" :
3252 ((BTC_WIFI_TRAFFIC_TX == wifi_traffic_dir) ? 3241 ((BTC_WIFI_TRAFFIC_TX == wifi_traffic_dir) ?
3253 "uplink" : "downlink"))); 3242 "uplink" : "downlink")));
3254 CL_PRINTF(cli_buf);
3255 3243
3256 CL_PRINTF(cli_buf);
3257 3244
3258 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %d / %d / %d / %d", 3245 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %d / %d / %d / %d",
3259 "SCO/HID/PAN/A2DP", 3246 "SCO/HID/PAN/A2DP",
3260 bt_link_info->sco_exist, bt_link_info->hid_exist, 3247 bt_link_info->sco_exist, bt_link_info->hid_exist,
3261 bt_link_info->pan_exist, bt_link_info->a2dp_exist); 3248 bt_link_info->pan_exist, bt_link_info->a2dp_exist);
3262 CL_PRINTF(cli_buf);
3263 btcoexist->btc_disp_dbg_msg(btcoexist, BTC_DBG_DISP_BT_LINK_INFO); 3249 btcoexist->btc_disp_dbg_msg(btcoexist, BTC_DBG_DISP_BT_LINK_INFO);
3264 3250
3265 bt_info_ext = coex_sta->bt_info_ext; 3251 bt_info_ext = coex_sta->bt_info_ext;
3266 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %s", 3252 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %s",
3267 "BT Info A2DP rate", 3253 "BT Info A2DP rate",
3268 (bt_info_ext&BIT0) ? "Basic rate" : "EDR rate"); 3254 (bt_info_ext&BIT0) ? "Basic rate" : "EDR rate");
3269 CL_PRINTF(cli_buf);
3270 3255
3271 for (i = 0; i < BT_INFO_SRC_8723B_2ANT_MAX; i++) { 3256 for (i = 0; i < BT_INFO_SRC_8723B_2ANT_MAX; i++) {
3272 if (coex_sta->bt_info_c2h_cnt[i]) { 3257 if (coex_sta->bt_info_c2h_cnt[i]) {
3273 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 3258 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
3274 "\r\n %-35s = %02x %02x %02x " 3259 "\r\n %-35s = %02x %02x %02x "
3275 "%02x %02x %02x %02x(%d)", 3260 "%02x %02x %02x %02x(%d)",
3276 glbt_info_src_8723b_2ant[i], 3261 glbt_info_src_8723b_2ant[i],
@@ -3282,104 +3267,88 @@ void ex_btc8723b2ant_display_coex_info(struct btc_coexist *btcoexist)
3282 coex_sta->bt_info_c2h[i][5], 3267 coex_sta->bt_info_c2h[i][5],
3283 coex_sta->bt_info_c2h[i][6], 3268 coex_sta->bt_info_c2h[i][6],
3284 coex_sta->bt_info_c2h_cnt[i]); 3269 coex_sta->bt_info_c2h_cnt[i]);
3285 CL_PRINTF(cli_buf);
3286 } 3270 }
3287 } 3271 }
3288 3272
3289 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %s/%s", 3273 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %s/%s",
3290 "PS state, IPS/LPS", 3274 "PS state, IPS/LPS",
3291 ((coex_sta->under_ips ? "IPS ON" : "IPS OFF")), 3275 ((coex_sta->under_ips ? "IPS ON" : "IPS OFF")),
3292 ((coex_sta->under_lps ? "LPS ON" : "LPS OFF"))); 3276 ((coex_sta->under_lps ? "LPS ON" : "LPS OFF")));
3293 CL_PRINTF(cli_buf);
3294 btcoexist->btc_disp_dbg_msg(btcoexist, BTC_DBG_DISP_FW_PWR_MODE_CMD); 3277 btcoexist->btc_disp_dbg_msg(btcoexist, BTC_DBG_DISP_FW_PWR_MODE_CMD);
3295 3278
3296 /* Sw mechanism */ 3279 /* Sw mechanism */
3297 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 3280 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
3298 "\r\n %-35s", "============[Sw mechanism]============"); 3281 "\r\n %-35s", "============[Sw mechanism]============");
3299 CL_PRINTF(cli_buf); 3282 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %d/ %d/ %d ",
3300 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %d/ %d/ %d ",
3301 "SM1[ShRf/ LpRA/ LimDig]", coex_dm->cur_rf_rx_lpf_shrink, 3283 "SM1[ShRf/ LpRA/ LimDig]", coex_dm->cur_rf_rx_lpf_shrink,
3302 coex_dm->cur_low_penalty_ra, coex_dm->limited_dig); 3284 coex_dm->cur_low_penalty_ra, coex_dm->limited_dig);
3303 CL_PRINTF(cli_buf); 3285 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %d/ %d/ %d(0x%x) ",
3304 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %d/ %d/ %d(0x%x) ",
3305 "SM2[AgcT/ AdcB/ SwDacSwing(lvl)]", 3286 "SM2[AgcT/ AdcB/ SwDacSwing(lvl)]",
3306 coex_dm->cur_agc_table_en, coex_dm->cur_adc_back_off, 3287 coex_dm->cur_agc_table_en, coex_dm->cur_adc_back_off,
3307 coex_dm->cur_dac_swing_on, coex_dm->cur_dac_swing_lvl); 3288 coex_dm->cur_dac_swing_on, coex_dm->cur_dac_swing_lvl);
3308 CL_PRINTF(cli_buf);
3309 3289
3310 /* Fw mechanism */ 3290 /* Fw mechanism */
3311 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s", 3291 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s",
3312 "============[Fw mechanism]============"); 3292 "============[Fw mechanism]============");
3313 CL_PRINTF(cli_buf);
3314 3293
3315 ps_tdma_case = coex_dm->cur_ps_tdma; 3294 ps_tdma_case = coex_dm->cur_ps_tdma;
3316 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 3295 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
3317 "\r\n %-35s = %02x %02x %02x %02x %02x case-%d (auto:%d)", 3296 "\r\n %-35s = %02x %02x %02x %02x %02x case-%d (auto:%d)",
3318 "PS TDMA", coex_dm->ps_tdma_para[0], 3297 "PS TDMA", coex_dm->ps_tdma_para[0],
3319 coex_dm->ps_tdma_para[1], coex_dm->ps_tdma_para[2], 3298 coex_dm->ps_tdma_para[1], coex_dm->ps_tdma_para[2],
3320 coex_dm->ps_tdma_para[3], coex_dm->ps_tdma_para[4], 3299 coex_dm->ps_tdma_para[3], coex_dm->ps_tdma_para[4],
3321 ps_tdma_case, coex_dm->auto_tdma_adjust); 3300 ps_tdma_case, coex_dm->auto_tdma_adjust);
3322 CL_PRINTF(cli_buf);
3323 3301
3324 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %d/ %d ", 3302 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %d/ %d ",
3325 "DecBtPwr/ IgnWlanAct", coex_dm->cur_dec_bt_pwr, 3303 "DecBtPwr/ IgnWlanAct", coex_dm->cur_dec_bt_pwr,
3326 coex_dm->cur_ignore_wlan_act); 3304 coex_dm->cur_ignore_wlan_act);
3327 CL_PRINTF(cli_buf);
3328 3305
3329 /* Hw setting */ 3306 /* Hw setting */
3330 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s", 3307 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s",
3331 "============[Hw setting]============"); 3308 "============[Hw setting]============");
3332 CL_PRINTF(cli_buf);
3333 3309
3334 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = 0x%x", 3310 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = 0x%x",
3335 "RF-A, 0x1e initVal", coex_dm->bt_rf0x1e_backup); 3311 "RF-A, 0x1e initVal", coex_dm->bt_rf0x1e_backup);
3336 CL_PRINTF(cli_buf);
3337 3312
3338 u8tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x778); 3313 u8tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x778);
3339 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x880); 3314 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x880);
3340 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = 0x%x/ 0x%x", 3315 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = 0x%x/ 0x%x",
3341 "0x778/0x880[29:25]", u8tmp[0], 3316 "0x778/0x880[29:25]", u8tmp[0],
3342 (u32tmp[0]&0x3e000000) >> 25); 3317 (u32tmp[0]&0x3e000000) >> 25);
3343 CL_PRINTF(cli_buf);
3344 3318
3345 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x948); 3319 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x948);
3346 u8tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x67); 3320 u8tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x67);
3347 u8tmp[1] = btcoexist->btc_read_1byte(btcoexist, 0x765); 3321 u8tmp[1] = btcoexist->btc_read_1byte(btcoexist, 0x765);
3348 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = 0x%x/ 0x%x/ 0x%x", 3322 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = 0x%x/ 0x%x/ 0x%x",
3349 "0x948/ 0x67[5] / 0x765", 3323 "0x948/ 0x67[5] / 0x765",
3350 u32tmp[0], ((u8tmp[0]&0x20) >> 5), u8tmp[1]); 3324 u32tmp[0], ((u8tmp[0]&0x20) >> 5), u8tmp[1]);
3351 CL_PRINTF(cli_buf);
3352 3325
3353 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x92c); 3326 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x92c);
3354 u32tmp[1] = btcoexist->btc_read_4byte(btcoexist, 0x930); 3327 u32tmp[1] = btcoexist->btc_read_4byte(btcoexist, 0x930);
3355 u32tmp[2] = btcoexist->btc_read_4byte(btcoexist, 0x944); 3328 u32tmp[2] = btcoexist->btc_read_4byte(btcoexist, 0x944);
3356 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = 0x%x/ 0x%x/ 0x%x", 3329 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = 0x%x/ 0x%x/ 0x%x",
3357 "0x92c[1:0]/ 0x930[7:0]/0x944[1:0]", 3330 "0x92c[1:0]/ 0x930[7:0]/0x944[1:0]",
3358 u32tmp[0]&0x3, u32tmp[1]&0xff, u32tmp[2]&0x3); 3331 u32tmp[0]&0x3, u32tmp[1]&0xff, u32tmp[2]&0x3);
3359 CL_PRINTF(cli_buf);
3360 3332
3361 u8tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x39); 3333 u8tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x39);
3362 u8tmp[1] = btcoexist->btc_read_1byte(btcoexist, 0x40); 3334 u8tmp[1] = btcoexist->btc_read_1byte(btcoexist, 0x40);
3363 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x4c); 3335 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x4c);
3364 u8tmp[2] = btcoexist->btc_read_1byte(btcoexist, 0x64); 3336 u8tmp[2] = btcoexist->btc_read_1byte(btcoexist, 0x64);
3365 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 3337 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
3366 "\r\n %-35s = 0x%x/ 0x%x/ 0x%x/ 0x%x", 3338 "\r\n %-35s = 0x%x/ 0x%x/ 0x%x/ 0x%x",
3367 "0x38[11]/0x40/0x4c[24:23]/0x64[0]", 3339 "0x38[11]/0x40/0x4c[24:23]/0x64[0]",
3368 ((u8tmp[0] & 0x8)>>3), u8tmp[1], 3340 ((u8tmp[0] & 0x8)>>3), u8tmp[1],
3369 ((u32tmp[0]&0x01800000)>>23), u8tmp[2]&0x1); 3341 ((u32tmp[0]&0x01800000)>>23), u8tmp[2]&0x1);
3370 CL_PRINTF(cli_buf);
3371 3342
3372 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x550); 3343 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x550);
3373 u8tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x522); 3344 u8tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x522);
3374 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = 0x%x/ 0x%x", 3345 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = 0x%x/ 0x%x",
3375 "0x550(bcn ctrl)/0x522", u32tmp[0], u8tmp[0]); 3346 "0x550(bcn ctrl)/0x522", u32tmp[0], u8tmp[0]);
3376 CL_PRINTF(cli_buf);
3377 3347
3378 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0xc50); 3348 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0xc50);
3379 u8tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x49c); 3349 u8tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x49c);
3380 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = 0x%x/ 0x%x", 3350 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = 0x%x/ 0x%x",
3381 "0xc50(dig)/0x49c(null-drop)", u32tmp[0]&0xff, u8tmp[0]); 3351 "0xc50(dig)/0x49c(null-drop)", u32tmp[0]&0xff, u8tmp[0]);
3382 CL_PRINTF(cli_buf);
3383 3352
3384 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0xda0); 3353 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0xda0);
3385 u32tmp[1] = btcoexist->btc_read_4byte(btcoexist, 0xda4); 3354 u32tmp[1] = btcoexist->btc_read_4byte(btcoexist, 0xda4);
@@ -3397,29 +3366,25 @@ void ex_btc8723b2ant_display_coex_info(struct btc_coexist *btcoexist)
3397 (u32tmp[3] & 0xffff); 3366 (u32tmp[3] & 0xffff);
3398 fa_cck = (u8tmp[0] << 8) + u8tmp[1]; 3367 fa_cck = (u8tmp[0] << 8) + u8tmp[1];
3399 3368
3400 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = 0x%x/ 0x%x/ 0x%x", 3369 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = 0x%x/ 0x%x/ 0x%x",
3401 "OFDM-CCA/OFDM-FA/CCK-FA", 3370 "OFDM-CCA/OFDM-FA/CCK-FA",
3402 u32tmp[0]&0xffff, fa_ofdm, fa_cck); 3371 u32tmp[0]&0xffff, fa_ofdm, fa_cck);
3403 CL_PRINTF(cli_buf);
3404 3372
3405 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x6c0); 3373 u32tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x6c0);
3406 u32tmp[1] = btcoexist->btc_read_4byte(btcoexist, 0x6c4); 3374 u32tmp[1] = btcoexist->btc_read_4byte(btcoexist, 0x6c4);
3407 u32tmp[2] = btcoexist->btc_read_4byte(btcoexist, 0x6c8); 3375 u32tmp[2] = btcoexist->btc_read_4byte(btcoexist, 0x6c8);
3408 u8tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x6cc); 3376 u8tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x6cc);
3409 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 3377 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
3410 "\r\n %-35s = 0x%x/ 0x%x/ 0x%x/ 0x%x", 3378 "\r\n %-35s = 0x%x/ 0x%x/ 0x%x/ 0x%x",
3411 "0x6c0/0x6c4/0x6c8/0x6cc(coexTable)", 3379 "0x6c0/0x6c4/0x6c8/0x6cc(coexTable)",
3412 u32tmp[0], u32tmp[1], u32tmp[2], u8tmp[0]); 3380 u32tmp[0], u32tmp[1], u32tmp[2], u8tmp[0]);
3413 CL_PRINTF(cli_buf);
3414 3381
3415 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %d/ %d", 3382 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %d/ %d",
3416 "0x770(high-pri rx/tx)", 3383 "0x770(high-pri rx/tx)",
3417 coex_sta->high_priority_rx, coex_sta->high_priority_tx); 3384 coex_sta->high_priority_rx, coex_sta->high_priority_tx);
3418 CL_PRINTF(cli_buf); 3385 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %d/ %d",
3419 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %d/ %d",
3420 "0x774(low-pri rx/tx)", coex_sta->low_priority_rx, 3386 "0x774(low-pri rx/tx)", coex_sta->low_priority_rx,
3421 coex_sta->low_priority_tx); 3387 coex_sta->low_priority_tx);
3422 CL_PRINTF(cli_buf);
3423#if (BT_AUTO_REPORT_ONLY_8723B_2ANT == 1) 3388#if (BT_AUTO_REPORT_ONLY_8723B_2ANT == 1)
3424 btc8723b2ant_monitor_bt_ctr(btcoexist); 3389 btc8723b2ant_monitor_bt_ctr(btcoexist);
3425#endif 3390#endif
diff --git a/drivers/net/wireless/rtlwifi/btcoexist/halbtc8821a1ant.c b/drivers/net/wireless/rtlwifi/btcoexist/halbtc8821a1ant.c
index 0b75e8c7092d..b72e5377bdbc 100644
--- a/drivers/net/wireless/rtlwifi/btcoexist/halbtc8821a1ant.c
+++ b/drivers/net/wireless/rtlwifi/btcoexist/halbtc8821a1ant.c
@@ -2235,7 +2235,7 @@ void ex_halbtc8821a1ant_display_coex_info(struct btc_coexist *btcoexist)
2235 struct btc_board_info *board_info = &btcoexist->board_info; 2235 struct btc_board_info *board_info = &btcoexist->board_info;
2236 struct btc_stack_info *stack_info = &btcoexist->stack_info; 2236 struct btc_stack_info *stack_info = &btcoexist->stack_info;
2237 struct btc_bt_link_info *bt_link_info = &btcoexist->bt_link_info; 2237 struct btc_bt_link_info *bt_link_info = &btcoexist->bt_link_info;
2238 u8 *cli_buf = btcoexist->cli_buf; 2238 struct rtl_priv *rtlpriv = btcoexist->adapter;
2239 u8 u1_tmp[4], i, bt_info_ext, ps_tdma_case = 0; 2239 u8 u1_tmp[4], i, bt_info_ext, ps_tdma_case = 0;
2240 u16 u2_tmp[4]; 2240 u16 u2_tmp[4];
2241 u32 u4_tmp[4]; 2241 u32 u4_tmp[4];
@@ -2246,58 +2246,49 @@ void ex_halbtc8821a1ant_display_coex_info(struct btc_coexist *btcoexist)
2246 u8 wifi_dot11_chnl, wifi_hs_chnl; 2246 u8 wifi_dot11_chnl, wifi_hs_chnl;
2247 u32 fw_ver = 0, bt_patch_ver = 0; 2247 u32 fw_ver = 0, bt_patch_ver = 0;
2248 2248
2249 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2249 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2250 "\r\n ============[BT Coexist info]============"); 2250 "\r\n ============[BT Coexist info]============");
2251 CL_PRINTF(cli_buf);
2252 2251
2253 if (btcoexist->manual_control) { 2252 if (btcoexist->manual_control) {
2254 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2253 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2255 "\r\n ============[Under Manual Control]============"); 2254 "\r\n ============[Under Manual Control]============");
2256 CL_PRINTF(cli_buf); 2255 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2257 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE,
2258 "\r\n =========================================="); 2256 "\r\n ==========================================");
2259 CL_PRINTF(cli_buf);
2260 } 2257 }
2261 if (btcoexist->stop_coex_dm) { 2258 if (btcoexist->stop_coex_dm) {
2262 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2259 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2263 "\r\n ============[Coex is STOPPED]============"); 2260 "\r\n ============[Coex is STOPPED]============");
2264 CL_PRINTF(cli_buf); 2261 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2265 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE,
2266 "\r\n =========================================="); 2262 "\r\n ==========================================");
2267 CL_PRINTF(cli_buf);
2268 } 2263 }
2269 2264
2270 if (!board_info->bt_exist) { 2265 if (!board_info->bt_exist) {
2271 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n BT not exists !!!"); 2266 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n BT not exists !!!");
2272 CL_PRINTF(cli_buf);
2273 return; 2267 return;
2274 } 2268 }
2275 2269
2276 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2270 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2277 "\r\n %-35s = %d/ %d/ %d", 2271 "\r\n %-35s = %d/ %d/ %d",
2278 "Ant PG Num/ Ant Mech/ Ant Pos:", 2272 "Ant PG Num/ Ant Mech/ Ant Pos:",
2279 board_info->pg_ant_num, 2273 board_info->pg_ant_num,
2280 board_info->btdm_ant_num, 2274 board_info->btdm_ant_num,
2281 board_info->btdm_ant_pos); 2275 board_info->btdm_ant_pos);
2282 CL_PRINTF(cli_buf);
2283 2276
2284 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2277 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2285 "\r\n %-35s = %s / %d", "BT stack/ hci ext ver", 2278 "\r\n %-35s = %s / %d", "BT stack/ hci ext ver",
2286 ((stack_info->profile_notified) ? "Yes" : "No"), 2279 ((stack_info->profile_notified) ? "Yes" : "No"),
2287 stack_info->hci_version); 2280 stack_info->hci_version);
2288 CL_PRINTF(cli_buf);
2289 2281
2290 btcoexist->btc_get(btcoexist, BTC_GET_U4_BT_PATCH_VER, 2282 btcoexist->btc_get(btcoexist, BTC_GET_U4_BT_PATCH_VER,
2291 &bt_patch_ver); 2283 &bt_patch_ver);
2292 btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_FW_VER, &fw_ver); 2284 btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_FW_VER, &fw_ver);
2293 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2285 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2294 "\r\n %-35s = %d_%x/ 0x%x/ 0x%x(%d)", 2286 "\r\n %-35s = %d_%x/ 0x%x/ 0x%x(%d)",
2295 "CoexVer/ FwVer/ PatchVer", 2287 "CoexVer/ FwVer/ PatchVer",
2296 glcoex_ver_date_8821a_1ant, 2288 glcoex_ver_date_8821a_1ant,
2297 glcoex_ver_8821a_1ant, 2289 glcoex_ver_8821a_1ant,
2298 fw_ver, bt_patch_ver, 2290 fw_ver, bt_patch_ver,
2299 bt_patch_ver); 2291 bt_patch_ver);
2300 CL_PRINTF(cli_buf);
2301 2292
2302 btcoexist->btc_get(btcoexist, BTC_GET_BL_HS_OPERATION, 2293 btcoexist->btc_get(btcoexist, BTC_GET_BL_HS_OPERATION,
2303 &bt_hs_on); 2294 &bt_hs_on);
@@ -2305,33 +2296,29 @@ void ex_halbtc8821a1ant_display_coex_info(struct btc_coexist *btcoexist)
2305 &wifi_dot11_chnl); 2296 &wifi_dot11_chnl);
2306 btcoexist->btc_get(btcoexist, BTC_GET_U1_WIFI_HS_CHNL, 2297 btcoexist->btc_get(btcoexist, BTC_GET_U1_WIFI_HS_CHNL,
2307 &wifi_hs_chnl); 2298 &wifi_hs_chnl);
2308 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2299 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2309 "\r\n %-35s = %d / %d(%d)", 2300 "\r\n %-35s = %d / %d(%d)",
2310 "Dot11 channel / HsChnl(HsMode)", 2301 "Dot11 channel / HsChnl(HsMode)",
2311 wifi_dot11_chnl, wifi_hs_chnl, bt_hs_on); 2302 wifi_dot11_chnl, wifi_hs_chnl, bt_hs_on);
2312 CL_PRINTF(cli_buf);
2313 2303
2314 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2304 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2315 "\r\n %-35s = %02x %02x %02x ", 2305 "\r\n %-35s = %02x %02x %02x ",
2316 "H2C Wifi inform bt chnl Info", 2306 "H2C Wifi inform bt chnl Info",
2317 coex_dm->wifi_chnl_info[0], coex_dm->wifi_chnl_info[1], 2307 coex_dm->wifi_chnl_info[0], coex_dm->wifi_chnl_info[1],
2318 coex_dm->wifi_chnl_info[2]); 2308 coex_dm->wifi_chnl_info[2]);
2319 CL_PRINTF(cli_buf);
2320 2309
2321 btcoexist->btc_get(btcoexist, BTC_GET_S4_WIFI_RSSI, &wifi_rssi); 2310 btcoexist->btc_get(btcoexist, BTC_GET_S4_WIFI_RSSI, &wifi_rssi);
2322 btcoexist->btc_get(btcoexist, BTC_GET_S4_HS_RSSI, &bt_hs_rssi); 2311 btcoexist->btc_get(btcoexist, BTC_GET_S4_HS_RSSI, &bt_hs_rssi);
2323 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2312 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2324 "\r\n %-35s = %d/ %d", "Wifi rssi/ HS rssi", 2313 "\r\n %-35s = %d/ %d", "Wifi rssi/ HS rssi",
2325 (int)wifi_rssi, (int)bt_hs_rssi); 2314 (int)wifi_rssi, (int)bt_hs_rssi);
2326 CL_PRINTF(cli_buf);
2327 2315
2328 btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_SCAN, &scan); 2316 btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_SCAN, &scan);
2329 btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_LINK, &link); 2317 btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_LINK, &link);
2330 btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_ROAM, &roam); 2318 btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_ROAM, &roam);
2331 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2319 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2332 "\r\n %-35s = %d/ %d/ %d ", "Wifi link/ roam/ scan", 2320 "\r\n %-35s = %d/ %d/ %d ", "Wifi link/ roam/ scan",
2333 link, roam, scan); 2321 link, roam, scan);
2334 CL_PRINTF(cli_buf);
2335 2322
2336 btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_UNDER_5G, 2323 btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_UNDER_5G,
2337 &wifi_under_5g); 2324 &wifi_under_5g);
@@ -2341,7 +2328,7 @@ void ex_halbtc8821a1ant_display_coex_info(struct btc_coexist *btcoexist)
2341 &wifi_busy); 2328 &wifi_busy);
2342 btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_TRAFFIC_DIRECTION, 2329 btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_TRAFFIC_DIRECTION,
2343 &wifi_traffic_dir); 2330 &wifi_traffic_dir);
2344 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2331 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2345 "\r\n %-35s = %s / %s/ %s ", "Wifi status", 2332 "\r\n %-35s = %s / %s/ %s ", "Wifi status",
2346 (wifi_under_5g ? "5G" : "2.4G"), 2333 (wifi_under_5g ? "5G" : "2.4G"),
2347 ((BTC_WIFI_BW_LEGACY == wifi_bw) ? "Legacy" : 2334 ((BTC_WIFI_BW_LEGACY == wifi_bw) ? "Legacy" :
@@ -2349,8 +2336,7 @@ void ex_halbtc8821a1ant_display_coex_info(struct btc_coexist *btcoexist)
2349 ((!wifi_busy) ? "idle" : 2336 ((!wifi_busy) ? "idle" :
2350 ((BTC_WIFI_TRAFFIC_TX == wifi_traffic_dir) ? 2337 ((BTC_WIFI_TRAFFIC_TX == wifi_traffic_dir) ?
2351 "uplink" : "downlink"))); 2338 "uplink" : "downlink")));
2352 CL_PRINTF(cli_buf); 2339 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2353 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE,
2354 "\r\n %-35s = [%s/ %d/ %d] ", "BT [status/ rssi/ retryCnt]", 2340 "\r\n %-35s = [%s/ %d/ %d] ", "BT [status/ rssi/ retryCnt]",
2355 ((btcoexist->bt_info.bt_disabled) ? ("disabled") : 2341 ((btcoexist->bt_info.bt_disabled) ? ("disabled") :
2356 ((coex_sta->c2h_bt_inquiry_page) ? ("inquiry/page scan") : 2342 ((coex_sta->c2h_bt_inquiry_page) ? ("inquiry/page scan") :
@@ -2361,28 +2347,25 @@ void ex_halbtc8821a1ant_display_coex_info(struct btc_coexist *btcoexist)
2361 coex_dm->bt_status) ? 2347 coex_dm->bt_status) ?
2362 "connected-idle" : "busy")))), 2348 "connected-idle" : "busy")))),
2363 coex_sta->bt_rssi, coex_sta->bt_retry_cnt); 2349 coex_sta->bt_rssi, coex_sta->bt_retry_cnt);
2364 CL_PRINTF(cli_buf);
2365 2350
2366 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2351 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2367 "\r\n %-35s = %d / %d / %d / %d", "SCO/HID/PAN/A2DP", 2352 "\r\n %-35s = %d / %d / %d / %d", "SCO/HID/PAN/A2DP",
2368 bt_link_info->sco_exist, 2353 bt_link_info->sco_exist,
2369 bt_link_info->hid_exist, 2354 bt_link_info->hid_exist,
2370 bt_link_info->pan_exist, 2355 bt_link_info->pan_exist,
2371 bt_link_info->a2dp_exist); 2356 bt_link_info->a2dp_exist);
2372 CL_PRINTF(cli_buf);
2373 btcoexist->btc_disp_dbg_msg(btcoexist, BTC_DBG_DISP_BT_LINK_INFO); 2357 btcoexist->btc_disp_dbg_msg(btcoexist, BTC_DBG_DISP_BT_LINK_INFO);
2374 2358
2375 bt_info_ext = coex_sta->bt_info_ext; 2359 bt_info_ext = coex_sta->bt_info_ext;
2376 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2360 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2377 "\r\n %-35s = %s", 2361 "\r\n %-35s = %s",
2378 "BT Info A2DP rate", 2362 "BT Info A2DP rate",
2379 (bt_info_ext&BIT0) ? 2363 (bt_info_ext&BIT0) ?
2380 "Basic rate" : "EDR rate"); 2364 "Basic rate" : "EDR rate");
2381 CL_PRINTF(cli_buf);
2382 2365
2383 for (i = 0; i < BT_INFO_SRC_8821A_1ANT_MAX; i++) { 2366 for (i = 0; i < BT_INFO_SRC_8821A_1ANT_MAX; i++) {
2384 if (coex_sta->bt_info_c2h_cnt[i]) { 2367 if (coex_sta->bt_info_c2h_cnt[i]) {
2385 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2368 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2386 "\r\n %-35s = %02x %02x %02x %02x %02x %02x %02x(%d)", 2369 "\r\n %-35s = %02x %02x %02x %02x %02x %02x %02x(%d)",
2387 glbt_info_src_8821a_1ant[i], 2370 glbt_info_src_8821a_1ant[i],
2388 coex_sta->bt_info_c2h[i][0], 2371 coex_sta->bt_info_c2h[i][0],
@@ -2393,49 +2376,42 @@ void ex_halbtc8821a1ant_display_coex_info(struct btc_coexist *btcoexist)
2393 coex_sta->bt_info_c2h[i][5], 2376 coex_sta->bt_info_c2h[i][5],
2394 coex_sta->bt_info_c2h[i][6], 2377 coex_sta->bt_info_c2h[i][6],
2395 coex_sta->bt_info_c2h_cnt[i]); 2378 coex_sta->bt_info_c2h_cnt[i]);
2396 CL_PRINTF(cli_buf);
2397 } 2379 }
2398 } 2380 }
2399 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2381 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2400 "\r\n %-35s = %s/%s, (0x%x/0x%x)", 2382 "\r\n %-35s = %s/%s, (0x%x/0x%x)",
2401 "PS state, IPS/LPS, (lps/rpwm)", 2383 "PS state, IPS/LPS, (lps/rpwm)",
2402 ((coex_sta->under_ips ? "IPS ON" : "IPS OFF")), 2384 ((coex_sta->under_ips ? "IPS ON" : "IPS OFF")),
2403 ((coex_sta->under_Lps ? "LPS ON" : "LPS OFF")), 2385 ((coex_sta->under_Lps ? "LPS ON" : "LPS OFF")),
2404 btcoexist->bt_info.lps_val, 2386 btcoexist->bt_info.lps_val,
2405 btcoexist->bt_info.rpwm_val); 2387 btcoexist->bt_info.rpwm_val);
2406 CL_PRINTF(cli_buf);
2407 btcoexist->btc_disp_dbg_msg(btcoexist, BTC_DBG_DISP_FW_PWR_MODE_CMD); 2388 btcoexist->btc_disp_dbg_msg(btcoexist, BTC_DBG_DISP_FW_PWR_MODE_CMD);
2408 2389
2409 if (!btcoexist->manual_control) { 2390 if (!btcoexist->manual_control) {
2410 /* Sw mechanism*/ 2391 /* Sw mechanism*/
2411 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2392 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2412 "\r\n %-35s", "============[Sw mechanism]============"); 2393 "\r\n %-35s", "============[Sw mechanism]============");
2413 CL_PRINTF(cli_buf);
2414 2394
2415 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2395 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2416 "\r\n %-35s = %d", "SM[LowPenaltyRA]", 2396 "\r\n %-35s = %d", "SM[LowPenaltyRA]",
2417 coex_dm->cur_low_penalty_ra); 2397 coex_dm->cur_low_penalty_ra);
2418 CL_PRINTF(cli_buf);
2419 2398
2420 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2399 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2421 "\r\n %-35s = %s/ %s/ %d ", 2400 "\r\n %-35s = %s/ %s/ %d ",
2422 "DelBA/ BtCtrlAgg/ AggSize", 2401 "DelBA/ BtCtrlAgg/ AggSize",
2423 (btcoexist->bt_info.reject_agg_pkt ? "Yes" : "No"), 2402 (btcoexist->bt_info.reject_agg_pkt ? "Yes" : "No"),
2424 (btcoexist->bt_info.bt_ctrl_buf_size ? "Yes" : "No"), 2403 (btcoexist->bt_info.bt_ctrl_buf_size ? "Yes" : "No"),
2425 btcoexist->bt_info.agg_buf_size); 2404 btcoexist->bt_info.agg_buf_size);
2426 CL_PRINTF(cli_buf); 2405 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2427 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE,
2428 "\r\n %-35s = 0x%x ", "Rate Mask", 2406 "\r\n %-35s = 0x%x ", "Rate Mask",
2429 btcoexist->bt_info.ra_mask); 2407 btcoexist->bt_info.ra_mask);
2430 CL_PRINTF(cli_buf);
2431 2408
2432 /* Fw mechanism*/ 2409 /* Fw mechanism*/
2433 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s", 2410 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s",
2434 "============[Fw mechanism]============"); 2411 "============[Fw mechanism]============");
2435 CL_PRINTF(cli_buf);
2436 2412
2437 ps_tdma_case = coex_dm->cur_ps_tdma; 2413 ps_tdma_case = coex_dm->cur_ps_tdma;
2438 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2414 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2439 "\r\n %-35s = %02x %02x %02x %02x %02x case-%d (auto:%d)", 2415 "\r\n %-35s = %02x %02x %02x %02x %02x case-%d (auto:%d)",
2440 "PS TDMA", 2416 "PS TDMA",
2441 coex_dm->ps_tdma_para[0], 2417 coex_dm->ps_tdma_para[0],
@@ -2445,115 +2421,99 @@ void ex_halbtc8821a1ant_display_coex_info(struct btc_coexist *btcoexist)
2445 coex_dm->ps_tdma_para[4], 2421 coex_dm->ps_tdma_para[4],
2446 ps_tdma_case, 2422 ps_tdma_case,
2447 coex_dm->auto_tdma_adjust); 2423 coex_dm->auto_tdma_adjust);
2448 CL_PRINTF(cli_buf);
2449 2424
2450 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2425 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2451 "\r\n %-35s = 0x%x ", 2426 "\r\n %-35s = 0x%x ",
2452 "Latest error condition(should be 0)", 2427 "Latest error condition(should be 0)",
2453 coex_dm->error_condition); 2428 coex_dm->error_condition);
2454 CL_PRINTF(cli_buf);
2455 2429
2456 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2430 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2457 "\r\n %-35s = %d ", "IgnWlanAct", 2431 "\r\n %-35s = %d ", "IgnWlanAct",
2458 coex_dm->cur_ignore_wlan_act); 2432 coex_dm->cur_ignore_wlan_act);
2459 CL_PRINTF(cli_buf);
2460 } 2433 }
2461 2434
2462 /* Hw setting*/ 2435 /* Hw setting*/
2463 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2436 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2464 "\r\n %-35s", "============[Hw setting]============"); 2437 "\r\n %-35s", "============[Hw setting]============");
2465 CL_PRINTF(cli_buf);
2466 2438
2467 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2439 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2468 "\r\n %-35s = 0x%x/0x%x/0x%x/0x%x", 2440 "\r\n %-35s = 0x%x/0x%x/0x%x/0x%x",
2469 "backup ARFR1/ARFR2/RL/AMaxTime", 2441 "backup ARFR1/ARFR2/RL/AMaxTime",
2470 coex_dm->backup_arfr_cnt1, 2442 coex_dm->backup_arfr_cnt1,
2471 coex_dm->backup_arfr_cnt2, 2443 coex_dm->backup_arfr_cnt2,
2472 coex_dm->backup_retry_limit, 2444 coex_dm->backup_retry_limit,
2473 coex_dm->backup_ampdu_max_time); 2445 coex_dm->backup_ampdu_max_time);
2474 CL_PRINTF(cli_buf);
2475 2446
2476 u4_tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x430); 2447 u4_tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x430);
2477 u4_tmp[1] = btcoexist->btc_read_4byte(btcoexist, 0x434); 2448 u4_tmp[1] = btcoexist->btc_read_4byte(btcoexist, 0x434);
2478 u2_tmp[0] = btcoexist->btc_read_2byte(btcoexist, 0x42a); 2449 u2_tmp[0] = btcoexist->btc_read_2byte(btcoexist, 0x42a);
2479 u1_tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x456); 2450 u1_tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x456);
2480 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2451 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2481 "\r\n %-35s = 0x%x/0x%x/0x%x/0x%x", 2452 "\r\n %-35s = 0x%x/0x%x/0x%x/0x%x",
2482 "0x430/0x434/0x42a/0x456", 2453 "0x430/0x434/0x42a/0x456",
2483 u4_tmp[0], u4_tmp[1], u2_tmp[0], u1_tmp[0]); 2454 u4_tmp[0], u4_tmp[1], u2_tmp[0], u1_tmp[0]);
2484 CL_PRINTF(cli_buf);
2485 2455
2486 u1_tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x778); 2456 u1_tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x778);
2487 u4_tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0xc58); 2457 u4_tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0xc58);
2488 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2458 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2489 "\r\n %-35s = 0x%x/ 0x%x", "0x778/ 0xc58[29:25]", 2459 "\r\n %-35s = 0x%x/ 0x%x", "0x778/ 0xc58[29:25]",
2490 u1_tmp[0], (u4_tmp[0]&0x3e000000) >> 25); 2460 u1_tmp[0], (u4_tmp[0]&0x3e000000) >> 25);
2491 CL_PRINTF(cli_buf);
2492 2461
2493 u1_tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x8db); 2462 u1_tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x8db);
2494 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2463 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2495 "\r\n %-35s = 0x%x", "0x8db[6:5]", 2464 "\r\n %-35s = 0x%x", "0x8db[6:5]",
2496 ((u1_tmp[0]&0x60)>>5)); 2465 ((u1_tmp[0]&0x60)>>5));
2497 CL_PRINTF(cli_buf);
2498 2466
2499 u1_tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x975); 2467 u1_tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x975);
2500 u4_tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0xcb4); 2468 u4_tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0xcb4);
2501 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2469 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2502 "\r\n %-35s = 0x%x/ 0x%x/ 0x%x", 2470 "\r\n %-35s = 0x%x/ 0x%x/ 0x%x",
2503 "0xcb4[29:28]/0xcb4[7:0]/0x974[9:8]", 2471 "0xcb4[29:28]/0xcb4[7:0]/0x974[9:8]",
2504 (u4_tmp[0] & 0x30000000)>>28, 2472 (u4_tmp[0] & 0x30000000)>>28,
2505 u4_tmp[0] & 0xff, 2473 u4_tmp[0] & 0xff,
2506 u1_tmp[0] & 0x3); 2474 u1_tmp[0] & 0x3);
2507 CL_PRINTF(cli_buf);
2508 2475
2509 u1_tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x40); 2476 u1_tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x40);
2510 u4_tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x4c); 2477 u4_tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x4c);
2511 u1_tmp[1] = btcoexist->btc_read_1byte(btcoexist, 0x64); 2478 u1_tmp[1] = btcoexist->btc_read_1byte(btcoexist, 0x64);
2512 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2479 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2513 "\r\n %-35s = 0x%x/ 0x%x/ 0x%x", 2480 "\r\n %-35s = 0x%x/ 0x%x/ 0x%x",
2514 "0x40/0x4c[24:23]/0x64[0]", 2481 "0x40/0x4c[24:23]/0x64[0]",
2515 u1_tmp[0], ((u4_tmp[0]&0x01800000)>>23), u1_tmp[1]&0x1); 2482 u1_tmp[0], ((u4_tmp[0]&0x01800000)>>23), u1_tmp[1]&0x1);
2516 CL_PRINTF(cli_buf);
2517 2483
2518 u4_tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x550); 2484 u4_tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x550);
2519 u1_tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x522); 2485 u1_tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x522);
2520 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2486 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2521 "\r\n %-35s = 0x%x/ 0x%x", "0x550(bcn ctrl)/0x522", 2487 "\r\n %-35s = 0x%x/ 0x%x", "0x550(bcn ctrl)/0x522",
2522 u4_tmp[0], u1_tmp[0]); 2488 u4_tmp[0], u1_tmp[0]);
2523 CL_PRINTF(cli_buf);
2524 2489
2525 u4_tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0xc50); 2490 u4_tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0xc50);
2526 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2491 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2527 "\r\n %-35s = 0x%x", "0xc50(dig)", 2492 "\r\n %-35s = 0x%x", "0xc50(dig)",
2528 u4_tmp[0]&0xff); 2493 u4_tmp[0]&0xff);
2529 CL_PRINTF(cli_buf);
2530 2494
2531 u4_tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0xf48); 2495 u4_tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0xf48);
2532 u1_tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0xa5d); 2496 u1_tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0xa5d);
2533 u1_tmp[1] = btcoexist->btc_read_1byte(btcoexist, 0xa5c); 2497 u1_tmp[1] = btcoexist->btc_read_1byte(btcoexist, 0xa5c);
2534 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2498 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2535 "\r\n %-35s = 0x%x/ 0x%x", "OFDM-FA/ CCK-FA", 2499 "\r\n %-35s = 0x%x/ 0x%x", "OFDM-FA/ CCK-FA",
2536 u4_tmp[0], (u1_tmp[0]<<8) + u1_tmp[1]); 2500 u4_tmp[0], (u1_tmp[0]<<8) + u1_tmp[1]);
2537 CL_PRINTF(cli_buf);
2538 2501
2539 u4_tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x6c0); 2502 u4_tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x6c0);
2540 u4_tmp[1] = btcoexist->btc_read_4byte(btcoexist, 0x6c4); 2503 u4_tmp[1] = btcoexist->btc_read_4byte(btcoexist, 0x6c4);
2541 u4_tmp[2] = btcoexist->btc_read_4byte(btcoexist, 0x6c8); 2504 u4_tmp[2] = btcoexist->btc_read_4byte(btcoexist, 0x6c8);
2542 u1_tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x6cc); 2505 u1_tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x6cc);
2543 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2506 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2544 "\r\n %-35s = 0x%x/ 0x%x/ 0x%x/ 0x%x", 2507 "\r\n %-35s = 0x%x/ 0x%x/ 0x%x/ 0x%x",
2545 "0x6c0/0x6c4/0x6c8/0x6cc(coexTable)", 2508 "0x6c0/0x6c4/0x6c8/0x6cc(coexTable)",
2546 u4_tmp[0], u4_tmp[1], u4_tmp[2], u1_tmp[0]); 2509 u4_tmp[0], u4_tmp[1], u4_tmp[2], u1_tmp[0]);
2547 CL_PRINTF(cli_buf);
2548 2510
2549 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 2511 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2550 "\r\n %-35s = %d/ %d", "0x770(high-pri rx/tx)", 2512 "\r\n %-35s = %d/ %d", "0x770(high-pri rx/tx)",
2551 coex_sta->high_priority_rx, coex_sta->high_priority_tx); 2513 coex_sta->high_priority_rx, coex_sta->high_priority_tx);
2552 CL_PRINTF(cli_buf); 2514 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
2553 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE,
2554 "\r\n %-35s = %d/ %d", "0x774(low-pri rx/tx)", 2515 "\r\n %-35s = %d/ %d", "0x774(low-pri rx/tx)",
2555 coex_sta->low_priority_rx, coex_sta->low_priority_tx); 2516 coex_sta->low_priority_rx, coex_sta->low_priority_tx);
2556 CL_PRINTF(cli_buf);
2557#if (BT_AUTO_REPORT_ONLY_8821A_1ANT == 1) 2517#if (BT_AUTO_REPORT_ONLY_8821A_1ANT == 1)
2558 halbtc8821a1ant_monitor_bt_ctr(btcoexist); 2518 halbtc8821a1ant_monitor_bt_ctr(btcoexist);
2559#endif 2519#endif
diff --git a/drivers/net/wireless/rtlwifi/btcoexist/halbtc8821a2ant.c b/drivers/net/wireless/rtlwifi/btcoexist/halbtc8821a2ant.c
index 2322b7d0783d..cf819f02ed23 100644
--- a/drivers/net/wireless/rtlwifi/btcoexist/halbtc8821a2ant.c
+++ b/drivers/net/wireless/rtlwifi/btcoexist/halbtc8821a2ant.c
@@ -3341,7 +3341,7 @@ ex_halbtc8821a2ant_display_coex_info(
3341{ 3341{
3342 struct btc_board_info *board_info = &btcoexist->board_info; 3342 struct btc_board_info *board_info = &btcoexist->board_info;
3343 struct btc_stack_info *stack_info = &btcoexist->stack_info; 3343 struct btc_stack_info *stack_info = &btcoexist->stack_info;
3344 u8 *cli_buf = btcoexist->cli_buf; 3344 struct rtl_priv *rtlpriv = btcoexist->adapter;
3345 u8 u1tmp[4], i, bt_info_ext, ps_tdma_case = 0; 3345 u8 u1tmp[4], i, bt_info_ext, ps_tdma_case = 0;
3346 u32 u4tmp[4]; 3346 u32 u4tmp[4];
3347 bool roam = false, scan = false, link = false, wifi_under_5g = false; 3347 bool roam = false, scan = false, link = false, wifi_under_5g = false;
@@ -3351,41 +3351,35 @@ ex_halbtc8821a2ant_display_coex_info(
3351 u8 wifi_dot_11_chnl, wifi_hs_chnl; 3351 u8 wifi_dot_11_chnl, wifi_hs_chnl;
3352 u32 fw_ver = 0, bt_patch_ver = 0; 3352 u32 fw_ver = 0, bt_patch_ver = 0;
3353 3353
3354 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 3354 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
3355 "\r\n ============[BT Coexist info]============"); 3355 "\r\n ============[BT Coexist info]============");
3356 CL_PRINTF(cli_buf);
3357 3356
3358 if (!board_info->bt_exist) { 3357 if (!board_info->bt_exist) {
3359 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n BT not exists !!!"); 3358 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n BT not exists !!!");
3360 CL_PRINTF(cli_buf);
3361 return; 3359 return;
3362 } 3360 }
3363 3361
3364 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 3362 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
3365 "\r\n %-35s = %d/ %d ", "Ant PG number/ Ant mechanism:", 3363 "\r\n %-35s = %d/ %d ", "Ant PG number/ Ant mechanism:",
3366 board_info->pg_ant_num, board_info->btdm_ant_num); 3364 board_info->pg_ant_num, board_info->btdm_ant_num);
3367 CL_PRINTF(cli_buf);
3368 3365
3369 if (btcoexist->manual_control) { 3366 if (btcoexist->manual_control) {
3370 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 3367 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
3371 "\r\n %-35s", "[Action Manual control]!!"); 3368 "\r\n %-35s", "[Action Manual control]!!");
3372 CL_PRINTF(cli_buf);
3373 } 3369 }
3374 3370
3375 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 3371 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
3376 "\r\n %-35s = %s / %d", "BT stack/ hci ext ver", 3372 "\r\n %-35s = %s / %d", "BT stack/ hci ext ver",
3377 ((stack_info->profile_notified) ? "Yes" : "No"), 3373 ((stack_info->profile_notified) ? "Yes" : "No"),
3378 stack_info->hci_version); 3374 stack_info->hci_version);
3379 CL_PRINTF(cli_buf);
3380 3375
3381 btcoexist->btc_get(btcoexist, BTC_GET_U4_BT_PATCH_VER, &bt_patch_ver); 3376 btcoexist->btc_get(btcoexist, BTC_GET_U4_BT_PATCH_VER, &bt_patch_ver);
3382 btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_FW_VER, &fw_ver); 3377 btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_FW_VER, &fw_ver);
3383 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 3378 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
3384 "\r\n %-35s = %d_%d/ 0x%x/ 0x%x(%d)", 3379 "\r\n %-35s = %d_%d/ 0x%x/ 0x%x(%d)",
3385 "CoexVer/ FwVer/ PatchVer", 3380 "CoexVer/ FwVer/ PatchVer",
3386 glcoex_ver_date_8821a_2ant, glcoex_ver_8821a_2ant, 3381 glcoex_ver_date_8821a_2ant, glcoex_ver_8821a_2ant,
3387 fw_ver, bt_patch_ver, bt_patch_ver); 3382 fw_ver, bt_patch_ver, bt_patch_ver);
3388 CL_PRINTF(cli_buf);
3389 3383
3390 btcoexist->btc_get(btcoexist, 3384 btcoexist->btc_get(btcoexist,
3391 BTC_GET_BL_HS_OPERATION, &bt_hs_on); 3385 BTC_GET_BL_HS_OPERATION, &bt_hs_on);
@@ -3393,33 +3387,29 @@ ex_halbtc8821a2ant_display_coex_info(
3393 BTC_GET_U1_WIFI_DOT11_CHNL, &wifi_dot_11_chnl); 3387 BTC_GET_U1_WIFI_DOT11_CHNL, &wifi_dot_11_chnl);
3394 btcoexist->btc_get(btcoexist, 3388 btcoexist->btc_get(btcoexist,
3395 BTC_GET_U1_WIFI_HS_CHNL, &wifi_hs_chnl); 3389 BTC_GET_U1_WIFI_HS_CHNL, &wifi_hs_chnl);
3396 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 3390 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
3397 "\r\n %-35s = %d / %d(%d)", 3391 "\r\n %-35s = %d / %d(%d)",
3398 "Dot11 channel / HsMode(HsChnl)", 3392 "Dot11 channel / HsMode(HsChnl)",
3399 wifi_dot_11_chnl, bt_hs_on, wifi_hs_chnl); 3393 wifi_dot_11_chnl, bt_hs_on, wifi_hs_chnl);
3400 CL_PRINTF(cli_buf);
3401 3394
3402 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 3395 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
3403 "\r\n %-35s = %02x %02x %02x ", 3396 "\r\n %-35s = %02x %02x %02x ",
3404 "H2C Wifi inform bt chnl Info", 3397 "H2C Wifi inform bt chnl Info",
3405 coex_dm->wifi_chnl_info[0], coex_dm->wifi_chnl_info[1], 3398 coex_dm->wifi_chnl_info[0], coex_dm->wifi_chnl_info[1],
3406 coex_dm->wifi_chnl_info[2]); 3399 coex_dm->wifi_chnl_info[2]);
3407 CL_PRINTF(cli_buf);
3408 3400
3409 btcoexist->btc_get(btcoexist, BTC_GET_S4_WIFI_RSSI, &wifi_rssi); 3401 btcoexist->btc_get(btcoexist, BTC_GET_S4_WIFI_RSSI, &wifi_rssi);
3410 btcoexist->btc_get(btcoexist, BTC_GET_S4_HS_RSSI, &bt_hs_rssi); 3402 btcoexist->btc_get(btcoexist, BTC_GET_S4_HS_RSSI, &bt_hs_rssi);
3411 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 3403 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
3412 "\r\n %-35s = %ld/ %ld", "Wifi rssi/ HS rssi", 3404 "\r\n %-35s = %ld/ %ld", "Wifi rssi/ HS rssi",
3413 wifi_rssi, bt_hs_rssi); 3405 wifi_rssi, bt_hs_rssi);
3414 CL_PRINTF(cli_buf);
3415 3406
3416 btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_SCAN, &scan); 3407 btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_SCAN, &scan);
3417 btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_LINK, &link); 3408 btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_LINK, &link);
3418 btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_ROAM, &roam); 3409 btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_ROAM, &roam);
3419 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 3410 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
3420 "\r\n %-35s = %d/ %d/ %d ", "Wifi link/ roam/ scan", 3411 "\r\n %-35s = %d/ %d/ %d ", "Wifi link/ roam/ scan",
3421 link, roam, scan); 3412 link, roam, scan);
3422 CL_PRINTF(cli_buf);
3423 3413
3424 btcoexist->btc_get(btcoexist, 3414 btcoexist->btc_get(btcoexist,
3425 BTC_GET_BL_WIFI_UNDER_5G, &wifi_under_5g); 3415 BTC_GET_BL_WIFI_UNDER_5G, &wifi_under_5g);
@@ -3429,7 +3419,7 @@ ex_halbtc8821a2ant_display_coex_info(
3429 BTC_GET_BL_WIFI_BUSY, &wifi_busy); 3419 BTC_GET_BL_WIFI_BUSY, &wifi_busy);
3430 btcoexist->btc_get(btcoexist, 3420 btcoexist->btc_get(btcoexist,
3431 BTC_GET_U4_WIFI_TRAFFIC_DIRECTION, &wifi_traffic_dir); 3421 BTC_GET_U4_WIFI_TRAFFIC_DIRECTION, &wifi_traffic_dir);
3432 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 3422 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
3433 "\r\n %-35s = %s / %s/ %s ", "Wifi status", 3423 "\r\n %-35s = %s / %s/ %s ", "Wifi status",
3434 (wifi_under_5g ? "5G" : "2.4G"), 3424 (wifi_under_5g ? "5G" : "2.4G"),
3435 ((BTC_WIFI_BW_LEGACY == wifi_bw) ? "Legacy" : 3425 ((BTC_WIFI_BW_LEGACY == wifi_bw) ? "Legacy" :
@@ -3437,37 +3427,33 @@ ex_halbtc8821a2ant_display_coex_info(
3437 ((!wifi_busy) ? "idle" : 3427 ((!wifi_busy) ? "idle" :
3438 ((BTC_WIFI_TRAFFIC_TX == wifi_traffic_dir) ? 3428 ((BTC_WIFI_TRAFFIC_TX == wifi_traffic_dir) ?
3439 "uplink" : "downlink"))); 3429 "uplink" : "downlink")));
3440 CL_PRINTF(cli_buf);
3441 3430
3442 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 3431 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
3443 "\r\n %-35s = [%s/ %d/ %d] ", "BT [status/ rssi/ retryCnt]", 3432 "\r\n %-35s = [%s/ %d/ %d] ", "BT [status/ rssi/ retryCnt]",
3444 ((coex_sta->c2h_bt_inquiry_page) ? ("inquiry/page scan") : 3433 ((coex_sta->c2h_bt_inquiry_page) ? ("inquiry/page scan") :
3445 ((BT_8821A_2ANT_BT_STATUS_IDLE == coex_dm->bt_status) 3434 ((BT_8821A_2ANT_BT_STATUS_IDLE == coex_dm->bt_status)
3446 ? "idle" : ((BT_8821A_2ANT_BT_STATUS_CON_IDLE == 3435 ? "idle" : ((BT_8821A_2ANT_BT_STATUS_CON_IDLE ==
3447 coex_dm->bt_status) ? "connected-idle" : "busy"))), 3436 coex_dm->bt_status) ? "connected-idle" : "busy"))),
3448 coex_sta->bt_rssi, coex_sta->bt_retry_cnt); 3437 coex_sta->bt_rssi, coex_sta->bt_retry_cnt);
3449 CL_PRINTF(cli_buf);
3450 3438
3451 if (stack_info->profile_notified) { 3439 if (stack_info->profile_notified) {
3452 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 3440 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
3453 "\r\n %-35s = %d / %d / %d / %d", "SCO/HID/PAN/A2DP", 3441 "\r\n %-35s = %d / %d / %d / %d", "SCO/HID/PAN/A2DP",
3454 stack_info->sco_exist, stack_info->hid_exist, 3442 stack_info->sco_exist, stack_info->hid_exist,
3455 stack_info->pan_exist, stack_info->a2dp_exist); 3443 stack_info->pan_exist, stack_info->a2dp_exist);
3456 CL_PRINTF(cli_buf);
3457 3444
3458 btcoexist->btc_disp_dbg_msg(btcoexist, 3445 btcoexist->btc_disp_dbg_msg(btcoexist,
3459 BTC_DBG_DISP_BT_LINK_INFO); 3446 BTC_DBG_DISP_BT_LINK_INFO);
3460 } 3447 }
3461 3448
3462 bt_info_ext = coex_sta->bt_info_ext; 3449 bt_info_ext = coex_sta->bt_info_ext;
3463 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %s", 3450 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %s",
3464 "BT Info A2DP rate", 3451 "BT Info A2DP rate",
3465 (bt_info_ext&BIT0) ? "Basic rate" : "EDR rate"); 3452 (bt_info_ext&BIT0) ? "Basic rate" : "EDR rate");
3466 CL_PRINTF(cli_buf);
3467 3453
3468 for (i = 0; i < BT_INFO_SRC_8821A_2ANT_MAX; i++) { 3454 for (i = 0; i < BT_INFO_SRC_8821A_2ANT_MAX; i++) {
3469 if (coex_sta->bt_info_c2h_cnt[i]) { 3455 if (coex_sta->bt_info_c2h_cnt[i]) {
3470 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 3456 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
3471 "\r\n %-35s = %02x %02x %02x %02x %02x %02x %02x(%d)", 3457 "\r\n %-35s = %02x %02x %02x %02x %02x %02x %02x(%d)",
3472 glbt_info_src_8821a_2ant[i], 3458 glbt_info_src_8821a_2ant[i],
3473 coex_sta->bt_info_c2h[i][0], 3459 coex_sta->bt_info_c2h[i][0],
@@ -3478,139 +3464,118 @@ ex_halbtc8821a2ant_display_coex_info(
3478 coex_sta->bt_info_c2h[i][5], 3464 coex_sta->bt_info_c2h[i][5],
3479 coex_sta->bt_info_c2h[i][6], 3465 coex_sta->bt_info_c2h[i][6],
3480 coex_sta->bt_info_c2h_cnt[i]); 3466 coex_sta->bt_info_c2h_cnt[i]);
3481 CL_PRINTF(cli_buf);
3482 } 3467 }
3483 } 3468 }
3484 3469
3485 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %s/%s", 3470 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %s/%s",
3486 "PS state, IPS/LPS", 3471 "PS state, IPS/LPS",
3487 ((coex_sta->under_ips ? "IPS ON" : "IPS OFF")), 3472 ((coex_sta->under_ips ? "IPS ON" : "IPS OFF")),
3488 ((coex_sta->under_lps ? "LPS ON" : "LPS OFF"))); 3473 ((coex_sta->under_lps ? "LPS ON" : "LPS OFF")));
3489 CL_PRINTF(cli_buf);
3490 btcoexist->btc_disp_dbg_msg(btcoexist, BTC_DBG_DISP_FW_PWR_MODE_CMD); 3474 btcoexist->btc_disp_dbg_msg(btcoexist, BTC_DBG_DISP_FW_PWR_MODE_CMD);
3491 3475
3492 /* Sw mechanism*/ 3476 /* Sw mechanism*/
3493 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s", 3477 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s",
3494 "============[Sw mechanism]============"); 3478 "============[Sw mechanism]============");
3495 CL_PRINTF(cli_buf); 3479 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
3496 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE,
3497 "\r\n %-35s = %d/ %d/ %d/ %d ", 3480 "\r\n %-35s = %d/ %d/ %d/ %d ",
3498 "SM1[ShRf/ LpRA/ LimDig/ btLna]", 3481 "SM1[ShRf/ LpRA/ LimDig/ btLna]",
3499 coex_dm->cur_rf_rx_lpf_shrink, coex_dm->cur_low_penalty_ra, 3482 coex_dm->cur_rf_rx_lpf_shrink, coex_dm->cur_low_penalty_ra,
3500 coex_dm->limited_dig, coex_dm->cur_bt_lna_constrain); 3483 coex_dm->limited_dig, coex_dm->cur_bt_lna_constrain);
3501 CL_PRINTF(cli_buf); 3484 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
3502 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE,
3503 "\r\n %-35s = %d/ %d/ %d(0x%x) ", 3485 "\r\n %-35s = %d/ %d/ %d(0x%x) ",
3504 "SM2[AgcT/ AdcB/ SwDacSwing(lvl)]", 3486 "SM2[AgcT/ AdcB/ SwDacSwing(lvl)]",
3505 coex_dm->cur_agc_table_en, coex_dm->cur_adc_back_off, 3487 coex_dm->cur_agc_table_en, coex_dm->cur_adc_back_off,
3506 coex_dm->cur_dac_swing_on, coex_dm->cur_dac_swing_lvl); 3488 coex_dm->cur_dac_swing_on, coex_dm->cur_dac_swing_lvl);
3507 CL_PRINTF(cli_buf);
3508 3489
3509 /* Fw mechanism*/ 3490 /* Fw mechanism*/
3510 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s", 3491 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s",
3511 "============[Fw mechanism]============"); 3492 "============[Fw mechanism]============");
3512 CL_PRINTF(cli_buf);
3513 3493
3514 if (!btcoexist->manual_control) { 3494 if (!btcoexist->manual_control) {
3515 ps_tdma_case = coex_dm->cur_ps_tdma; 3495 ps_tdma_case = coex_dm->cur_ps_tdma;
3516 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 3496 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
3517 "\r\n %-35s = %02x %02x %02x %02x %02x case-%d", 3497 "\r\n %-35s = %02x %02x %02x %02x %02x case-%d",
3518 "PS TDMA", 3498 "PS TDMA",
3519 coex_dm->ps_tdma_para[0], coex_dm->ps_tdma_para[1], 3499 coex_dm->ps_tdma_para[0], coex_dm->ps_tdma_para[1],
3520 coex_dm->ps_tdma_para[2], coex_dm->ps_tdma_para[3], 3500 coex_dm->ps_tdma_para[2], coex_dm->ps_tdma_para[3],
3521 coex_dm->ps_tdma_para[4], ps_tdma_case); 3501 coex_dm->ps_tdma_para[4], ps_tdma_case);
3522 CL_PRINTF(cli_buf);
3523 3502
3524 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 3503 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
3525 "\r\n %-35s = %d/ %d ", "DecBtPwr/ IgnWlanAct", 3504 "\r\n %-35s = %d/ %d ", "DecBtPwr/ IgnWlanAct",
3526 coex_dm->cur_dec_bt_pwr, 3505 coex_dm->cur_dec_bt_pwr,
3527 coex_dm->cur_ignore_wlan_act); 3506 coex_dm->cur_ignore_wlan_act);
3528 CL_PRINTF(cli_buf);
3529 } 3507 }
3530 3508
3531 /* Hw setting*/ 3509 /* Hw setting*/
3532 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 3510 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
3533 "\r\n %-35s", "============[Hw setting]============"); 3511 "\r\n %-35s", "============[Hw setting]============");
3534 CL_PRINTF(cli_buf);
3535 3512
3536 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, 3513 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
3537 "\r\n %-35s = 0x%x", "RF-A, 0x1e initVal", 3514 "\r\n %-35s = 0x%x", "RF-A, 0x1e initVal",
3538 coex_dm->bt_rf0x1e_backup); 3515 coex_dm->bt_rf0x1e_backup);
3539 CL_PRINTF(cli_buf);
3540 3516
3541 u1tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x778); 3517 u1tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x778);
3542 u1tmp[1] = btcoexist->btc_read_1byte(btcoexist, 0x6cc); 3518 u1tmp[1] = btcoexist->btc_read_1byte(btcoexist, 0x6cc);
3543 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = 0x%x/ 0x%x ", 3519 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = 0x%x/ 0x%x ",
3544 "0x778 (W_Act)/ 0x6cc (CoTab Sel)", 3520 "0x778 (W_Act)/ 0x6cc (CoTab Sel)",
3545 u1tmp[0], u1tmp[1]); 3521 u1tmp[0], u1tmp[1]);
3546 CL_PRINTF(cli_buf);
3547 3522
3548 u1tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x8db); 3523 u1tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x8db);
3549 u1tmp[1] = btcoexist->btc_read_1byte(btcoexist, 0xc5b); 3524 u1tmp[1] = btcoexist->btc_read_1byte(btcoexist, 0xc5b);
3550 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = 0x%x/ 0x%x", 3525 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = 0x%x/ 0x%x",
3551 "0x8db(ADC)/0xc5b[29:25](DAC)", 3526 "0x8db(ADC)/0xc5b[29:25](DAC)",
3552 ((u1tmp[0]&0x60)>>5), ((u1tmp[1]&0x3e)>>1)); 3527 ((u1tmp[0]&0x60)>>5), ((u1tmp[1]&0x3e)>>1));
3553 CL_PRINTF(cli_buf);
3554 3528
3555 u4tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0xcb4); 3529 u4tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0xcb4);
3556 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = 0x%x/ 0x%x", 3530 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = 0x%x/ 0x%x",
3557 "0xcb4[7:0](ctrl)/ 0xcb4[29:28](val)", 3531 "0xcb4[7:0](ctrl)/ 0xcb4[29:28](val)",
3558 u4tmp[0]&0xff, ((u4tmp[0]&0x30000000)>>28)); 3532 u4tmp[0]&0xff, ((u4tmp[0]&0x30000000)>>28));
3559 CL_PRINTF(cli_buf);
3560 3533
3561 u1tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x40); 3534 u1tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x40);
3562 u4tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x4c); 3535 u4tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x4c);
3563 u4tmp[1] = btcoexist->btc_read_4byte(btcoexist, 0x974); 3536 u4tmp[1] = btcoexist->btc_read_4byte(btcoexist, 0x974);
3564 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = 0x%x/ 0x%x/ 0x%x", 3537 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = 0x%x/ 0x%x/ 0x%x",
3565 "0x40/ 0x4c[24:23]/ 0x974", 3538 "0x40/ 0x4c[24:23]/ 0x974",
3566 u1tmp[0], ((u4tmp[0]&0x01800000)>>23), u4tmp[1]); 3539 u1tmp[0], ((u4tmp[0]&0x01800000)>>23), u4tmp[1]);
3567 CL_PRINTF(cli_buf);
3568 3540
3569 u4tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x550); 3541 u4tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x550);
3570 u1tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x522); 3542 u1tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x522);
3571 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = 0x%x/ 0x%x", 3543 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = 0x%x/ 0x%x",
3572 "0x550(bcn ctrl)/0x522", 3544 "0x550(bcn ctrl)/0x522",
3573 u4tmp[0], u1tmp[0]); 3545 u4tmp[0], u1tmp[0]);
3574 CL_PRINTF(cli_buf);
3575 3546
3576 u4tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0xc50); 3547 u4tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0xc50);
3577 u1tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0xa0a); 3548 u1tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0xa0a);
3578 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = 0x%x/ 0x%x", 3549 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = 0x%x/ 0x%x",
3579 "0xc50(DIG)/0xa0a(CCK-TH)", 3550 "0xc50(DIG)/0xa0a(CCK-TH)",
3580 u4tmp[0], u1tmp[0]); 3551 u4tmp[0], u1tmp[0]);
3581 CL_PRINTF(cli_buf);
3582 3552
3583 u4tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0xf48); 3553 u4tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0xf48);
3584 u1tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0xa5b); 3554 u1tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0xa5b);
3585 u1tmp[1] = btcoexist->btc_read_1byte(btcoexist, 0xa5c); 3555 u1tmp[1] = btcoexist->btc_read_1byte(btcoexist, 0xa5c);
3586 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = 0x%x/ 0x%x", 3556 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = 0x%x/ 0x%x",
3587 "OFDM-FA/ CCK-FA", 3557 "OFDM-FA/ CCK-FA",
3588 u4tmp[0], (u1tmp[0]<<8) + u1tmp[1]); 3558 u4tmp[0], (u1tmp[0]<<8) + u1tmp[1]);
3589 CL_PRINTF(cli_buf);
3590 3559
3591 u4tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x6c0); 3560 u4tmp[0] = btcoexist->btc_read_4byte(btcoexist, 0x6c0);
3592 u4tmp[1] = btcoexist->btc_read_4byte(btcoexist, 0x6c4); 3561 u4tmp[1] = btcoexist->btc_read_4byte(btcoexist, 0x6c4);
3593 u4tmp[2] = btcoexist->btc_read_4byte(btcoexist, 0x6c8); 3562 u4tmp[2] = btcoexist->btc_read_4byte(btcoexist, 0x6c8);
3594 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = 0x%x/ 0x%x/ 0x%x", 3563 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = 0x%x/ 0x%x/ 0x%x",
3595 "0x6c0/0x6c4/0x6c8", 3564 "0x6c0/0x6c4/0x6c8",
3596 u4tmp[0], u4tmp[1], u4tmp[2]); 3565 u4tmp[0], u4tmp[1], u4tmp[2]);
3597 CL_PRINTF(cli_buf);
3598 3566
3599 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %d/ %d", 3567 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %d/ %d",
3600 "0x770 (hi-pri Rx/Tx)", 3568 "0x770 (hi-pri Rx/Tx)",
3601 coex_sta->high_priority_rx, coex_sta->high_priority_tx); 3569 coex_sta->high_priority_rx, coex_sta->high_priority_tx);
3602 CL_PRINTF(cli_buf); 3570 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %d/ %d",
3603 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = %d/ %d",
3604 "0x774(low-pri Rx/Tx)", 3571 "0x774(low-pri Rx/Tx)",
3605 coex_sta->low_priority_rx, coex_sta->low_priority_tx); 3572 coex_sta->low_priority_rx, coex_sta->low_priority_tx);
3606 CL_PRINTF(cli_buf);
3607 3573
3608 /* Tx mgnt queue hang or not, 0x41b should = 0xf, ex: 0xd ==>hang*/ 3574 /* Tx mgnt queue hang or not, 0x41b should = 0xf, ex: 0xd ==>hang*/
3609 u1tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x41b); 3575 u1tmp[0] = btcoexist->btc_read_1byte(btcoexist, 0x41b);
3610 CL_SPRINTF(cli_buf, BT_TMP_BUF_SIZE, "\r\n %-35s = 0x%x", 3576 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = 0x%x",
3611 "0x41b (mgntQ hang chk == 0xf)", 3577 "0x41b (mgntQ hang chk == 0xf)",
3612 u1tmp[0]); 3578 u1tmp[0]);
3613 CL_PRINTF(cli_buf);
3614 3579
3615 btcoexist->btc_disp_dbg_msg(btcoexist, BTC_DBG_DISP_COEX_STATISTICS); 3580 btcoexist->btc_disp_dbg_msg(btcoexist, BTC_DBG_DISP_COEX_STATISTICS);
3616} 3581}
diff --git a/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c b/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c
index 0620b22192c4..fcf7459b5d66 100644
--- a/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c
+++ b/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c
@@ -32,7 +32,6 @@
32struct btc_coexist gl_bt_coexist; 32struct btc_coexist gl_bt_coexist;
33 33
34u32 btc_dbg_type[BTC_MSG_MAX]; 34u32 btc_dbg_type[BTC_MSG_MAX];
35static u8 btc_dbg_buf[100];
36 35
37/*************************************************** 36/***************************************************
38 * Debug related function 37 * Debug related function
@@ -652,8 +651,6 @@ bool exhalbtc_initlize_variables(struct rtl_priv *adapter)
652 btcoexist->btc_get = halbtc_get; 651 btcoexist->btc_get = halbtc_get;
653 btcoexist->btc_set = halbtc_set; 652 btcoexist->btc_set = halbtc_set;
654 653
655 btcoexist->cli_buf = &btc_dbg_buf[0];
656
657 btcoexist->bt_info.bt_ctrl_buf_size = false; 654 btcoexist->bt_info.bt_ctrl_buf_size = false;
658 btcoexist->bt_info.agg_buf_size = 5; 655 btcoexist->bt_info.agg_buf_size = 5;
659 656
diff --git a/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h b/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h
index bd03b8cccd32..1345545f66bc 100644
--- a/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h
+++ b/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h
@@ -116,9 +116,6 @@ extern u32 btc_dbg_type[];
116#define WIFI_P2P_GO_CONNECTED BIT3 116#define WIFI_P2P_GO_CONNECTED BIT3
117#define WIFI_P2P_GC_CONNECTED BIT4 117#define WIFI_P2P_GC_CONNECTED BIT4
118 118
119#define CL_SPRINTF snprintf
120#define CL_PRINTF(buf) printk("%s", buf)
121
122#define BTC_PRINT(dbgtype, dbgflag, printstr, ...) \ 119#define BTC_PRINT(dbgtype, dbgflag, printstr, ...) \
123 do { \ 120 do { \
124 if (unlikely(btc_dbg_type[dbgtype] & dbgflag)) {\ 121 if (unlikely(btc_dbg_type[dbgtype] & dbgflag)) {\
@@ -483,7 +480,6 @@ struct btc_coexist {
483 bool initilized; 480 bool initilized;
484 bool stop_coex_dm; 481 bool stop_coex_dm;
485 bool manual_control; 482 bool manual_control;
486 u8 *cli_buf;
487 struct btc_statistics statistics; 483 struct btc_statistics statistics;
488 u8 pwr_mode_val[10]; 484 u8 pwr_mode_val[10];
489 485
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-16 05:48:25 -0400