Commit 57b0b743 authored by Larry Finger's avatar Larry Finger Committed by Kalle Valo
Browse files

rtlwifi: rtl8188ee: Rename RT_TRACE to rtl_dbg 



Change the misleading macro name to one that is more descriptive for
rtl8188ee. 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-5-Larry.Finger@lwfinger.net
parent c8159c3f

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

+96 −96
Original line number Diff line number Diff line
@@ -415,13 +415,13 @@ static void rtl88e_dm_false_alarm_counter_statistics(struct ieee80211_hw *hw) 
	rtl_set_bbreg(hw, RCCK0_FALSEALARMREPORT, BIT(15)|BIT(14), 0);

	rtl_set_bbreg(hw, RCCK0_FALSEALARMREPORT, BIT(15)|BIT(14), 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);
@@ -459,7 +459,7 @@ static void rtl88e_dm_cck_packet_detection_thresh(struct ieee80211_hw *hw) 


	dm_dig->cur_cck_cca_thres = cur_cck_cca_thresh;

	dm_dig->pre_cck_cca_thres = dm_dig->cur_cck_cca_thres;

	RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE,

	rtl_dbg(rtlpriv, COMP_DIG, DBG_TRACE,

		"CCK cca thresh hold =%x\n", dm_dig->cur_cck_cca_thres);

}
@@ -520,7 +520,7 @@ static void rtl88e_dm_dig(struct ieee80211_hw *hw) 
	} else {

		dm_dig->rx_gain_max = dm_dig_max;

		dig_dynamic_min = dm_dig_min;

		RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "no link\n");

		rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD, "no link\n");

	}



	if (rtlpriv->falsealm_cnt.cnt_all > 10000) {
@@ -624,7 +624,7 @@ static void rtl92c_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;
@@ -637,13 +637,13 @@ static void rtl92c_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);

		}
@@ -651,32 +651,32 @@ static void rtl92c_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);

		rtl88e_phy_set_txpower_level(hw, rtlphy->current_channel);
@@ -690,7 +690,7 @@ void rtl88e_dm_write_dig(struct ieee80211_hw *hw) 
	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct dig_t *dm_dig = &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, backoff_val = %d\n",

		 dm_dig->cur_igvalue, dm_dig->pre_igvalue,

		 dm_dig->back_val);
@@ -881,14 +881,14 @@ static void dm_txpower_track_cb_therm(struct ieee80211_hw *hw) 


	/*Initilization (7 steps in total) */

	rtlpriv->dm.txpower_trackinginit = true;

	RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,

		 "dm_txpower_track_cb_therm\n");

	rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,

		"%s\n", __func__);



	thermalvalue = (u8)rtl_get_rfreg(hw, RF90_PATH_A, RF_T_METER,

					 0xfc00);

	if (!thermalvalue)

		return;

	RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,

		"Readback Thermal Meter = 0x%x pre thermal meter 0x%x eeprom_thermalmeter 0x%x\n",

		thermalvalue, rtlpriv->dm.thermalvalue,

		rtlefuse->eeprom_thermalmeter);
@@ -900,7 +900,7 @@ static void dm_txpower_track_cb_therm(struct ieee80211_hw *hw) 
		if (ele_d == (ofdmswing_table[i] & MASKOFDM_D)) {

			ofdm_index_old[0] = (u8)i;

			rtldm->swing_idx_ofdm_base[RF90_PATH_A] = (u8)i;

			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,

			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,

				"Initial pathA ele_d reg0x%x = 0x%lx, ofdm_index = 0x%x\n",

				 ROFDM0_XATXIQIMBALANCE,

				 ele_d, ofdm_index_old[0]);
@@ -915,7 +915,7 @@ static void dm_txpower_track_cb_therm(struct ieee80211_hw *hw) 
			if (memcmp(&temp_cck, &cck_tbl_ch14[i][2], 4) == 0) {

				cck_index_old = (u8)i;

				rtldm->swing_idx_cck_base = (u8)i;

				RT_TRACE(rtlpriv, COMP_POWER_TRACKING,

				rtl_dbg(rtlpriv, COMP_POWER_TRACKING,

					DBG_LOUD,

					"Initial reg0x%x = 0x%lx, cck_index = 0x%x, ch 14 %d\n",

					RCCK0_TXFILTER2, temp_cck,
@@ -927,7 +927,7 @@ static void dm_txpower_track_cb_therm(struct ieee80211_hw *hw) 
			if (memcmp(&temp_cck, &cck_tbl_ch1_13[i][2], 4) == 0) {

				cck_index_old = (u8)i;

				rtldm->swing_idx_cck_base = (u8)i;

				RT_TRACE(rtlpriv, COMP_POWER_TRACKING,

				rtl_dbg(rtlpriv, COMP_POWER_TRACKING,

					DBG_LOUD,

					"Initial reg0x%x = 0x%lx, cck_index = 0x%x, ch14 %d\n",

					RCCK0_TXFILTER2, temp_cck,
@@ -987,7 +987,7 @@ static void dm_txpower_track_cb_therm(struct ieee80211_hw *hw) 
	    (thermalvalue - rtlpriv->dm.thermalvalue_iqk) :

	    (rtlpriv->dm.thermalvalue_iqk - thermalvalue);



	RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,

		"Readback Thermal Meter = 0x%x pre thermal meter 0x%x eeprom_thermalmeter 0x%x delta 0x%x delta_lck 0x%x delta_iqk 0x%x\n",

		thermalvalue, rtlpriv->dm.thermalvalue,

		rtlefuse->eeprom_thermalmeter, delta, delta_lck,
@@ -1072,7 +1072,7 @@ static void dm_txpower_track_cb_therm(struct ieee80211_hw *hw) 
	if (rtldm->txpower_track_control)

		rtldm->thermalvalue = thermalvalue;

	rtldm->txpowercount = 0;

	RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD, "end\n");

	rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD, "end\n");

}



static void rtl88e_dm_init_txpower_tracking(struct ieee80211_hw *hw)
@@ -1087,7 +1087,7 @@ static void rtl88e_dm_init_txpower_tracking(struct ieee80211_hw *hw) 
	rtlpriv->dm.swing_idx_ofdm[RF90_PATH_A] = 12;

	rtlpriv->dm.swing_idx_ofdm_cur = 12;

	rtlpriv->dm.swing_flag_ofdm = false;

	RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,

		"rtlpriv->dm.txpower_tracking = %d\n",

		rtlpriv->dm.txpower_tracking);

}
@@ -1102,12 +1102,12 @@ void rtl88e_dm_check_txpower_tracking(struct ieee80211_hw *hw) 
	if (!rtlpriv->dm.tm_trigger) {

		rtl_set_rfreg(hw, RF90_PATH_A, RF_T_METER, BIT(17)|BIT(16),

			      0x03);

		RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,

			"Trigger 88E Thermal Meter!!\n");

		rtlpriv->dm.tm_trigger = 1;

		return;

	} else {

		RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,

			"Schedule TxPowerTracking !!\n");

		dm_txpower_track_cb_therm(hw);

		rtlpriv->dm.tm_trigger = 0;
@@ -1138,13 +1138,13 @@ static void rtl88e_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;

	}
@@ -1180,12 +1180,12 @@ static void rtl88e_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);
@@ -1224,7 +1224,7 @@ static void rtl88e_dm_update_rx_idle_ant(struct ieee80211_hw *hw, 
	u32 default_ant, optional_ant;



	if (pfat_table->rx_idle_ant != ant) {

		RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

			"need to update rx idle ant\n");

		if (ant == MAIN_ANT) {

			default_ant =
@@ -1260,7 +1260,7 @@ static void rtl88e_dm_update_rx_idle_ant(struct ieee80211_hw *hw, 
		}

	}

	pfat_table->rx_idle_ant = ant;

	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "RxIdleAnt %s\n",

	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "RxIdleAnt %s\n",

		(ant == MAIN_ANT) ? ("MAIN_ANT") : ("AUX_ANT"));

}
@@ -1280,9 +1280,9 @@ static void rtl88e_dm_update_tx_ant(struct ieee80211_hw *hw, 
	pfat_table->antsel_a[mac_id] = target_ant & BIT(0);

	pfat_table->antsel_b[mac_id] = (target_ant & BIT(1)) >> 1;

	pfat_table->antsel_c[mac_id] = (target_ant & BIT(2)) >> 2;

	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "txfrominfo target ant %s\n",

	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "txfrominfo target ant %s\n",

		(ant == MAIN_ANT) ? ("MAIN_ANT") : ("AUX_ANT"));

	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "antsel_tr_mux = 3'b%d%d%d\n",

	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "antsel_tr_mux = 3'b%d%d%d\n",

		pfat_table->antsel_c[mac_id],

		pfat_table->antsel_b[mac_id],

		pfat_table->antsel_a[mac_id]);
@@ -1464,14 +1464,14 @@ static void rtl88e_dm_hw_ant_div(struct ieee80211_hw *hw) 
	target_ant = (main_rssi == aux_rssi) ?

		pfat_table->rx_idle_ant : ((main_rssi >= aux_rssi) ?

		MAIN_ANT : AUX_ANT);

	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

		"main_ant_sum %d main_ant_cnt %d\n",

		pfat_table->main_ant_sum[i],

		pfat_table->main_ant_cnt[i]);

	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

		"aux_ant_sum %d aux_ant_cnt %d\n",

		pfat_table->aux_ant_sum[i], pfat_table->aux_ant_cnt[i]);

	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "main_rssi %d aux_rssi%d\n",

	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "main_rssi %d aux_rssi%d\n",

		main_rssi, aux_rssi);

	local_max_rssi = (main_rssi > aux_rssi) ? main_rssi : aux_rssi;

	if ((local_max_rssi > ant_div_max_rssi) && (local_max_rssi < 40))
@@ -1699,9 +1699,9 @@ static void rtl88e_dm_antenna_diversity(struct ieee80211_hw *hw) 
	struct fast_ant_training *pfat_table = &rtldm->fat_table;



	if (mac->link_state < MAC80211_LINKED) {

		RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "No Link\n");

		rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD, "No Link\n");

		if (pfat_table->becomelinked) {

			RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,

			rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD,

				"need to turn off HW AntDiv\n");

			rtl_set_bbreg(hw, DM_REG_IGI_A_11N, BIT(7), 0);

			rtl_set_bbreg(hw, DM_REG_CCK_ANTDIV_PARA1_11N,
@@ -1716,7 +1716,7 @@ static void rtl88e_dm_antenna_diversity(struct ieee80211_hw *hw) 
		return;

	} else {

		if (!pfat_table->becomelinked) {

			RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,

			rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD,

				"Need to turn on HW AntDiv\n");

			rtl_set_bbreg(hw, DM_REG_IGI_A_11N, BIT(7), 1);

			rtl_set_bbreg(hw, DM_REG_CCK_ANTDIV_PARA1_11N,

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

+45 −45
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static void _rtl88e_write_fw(struct ieee80211_hw *hw, 
	u32 pagenums, remainsize;

	u32 page, offset;



	RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "FW size is %d bytes,\n", size);

	rtl_dbg(rtlpriv, COMP_FW, DBG_LOUD, "FW size is %d bytes,\n", size);



	rtl_fill_dummy(bufferptr, &size);
@@ -123,11 +123,11 @@ int rtl88e_download_fw(struct ieee80211_hw *hw, 
	rtlhal->fw_subversion = pfwheader->subversion;

	pfwdata = rtlhal->pfirmware;

	fwsize = rtlhal->fwsize;

	RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,

	rtl_dbg(rtlpriv, COMP_FW, DBG_DMESG,

		"normal Firmware SIZE %d\n", fwsize);



	if (IS_FW_HEADER_EXIST(pfwheader)) {

		RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,

		rtl_dbg(rtlpriv, COMP_FW, DBG_DMESG,

			"Firmware Version(%d), Signature(%#x), Size(%d)\n",

			pfwheader->version, pfwheader->signature,

			(int)sizeof(struct rtlwifi_firmware_header));
@@ -181,12 +181,12 @@ static void _rtl88e_fill_h2c_command(struct ieee80211_hw *hw, 
	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);
@@ -194,7 +194,7 @@ static void _rtl88e_fill_h2c_command(struct ieee80211_hw *hw, 
				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);
@@ -238,7 +238,7 @@ static void _rtl88e_fill_h2c_command(struct ieee80211_hw *hw, 
			box_extreg = REG_HMEBOX_EXT_3;

			break;

		default:

			RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,

			rtl_dbg(rtlpriv, COMP_ERR, DBG_LOUD,

				"switch case %#x not processed\n", boxnum);

			break;

		}
@@ -246,7 +246,7 @@ static void _rtl88e_fill_h2c_command(struct ieee80211_hw *hw, 
		while (!isfw_read) {

			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;
@@ -256,13 +256,13 @@ static void _rtl88e_fill_h2c_command(struct ieee80211_hw *hw, 


			isfw_read = _rtl88e_check_fw_read_last_h2c(hw, boxnum);

			u1b_tmp = rtl_read_byte(rtlpriv, 0x130);

			RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,

			rtl_dbg(rtlpriv, COMP_CMD, DBG_LOUD,

				"Waiting for FW read clear HMEBox(%d)!!! 0x130 = %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;
@@ -271,7 +271,7 @@ static void _rtl88e_fill_h2c_command(struct ieee80211_hw *hw, 
		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);
@@ -309,7 +309,7 @@ static void _rtl88e_fill_h2c_command(struct ieee80211_hw *hw, 
			}

			break;

		default:

			RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,

			rtl_dbg(rtlpriv, COMP_ERR, DBG_LOUD,

				"switch case %#x not processed\n", cmd_len);

			break;

		}
@@ -320,7 +320,7 @@ static void _rtl88e_fill_h2c_command(struct ieee80211_hw *hw, 
		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);

	}
@@ -329,7 +329,7 @@ static void _rtl88e_fill_h2c_command(struct ieee80211_hw *hw, 
	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 rtl88e_fill_h2c_cmd(struct ieee80211_hw *hw,
@@ -359,7 +359,7 @@ void rtl88e_firmware_selfreset(struct ieee80211_hw *hw) 
	u1b_tmp = rtl_read_byte(rtlpriv, REG_SYS_FUNC_EN+1);

	rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN+1, (u1b_tmp & (~BIT(2))));

	rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN+1, (u1b_tmp | BIT(2)));

	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

		"8051Reset88E(): 8051 reset success\n");



}
@@ -370,7 +370,7 @@ void rtl88e_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode) 
	u8 u1_h2c_set_pwrmode[H2C_88E_PWEMODE_LENGTH] = { 0 };

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

	u8 rlbm, power_state = 0;

	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) ? 1 : 0));

	rlbm = 0;/*YJ, temp, 120316. FW now not support RLBM=2.*/
@@ -610,14 +610,14 @@ void rtl88e_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", u1rsvdpageloc, 3);

		rtl88e_fill_h2c_cmd(hw, H2C_88E_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");

}
@@ -643,11 +643,11 @@ void rtl88e_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;
@@ -703,11 +703,11 @@ void rtl88e_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/rtl8188ee/hw.c

+97 −97

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.c

+10 −10
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ void rtl88ee_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled) 
	u8 ledcfg;

	struct rtl_priv *rtlpriv = rtl_priv(hw);



	RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_LED, DBG_LOUD,

		"LedAddr:%X ledpin=%d\n", REG_LEDCFG2, pled->ledpin);



	switch (pled->ledpin) {
@@ -35,7 +35,7 @@ void rtl88ee_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled) 
		rtl_write_byte(rtlpriv, REG_LEDCFG1, ledcfg & 0x10);

		break;

	default:

		RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_ERR, DBG_LOUD,

			"switch case %#x not processed\n", pled->ledpin);

		break;

	}
@@ -47,7 +47,7 @@ void rtl88ee_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled) 
	struct rtl_priv *rtlpriv = rtl_priv(hw);

	u8 ledcfg;



	RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_LED, DBG_LOUD,

		"LedAddr:%X ledpin=%d\n", REG_LEDCFG2, pled->ledpin);



	switch (pled->ledpin) {
@@ -72,7 +72,7 @@ void rtl88ee_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled) 
		rtl_write_byte(rtlpriv, REG_LEDCFG1, (ledcfg | BIT(3)));

		break;

	default:

		RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_ERR, DBG_LOUD,

			"switch case %#x not processed\n", pled->ledpin);

		break;

	}
@@ -123,7 +123,7 @@ void rtl88ee_led_control(struct ieee80211_hw *hw, 
	     ledaction == LED_CTL_POWER_ON)) {

		return;

	}

	RT_TRACE(rtlpriv, COMP_LED, DBG_TRACE, "ledaction %d,\n",

	rtl_dbg(rtlpriv, COMP_LED, DBG_TRACE, "ledaction %d,\n",

		ledaction);

	_rtl88ee_sw_led_control(hw, ledaction);

}

drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.c

+192 −193

File changed.

Preview size limit exceeded, changes collapsed.