Commit 8f11dad4 authored by Larry Finger's avatar Larry Finger Committed by Kalle Valo
Browse files

rtlwifi: rtl8723ae Rename RT_TRACE to rtl_dbg 



Change the misleading macro name to one that is more descriptive for
rtl8723ae. Changes suggested by ckeckpatch.pl have been made.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200723204244.24457-12-Larry.Finger@lwfinger.net
parent fca8218d

drivers/net/wireless/realtek/rtlwifi/rtl8723ae/dm.c

+81 −81
Original line number Diff line number Diff line
@@ -82,13 +82,13 @@ static void rtl8723e_dm_false_alarm_counter_statistics(struct ieee80211_hw *hw) 
	rtl_set_bbreg(hw, RCCK0_FALSEALARMREPORT, 0x0000c000, 0);

	rtl_set_bbreg(hw, RCCK0_FALSEALARMREPORT, 0x0000c000, 2);



	RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE,

	rtl_dbg(rtlpriv, COMP_DIG, DBG_TRACE,

		"cnt_parity_fail = %d, cnt_rate_illegal = %d, cnt_crc8_fail = %d, cnt_mcs_fail = %d\n",

		falsealm_cnt->cnt_parity_fail,

		falsealm_cnt->cnt_rate_illegal,

		falsealm_cnt->cnt_crc8_fail, falsealm_cnt->cnt_mcs_fail);



	RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE,

	rtl_dbg(rtlpriv, COMP_DIG, DBG_TRACE,

		"cnt_ofdm_fail = %x, cnt_cck_fail = %x, cnt_all = %x\n",

		falsealm_cnt->cnt_ofdm_fail,

		falsealm_cnt->cnt_cck_fail, falsealm_cnt->cnt_all);
@@ -150,7 +150,7 @@ static void rtl92c_dm_ctrl_initgain_by_rssi(struct ieee80211_hw *hw) 
		dm_digtable->cur_igvalue = dm_digtable->rssi_val_min + 10 -

		    dm_digtable->back_val;



	RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE,

	rtl_dbg(rtlpriv, COMP_DIG, DBG_TRACE,

		"rssi_val_min = %x back_val %x\n",

		dm_digtable->rssi_val_min, dm_digtable->back_val);
@@ -201,7 +201,7 @@ static void rtl8723e_dm_initial_gain_multi_sta(struct ieee80211_hw *hw) 
		rtl8723e_dm_write_dig(hw);

	}



	RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE,

	rtl_dbg(rtlpriv, COMP_DIG, DBG_TRACE,

		"curmultista_cstate = %x dig_ext_port_stage %x\n",

		dm_digtable->curmultista_cstate,

		dm_digtable->dig_ext_port_stage);
@@ -212,7 +212,7 @@ static void rtl8723e_dm_initial_gain_sta(struct ieee80211_hw *hw) 
	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct dig_t *dm_digtable = &rtlpriv->dm_digtable;



	RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE,

	rtl_dbg(rtlpriv, COMP_DIG, DBG_TRACE,

		"presta_cstate = %x, cursta_cstate = %x\n",

		dm_digtable->presta_cstate,

		dm_digtable->cursta_cstate);
@@ -296,7 +296,7 @@ static void rtl8723e_dm_cck_packet_detection_thresh(struct ieee80211_hw *hw) 
		dm_digtable->pre_cck_pd_state = dm_digtable->cur_cck_pd_state;

	}



	RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE,

	rtl_dbg(rtlpriv, COMP_DIG, DBG_TRACE,

		"CCKPDStage=%x\n", dm_digtable->cur_cck_pd_state);



}
@@ -354,7 +354,7 @@ static void rtl8723e_dm_dynamic_txpower(struct ieee80211_hw *hw) 


	if ((mac->link_state < MAC80211_LINKED) &&

	    (rtlpriv->dm.entry_min_undec_sm_pwdb == 0)) {

		RT_TRACE(rtlpriv, COMP_POWER, DBG_TRACE,

		rtl_dbg(rtlpriv, COMP_POWER, DBG_TRACE,

			"Not connected to any\n");



		rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_NORMAL;
@@ -367,13 +367,13 @@ static void rtl8723e_dm_dynamic_txpower(struct ieee80211_hw *hw) 
		if (mac->opmode == NL80211_IFTYPE_ADHOC) {

			undec_sm_pwdb =

			    rtlpriv->dm.entry_min_undec_sm_pwdb;

			RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,

			rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,

				"AP Client PWDB = 0x%lx\n",

				undec_sm_pwdb);

		} else {

			undec_sm_pwdb =

			    rtlpriv->dm.undec_sm_pwdb;

			RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,

			rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,

				"STA Default Port PWDB = 0x%lx\n",

				undec_sm_pwdb);

		}
@@ -381,31 +381,31 @@ static void rtl8723e_dm_dynamic_txpower(struct ieee80211_hw *hw) 
		undec_sm_pwdb =

		    rtlpriv->dm.entry_min_undec_sm_pwdb;



		RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,

			"AP Ext Port PWDB = 0x%lx\n",

			undec_sm_pwdb);

	}



	if (undec_sm_pwdb >= TX_POWER_NEAR_FIELD_THRESH_LVL2) {

		rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_LEVEL1;

		RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,

			"TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x0)\n");

	} else if ((undec_sm_pwdb <

		    (TX_POWER_NEAR_FIELD_THRESH_LVL2 - 3)) &&

		   (undec_sm_pwdb >=

		    TX_POWER_NEAR_FIELD_THRESH_LVL1)) {

		rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_LEVEL1;

		RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,

			"TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x10)\n");

	} else if (undec_sm_pwdb <

		   (TX_POWER_NEAR_FIELD_THRESH_LVL1 - 5)) {

		rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_NORMAL;

		RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,

			"TXHIGHPWRLEVEL_NORMAL\n");

	}



	if (rtlpriv->dm.dynamic_txhighpower_lvl != rtlpriv->dm.last_dtp_lvl) {

		RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,

			"PHY_SetTxPowerLevel8192S() Channel = %d\n",

			rtlphy->current_channel);

		rtl8723e_phy_set_txpower_level(hw, rtlphy->current_channel);
@@ -419,7 +419,7 @@ void rtl8723e_dm_write_dig(struct ieee80211_hw *hw) 
	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct dig_t *dm_digtable = &rtlpriv->dm_digtable;



	RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD,

		"cur_igvalue = 0x%x, pre_igvalue = 0x%x, back_val = %d\n",

		dm_digtable->cur_igvalue, dm_digtable->pre_igvalue,

		dm_digtable->back_val);
@@ -521,7 +521,7 @@ static void rtl8723e_dm_initialize_txpower_tracking_thermalmeter( 
	rtlpriv->dm.txpower_tracking = true;

	rtlpriv->dm.txpower_trackinginit = false;



	RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,

		"pMgntInfo->txpower_tracking = %d\n",

		rtlpriv->dm.txpower_tracking);

}
@@ -561,13 +561,13 @@ static void rtl8723e_dm_refresh_rate_adaptive_mask(struct ieee80211_hw *hw) 
	struct ieee80211_sta *sta = NULL;



	if (is_hal_stop(rtlhal)) {

		RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_RATE, DBG_LOUD,

			" driver is going to unload\n");

		return;

	}



	if (!rtlpriv->dm.useramask) {

		RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_RATE, DBG_LOUD,

			" driver does not control rate adaptive mask\n");

		return;

	}
@@ -612,12 +612,12 @@ static void rtl8723e_dm_refresh_rate_adaptive_mask(struct ieee80211_hw *hw) 
			p_ra->ratr_state = DM_RATR_STA_LOW;



		if (p_ra->pre_ratr_state != p_ra->ratr_state) {

			RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,

			rtl_dbg(rtlpriv, COMP_RATE, DBG_LOUD,

				"RSSI = %ld\n",

				rtlpriv->dm.undec_sm_pwdb);

			RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,

			rtl_dbg(rtlpriv, COMP_RATE, DBG_LOUD,

				"RSSI_LEVEL = %d\n", p_ra->ratr_state);

			RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,

			rtl_dbg(rtlpriv, COMP_RATE, DBG_LOUD,

				"PreState = %d, CurState = %d\n",

				p_ra->pre_ratr_state, p_ra->ratr_state);
@@ -716,7 +716,7 @@ static void rtl8723e_dm_dynamic_bb_powersaving(struct ieee80211_hw *hw) 
	if (((mac->link_state == MAC80211_NOLINK)) &&

	    (rtlpriv->dm.entry_min_undec_sm_pwdb == 0)) {

		dm_pstable->rssi_val_min = 0;

		RT_TRACE(rtlpriv, DBG_LOUD, DBG_LOUD,

		rtl_dbg(rtlpriv, DBG_LOUD, DBG_LOUD,

			"Not connected to any\n");

	}
@@ -724,13 +724,13 @@ static void rtl8723e_dm_dynamic_bb_powersaving(struct ieee80211_hw *hw) 
		if (mac->opmode == NL80211_IFTYPE_ADHOC) {

			dm_pstable->rssi_val_min =

			    rtlpriv->dm.entry_min_undec_sm_pwdb;

			RT_TRACE(rtlpriv, DBG_LOUD, DBG_LOUD,

			rtl_dbg(rtlpriv, DBG_LOUD, DBG_LOUD,

				"AP Client PWDB = 0x%lx\n",

				dm_pstable->rssi_val_min);

		} else {

			dm_pstable->rssi_val_min =

			    rtlpriv->dm.undec_sm_pwdb;

			RT_TRACE(rtlpriv, DBG_LOUD, DBG_LOUD,

			rtl_dbg(rtlpriv, DBG_LOUD, DBG_LOUD,

				"STA Default Port PWDB = 0x%lx\n",

				dm_pstable->rssi_val_min);

		}
@@ -738,7 +738,7 @@ static void rtl8723e_dm_dynamic_bb_powersaving(struct ieee80211_hw *hw) 
		dm_pstable->rssi_val_min =

		    rtlpriv->dm.entry_min_undec_sm_pwdb;



		RT_TRACE(rtlpriv, DBG_LOUD, DBG_LOUD,

		rtl_dbg(rtlpriv, DBG_LOUD, DBG_LOUD,

			"AP Ext Port PWDB = 0x%lx\n",

			dm_pstable->rssi_val_min);

	}
@@ -820,21 +820,21 @@ void rtl8723e_dm_bt_coexist(struct ieee80211_hw *hw) 
	struct rtl_priv *rtlpriv = rtl_priv(hw);

	u8 tmp_byte = 0;

	if (!rtlpriv->btcoexist.bt_coexistence) {

		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,

			"[DM]{BT], BT not exist!!\n");

		return;

	}



	if (!rtlpriv->btcoexist.init_set) {

		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,

			 "[DM][BT], rtl8723e_dm_bt_coexist()\n");

		rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,

			"[DM][BT], %s\n", __func__);

		rtl8723e_dm_init_bt_coexist(hw);

	}



	tmp_byte = rtl_read_byte(rtlpriv, 0x40);

	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,

		"[DM][BT], 0x40 is 0x%x\n", tmp_byte);

	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,

	rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,

		"[DM][BT], bt_dm_coexist start\n");

	rtl8723e_dm_bt_coexist_8723(hw);

}

drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.c

+32 −32
Original line number Diff line number Diff line
@@ -43,12 +43,12 @@ static void _rtl8723e_fill_h2c_command(struct ieee80211_hw *hw, u8 element_id, 
	unsigned long flag;

	u8 idx;



	RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "come in\n");

	rtl_dbg(rtlpriv, COMP_CMD, DBG_LOUD, "come in\n");



	while (true) {

		spin_lock_irqsave(&rtlpriv->locks.h2c_lock, flag);

		if (rtlhal->h2c_setinprogress) {

			RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,

			rtl_dbg(rtlpriv, COMP_CMD, DBG_LOUD,

				"H2C set in progress! Wait to set..element_id(%d).\n",

				element_id);
@@ -56,7 +56,7 @@ static void _rtl8723e_fill_h2c_command(struct ieee80211_hw *hw, u8 element_id, 
				spin_unlock_irqrestore(&rtlpriv->locks.h2c_lock,

						       flag);

				h2c_waitcounter++;

				RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,

				rtl_dbg(rtlpriv, COMP_CMD, DBG_LOUD,

					"Wait 100 us (%d times)...\n",

					h2c_waitcounter);

				udelay(100);
@@ -110,7 +110,7 @@ static void _rtl8723e_fill_h2c_command(struct ieee80211_hw *hw, u8 element_id, 


			wait_h2c_limmit--;

			if (wait_h2c_limmit == 0) {

				RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,

				rtl_dbg(rtlpriv, COMP_CMD, DBG_LOUD,

					"Waiting too long for FW read clear HMEBox(%d)!\n",

					boxnum);

				break;
@@ -121,13 +121,13 @@ static void _rtl8723e_fill_h2c_command(struct ieee80211_hw *hw, u8 element_id, 
			isfw_read = _rtl8723e_check_fw_read_last_h2c(hw,

								boxnum);

			u1b_tmp = rtl_read_byte(rtlpriv, 0x1BF);

			RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,

			rtl_dbg(rtlpriv, COMP_CMD, DBG_LOUD,

				"Waiting for FW read clear HMEBox(%d)!!! 0x1BF = %2x\n",

				boxnum, u1b_tmp);

		}



		if (!isfw_read) {

			RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,

			rtl_dbg(rtlpriv, COMP_CMD, DBG_LOUD,

				"Write H2C register BOX[%d] fail!!!!! Fw do not read.\n",

				boxnum);

			break;
@@ -136,7 +136,7 @@ static void _rtl8723e_fill_h2c_command(struct ieee80211_hw *hw, u8 element_id, 
		memset(boxcontent, 0, sizeof(boxcontent));

		memset(boxextcontent, 0, sizeof(boxextcontent));

		boxcontent[0] = element_id;

		RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_CMD, DBG_LOUD,

			"Write element_id box_reg(%4x) = %2x\n",

			box_reg, element_id);
@@ -217,7 +217,7 @@ static void _rtl8723e_fill_h2c_command(struct ieee80211_hw *hw, u8 element_id, 
		if (rtlhal->last_hmeboxnum == 4)

			rtlhal->last_hmeboxnum = 0;



		RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_CMD, DBG_LOUD,

			"pHalData->last_hmeboxnum  = %d\n",

			rtlhal->last_hmeboxnum);

	}
@@ -226,7 +226,7 @@ static void _rtl8723e_fill_h2c_command(struct ieee80211_hw *hw, u8 element_id, 
	rtlhal->h2c_setinprogress = false;

	spin_unlock_irqrestore(&rtlpriv->locks.h2c_lock, flag);



	RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "go out\n");

	rtl_dbg(rtlpriv, COMP_CMD, DBG_LOUD, "go out\n");

}



void rtl8723e_fill_h2c_cmd(struct ieee80211_hw *hw,
@@ -252,7 +252,7 @@ void rtl8723e_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode) 
	u8 u1_h2c_set_pwrmode[3] = { 0 };

	struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));



	RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, "FW LPS mode = %d\n", mode);

	rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD, "FW LPS mode = %d\n", mode);



	SET_H2CCMD_PWRMODE_PARM_MODE(u1_h2c_set_pwrmode, mode);

	SET_H2CCMD_PWRMODE_PARM_SMART_PS(u1_h2c_set_pwrmode,
@@ -458,7 +458,7 @@ void rtl8723e_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished) 
		b_dlok = true;



	if (b_dlok) {

		RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,

			"Set RSVD page location to Fw.\n");

		RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,

			      "H2C_RSVDPAGE:\n",
@@ -466,7 +466,7 @@ void rtl8723e_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished) 
		rtl8723e_fill_h2c_cmd(hw, H2C_RSVDPAGE,

				      sizeof(u1rsvdpageloc), u1rsvdpageloc);

	} else

		RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,

		rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,

			"Set RSVD page location to Fw FAIL!!!!!!.\n");

}
@@ -501,11 +501,11 @@ void rtl8723e_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state) 


	switch (p2p_ps_state) {

	case P2P_PS_DISABLE:

		RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_DISABLE\n");

		rtl_dbg(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_DISABLE\n");

		memset(p2p_ps_offload, 0, sizeof(*p2p_ps_offload));

		break;

	case P2P_PS_ENABLE:

		RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_ENABLE\n");

		rtl_dbg(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_ENABLE\n");

		/* update CTWindow value. */

		if (p2pinfo->ctwindow > 0) {

			p2p_ps_offload->ctwindow_en = 1;
@@ -564,11 +564,11 @@ void rtl8723e_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state) 
		}

		break;

	case P2P_PS_SCAN:

		RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_SCAN\n");

		rtl_dbg(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_SCAN\n");

		p2p_ps_offload->discovery = 1;

		break;

	case P2P_PS_SCAN_DONE:

		RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_SCAN_DONE\n");

		rtl_dbg(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_SCAN_DONE\n");

		p2p_ps_offload->discovery = 0;

		p2pinfo->p2p_ps_state = P2P_PS_ENABLE;

		break;

drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_bt_coexist.c

+75 −75
Original line number Diff line number Diff line
@@ -102,11 +102,11 @@ u8 rtl8723e_dm_bt_check_coex_rssi_state1(struct ieee80211_hw *hw, 
					BT_COEX_STATE_WIFI_RSSI_1_HIGH;

				rtlpriv->btcoexist.cstate &=

					~BT_COEX_STATE_WIFI_RSSI_1_LOW;

				RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

				rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

					"[DM][BT], RSSI_1 state switch to High\n");

			} else {

				bt_rssi_state = BT_RSSI_STATE_STAY_LOW;

				RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

				rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

					"[DM][BT], RSSI_1 state stay at Low\n");

			}

		} else {
@@ -116,17 +116,17 @@ u8 rtl8723e_dm_bt_check_coex_rssi_state1(struct ieee80211_hw *hw, 
					BT_COEX_STATE_WIFI_RSSI_1_LOW;

				rtlpriv->btcoexist.cstate &=

					~BT_COEX_STATE_WIFI_RSSI_1_HIGH;

				RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

				rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

					"[DM][BT], RSSI_1 state switch to Low\n");

			} else {

				bt_rssi_state = BT_RSSI_STATE_STAY_HIGH;

				RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

				rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

					"[DM][BT], RSSI_1 state stay at High\n");

			}

		}

	} else if (level_num == 3) {

		if (rssi_thresh > rssi_thresh1) {

			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

			rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

				"[DM][BT], RSSI_1 thresh error!!\n");

			return rtlpriv->btcoexist.bt_pre_rssi_state;

		}
@@ -144,11 +144,11 @@ u8 rtl8723e_dm_bt_check_coex_rssi_state1(struct ieee80211_hw *hw, 
					~BT_COEX_STATE_WIFI_RSSI_1_LOW;

				rtlpriv->btcoexist.cstate &=

					~BT_COEX_STATE_WIFI_RSSI_1_HIGH;

				RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

				rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

					"[DM][BT], RSSI_1 state switch to Medium\n");

			} else {

				bt_rssi_state = BT_RSSI_STATE_STAY_LOW;

				RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

				rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

					"[DM][BT], RSSI_1 state stay at Low\n");

			}

		} else if ((rtlpriv->btcoexist.bt_pre_rssi_state ==
@@ -164,7 +164,7 @@ u8 rtl8723e_dm_bt_check_coex_rssi_state1(struct ieee80211_hw *hw, 
					~BT_COEX_STATE_WIFI_RSSI_1_LOW;

				rtlpriv->btcoexist.cstate &=

					~BT_COEX_STATE_WIFI_RSSI_1_MEDIUM;

				RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

				rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

					"[DM][BT], RSSI_1 state switch to High\n");

			} else if (undecoratedsmoothed_pwdb < rssi_thresh) {

				bt_rssi_state = BT_RSSI_STATE_LOW;
@@ -174,11 +174,11 @@ u8 rtl8723e_dm_bt_check_coex_rssi_state1(struct ieee80211_hw *hw, 
					~BT_COEX_STATE_WIFI_RSSI_1_HIGH;

				rtlpriv->btcoexist.cstate &=

					~BT_COEX_STATE_WIFI_RSSI_1_MEDIUM;

				RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

				rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

					"[DM][BT], RSSI_1 state switch to Low\n");

			} else {

				bt_rssi_state = BT_RSSI_STATE_STAY_MEDIUM;

				RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

				rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

					"[DM][BT], RSSI_1 state stay at Medium\n");

			}

		} else {
@@ -190,11 +190,11 @@ u8 rtl8723e_dm_bt_check_coex_rssi_state1(struct ieee80211_hw *hw, 
					~BT_COEX_STATE_WIFI_RSSI_1_HIGH;

				rtlpriv->btcoexist.cstate &=

					~BT_COEX_STATE_WIFI_RSSI_1_LOW;

				RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

				rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

					"[DM][BT], RSSI_1 state switch to Medium\n");

			} else {

				bt_rssi_state = BT_RSSI_STATE_STAY_HIGH;

				RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

				rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

					"[DM][BT], RSSI_1 state stay at High\n");

			}

		}
@@ -230,11 +230,11 @@ u8 rtl8723e_dm_bt_check_coex_rssi_state(struct ieee80211_hw *hw, 
					|= BT_COEX_STATE_WIFI_RSSI_HIGH;

				rtlpriv->btcoexist.cstate

					&= ~BT_COEX_STATE_WIFI_RSSI_LOW;

				RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

				rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

					"[DM][BT], RSSI state switch to High\n");

			} else {

				bt_rssi_state = BT_RSSI_STATE_STAY_LOW;

				RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

				rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

					"[DM][BT], RSSI state stay at Low\n");

			}

		} else {
@@ -244,17 +244,17 @@ u8 rtl8723e_dm_bt_check_coex_rssi_state(struct ieee80211_hw *hw, 
					|= BT_COEX_STATE_WIFI_RSSI_LOW;

				rtlpriv->btcoexist.cstate

					&= ~BT_COEX_STATE_WIFI_RSSI_HIGH;

				RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

				rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

					"[DM][BT], RSSI state switch to Low\n");

			} else {

				bt_rssi_state = BT_RSSI_STATE_STAY_HIGH;

				RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

				rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

					"[DM][BT], RSSI state stay at High\n");

			}

		}

	} else if (level_num == 3) {

		if (rssi_thresh > rssi_thresh1) {

			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

			rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

				"[DM][BT], RSSI thresh error!!\n");

			return rtlpriv->btcoexist.bt_pre_rssi_state;

		}
@@ -271,11 +271,11 @@ u8 rtl8723e_dm_bt_check_coex_rssi_state(struct ieee80211_hw *hw, 
					&= ~BT_COEX_STATE_WIFI_RSSI_LOW;

				rtlpriv->btcoexist.cstate

					&= ~BT_COEX_STATE_WIFI_RSSI_HIGH;

				RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

				rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

					"[DM][BT], RSSI state switch to Medium\n");

			} else {

				bt_rssi_state = BT_RSSI_STATE_STAY_LOW;

				RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

				rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

					"[DM][BT], RSSI state stay at Low\n");

			}

		} else if ((rtlpriv->btcoexist.bt_pre_rssi_state ==
@@ -291,7 +291,7 @@ u8 rtl8723e_dm_bt_check_coex_rssi_state(struct ieee80211_hw *hw, 
					&= ~BT_COEX_STATE_WIFI_RSSI_LOW;

				rtlpriv->btcoexist.cstate

					&= ~BT_COEX_STATE_WIFI_RSSI_MEDIUM;

				RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

				rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

					"[DM][BT], RSSI state switch to High\n");

			} else if (undecoratedsmoothed_pwdb < rssi_thresh) {

				bt_rssi_state = BT_RSSI_STATE_LOW;
@@ -301,11 +301,11 @@ u8 rtl8723e_dm_bt_check_coex_rssi_state(struct ieee80211_hw *hw, 
					&= ~BT_COEX_STATE_WIFI_RSSI_HIGH;

				rtlpriv->btcoexist.cstate

					&= ~BT_COEX_STATE_WIFI_RSSI_MEDIUM;

				RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

				rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

					"[DM][BT], RSSI state switch to Low\n");

			} else {

				bt_rssi_state = BT_RSSI_STATE_STAY_MEDIUM;

				RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

				rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

					"[DM][BT], RSSI state stay at Medium\n");

			}

		} else {
@@ -317,11 +317,11 @@ u8 rtl8723e_dm_bt_check_coex_rssi_state(struct ieee80211_hw *hw, 
					&= ~BT_COEX_STATE_WIFI_RSSI_HIGH;

				rtlpriv->btcoexist.cstate

					&= ~BT_COEX_STATE_WIFI_RSSI_LOW;

				RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

				rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

					"[DM][BT], RSSI state switch to Medium\n");

			} else {

				bt_rssi_state = BT_RSSI_STATE_STAY_HIGH;

				RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

				rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

					"[DM][BT], RSSI state stay at High\n");

			}

		}
@@ -342,8 +342,8 @@ long rtl8723e_dm_bt_get_rx_ss(struct ieee80211_hw *hw) 
		undecoratedsmoothed_pwdb

			= rtlpriv->dm.entry_min_undec_sm_pwdb;

	}

	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

		 "rtl8723e_dm_bt_get_rx_ss() = %ld\n",

	rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

		"%s = %ld\n", __func__,

		undecoratedsmoothed_pwdb);



	return undecoratedsmoothed_pwdb;
@@ -367,7 +367,7 @@ void rtl8723e_dm_bt_balance(struct ieee80211_hw *hw, 
	}

	rtlpriv->btcoexist.balance_on = balance_on;



	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

	rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

		"[DM][BT], Balance=[%s:%dms:%dms], write 0xc=0x%x\n",

		balance_on ? "ON" : "OFF", ms0, ms1, h2c_parameter[0] << 16 |

		h2c_parameter[1] << 8 | h2c_parameter[2]);
@@ -381,7 +381,7 @@ void rtl8723e_dm_bt_agc_table(struct ieee80211_hw *hw, u8 type) 
	struct rtl_priv *rtlpriv = rtl_priv(hw);



	if (type == BT_AGCTABLE_OFF) {

		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

		rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

			"[BT]AGCTable Off!\n");

		rtl_write_dword(rtlpriv, 0xc78, 0x641c0001);

		rtl_write_dword(rtlpriv, 0xc78, 0x631d0001);
@@ -400,7 +400,7 @@ void rtl8723e_dm_bt_agc_table(struct ieee80211_hw *hw, u8 type) 
		rtl8723e_phy_set_rf_reg(hw, RF90_PATH_A,

					RF_RX_G1, 0xfffff, 0x30355);

	} else if (type == BT_AGCTABLE_ON) {

		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

		rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

			"[BT]AGCTable On!\n");

		rtl_write_dword(rtlpriv, 0xc78, 0x4e1c0001);

		rtl_write_dword(rtlpriv, 0xc78, 0x4d1d0001);
@@ -428,11 +428,11 @@ void rtl8723e_dm_bt_bb_back_off_level(struct ieee80211_hw *hw, u8 type) 
	struct rtl_priv *rtlpriv = rtl_priv(hw);



	if (type == BT_BB_BACKOFF_OFF) {

		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

		rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

			"[BT]BBBackOffLevel Off!\n");

		rtl_write_dword(rtlpriv, 0xc04, 0x3a05611);

	} else if (type == BT_BB_BACKOFF_ON) {

		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

		rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

			"[BT]BBBackOffLevel On!\n");

		rtl_write_dword(rtlpriv, 0xc04, 0x3a07611);

		rtlpriv->btcoexist.sw_coexist_all_off = false;
@@ -442,13 +442,13 @@ void rtl8723e_dm_bt_bb_back_off_level(struct ieee80211_hw *hw, u8 type) 
void rtl8723e_dm_bt_fw_coex_all_off(struct ieee80211_hw *hw)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

	rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

		"rtl8723e_dm_bt_fw_coex_all_off()\n");



	if (rtlpriv->btcoexist.fw_coexist_all_off)

		return;



	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

	rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

		"rtl8723e_dm_bt_fw_coex_all_off(), real Do\n");

	rtl8723e_dm_bt_fw_coex_all_off_8723a(hw);

	rtlpriv->btcoexist.fw_coexist_all_off = true;
@@ -458,14 +458,14 @@ void rtl8723e_dm_bt_sw_coex_all_off(struct ieee80211_hw *hw) 
{

	struct rtl_priv *rtlpriv = rtl_priv(hw);



	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

		 "rtl8723e_dm_bt_sw_coex_all_off()\n");

	rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

		"%s\n", __func__);



	if (rtlpriv->btcoexist.sw_coexist_all_off)

		return;



	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

		 "rtl8723e_dm_bt_sw_coex_all_off(), real Do\n");

	rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

		"%s, real Do\n", __func__);

	rtl8723e_dm_bt_sw_coex_all_off_8723a(hw);

	rtlpriv->btcoexist.sw_coexist_all_off = true;

}
@@ -474,13 +474,13 @@ void rtl8723e_dm_bt_hw_coex_all_off(struct ieee80211_hw *hw) 
{

	struct rtl_priv *rtlpriv = rtl_priv(hw);



	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

		 "rtl8723e_dm_bt_hw_coex_all_off()\n");

	rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

		"%s\n", __func__);



	if (rtlpriv->btcoexist.hw_coexist_all_off)

		return;

	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

		 "rtl8723e_dm_bt_hw_coex_all_off(), real Do\n");

	rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,

		"%s, real Do\n", __func__);



	rtl8723e_dm_bt_hw_coex_all_off_8723a(hw);

drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_btc.c

+325 −324

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c

+116 −116

File changed.

Preview size limit exceeded, changes collapsed.