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

rtlwifi: rtl8723be Rename RT_TRACE to rtl_dbg 



Change the misleading macro name to one that is more descriptive for
rtl8723be. 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-13-Larry.Finger@lwfinger.net
parent 8f11dad4

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

+59 −59
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ static void rtl8723be_dm_init_txpower_tracking(struct ieee80211_hw *hw) 
	rtlpriv->dm.delta_power_index_last[RF90_PATH_A] = 0;

	rtlpriv->dm.power_index_offset[RF90_PATH_A] = 0;



	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);

}
@@ -265,7 +265,7 @@ static void rtl8723be_dm_find_minimum_rssi(struct ieee80211_hw *hw) 
	if ((mac->link_state < MAC80211_LINKED) &&

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

		rtl_dm_dig->min_undec_pwdb_for_dm = 0;

		RT_TRACE(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,

			"Not connected to any\n");

	}

	if (mac->link_state >= MAC80211_LINKED) {
@@ -273,24 +273,24 @@ static void rtl8723be_dm_find_minimum_rssi(struct ieee80211_hw *hw) 
		    mac->opmode == NL80211_IFTYPE_ADHOC) {

			rtl_dm_dig->min_undec_pwdb_for_dm =

			    rtlpriv->dm.entry_min_undec_sm_pwdb;

			RT_TRACE(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,

			rtl_dbg(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,

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

				rtlpriv->dm.entry_min_undec_sm_pwdb);

		} else {

			rtl_dm_dig->min_undec_pwdb_for_dm =

			    rtlpriv->dm.undec_sm_pwdb;

			RT_TRACE(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,

			rtl_dbg(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,

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

				rtl_dm_dig->min_undec_pwdb_for_dm);

		}

	} else {

		rtl_dm_dig->min_undec_pwdb_for_dm =

				rtlpriv->dm.entry_min_undec_sm_pwdb;

		RT_TRACE(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,

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

			rtl_dm_dig->min_undec_pwdb_for_dm);

	}

	RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "MinUndecoratedPWDBForDM =%d\n",

	rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD, "MinUndecoratedPWDBForDM =%d\n",

		rtl_dm_dig->min_undec_pwdb_for_dm);

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

		dm_digtable->rx_gain_max = dm_dig_max;

		dig_min_0 = 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) {
@@ -576,14 +576,14 @@ static void rtl8723be_dm_false_alarm_counter_statistics( 
	rtl_set_bbreg(hw, DM_REG_CCK_FA_RST_11N, BIT(15) | BIT(14), 0);

	rtl_set_bbreg(hw, DM_REG_CCK_FA_RST_11N, 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,
@@ -747,15 +747,15 @@ static void rtl8723be_dm_txpower_tracking_callback_thermalmeter( 


	/*Initilization ( 7 steps in total )*/

	rtlpriv->dm.txpower_trackinginit = true;

	RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,

		 "rtl8723be_dm_txpower_tracking_callback_thermalmeter\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 (!rtlpriv->dm.txpower_track_control || thermalvalue == 0 ||

	    rtlefuse->eeprom_thermalmeter == 0xFF)

		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, rtldm->thermalvalue,

		rtlefuse->eeprom_thermalmeter);
@@ -792,7 +792,7 @@ static void rtl8723be_dm_txpower_tracking_callback_thermalmeter( 
		    (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, delta_iqk);
@@ -876,7 +876,7 @@ static void rtl8723be_dm_txpower_tracking_callback_thermalmeter( 
	}



	rtldm->txpowercount = 0;

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

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



}
@@ -890,12 +890,12 @@ void rtl8723be_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 8723be 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");

		rtl8723be_dm_txpower_tracking_callback_thermalmeter(hw);

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

	}
@@ -949,12 +949,12 @@ static void rtl8723be_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);
@@ -1073,7 +1073,7 @@ static void rtl8723be_dm_cck_packet_detection_thresh(struct ieee80211_hw *hw) 


	dm_digtable->pre_cck_cca_thres = dm_digtable->cur_cck_cca_thres;

	dm_digtable->cur_cck_cca_thres = cur_cck_cca_thresh;

	RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE,

	rtl_dbg(rtlpriv, COMP_DIG, DBG_TRACE,

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

}
@@ -1121,7 +1121,7 @@ static void rtl8723be_dm_dynamic_atc_switch(struct ieee80211_hw *hw) 
		}

		if (rtlpriv->cfg->ops->get_btc_status()) {

			if (!rtlpriv->btcoexist.btc_ops->btc_is_bt_disabled(rtlpriv)) {

				RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,

				rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,

					"odm_DynamicATCSwitch(): Disable CFO tracking for BT!!\n");

				return;

			}

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

+33 −33
Original line number Diff line number Diff line
@@ -41,12 +41,12 @@ static void _rtl8723be_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);
@@ -54,7 +54,7 @@ static void _rtl8723be_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);
@@ -107,7 +107,7 @@ static void _rtl8723be_fill_h2c_command(struct ieee80211_hw *hw, u8 element_id, 
		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;
@@ -118,13 +118,13 @@ static void _rtl8723be_fill_h2c_command(struct ieee80211_hw *hw, u8 element_id, 
			isfw_read = _rtl8723be_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;
@@ -133,7 +133,7 @@ static void _rtl8723be_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);
@@ -182,7 +182,7 @@ static void _rtl8723be_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);

	}
@@ -191,7 +191,7 @@ static void _rtl8723be_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 rtl8723be_fill_h2c_cmd(struct ieee80211_hw *hw, u8 element_id,
@@ -229,7 +229,7 @@ void rtl8723be_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode) 
	if (bt_ctrl_lps)

		mode = (bt_lps_on ? FW_PS_MIN_MODE : FW_PS_ACTIVE_MODE);



	RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG, "FW LPS mode = %d (coex:%d)\n",

	rtl_dbg(rtlpriv, COMP_POWER, DBG_DMESG, "FW LPS mode = %d (coex:%d)\n",

		mode, bt_ctrl_lps);



	switch (mode) {
@@ -572,14 +572,14 @@ void rtl8723be_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, 
		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, sizeof(u1rsvdpageloc));

		rtl8723be_fill_h2c_cmd(hw, H2C_8723B_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");

}
@@ -607,11 +607,11 @@ void rtl8723be_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw, 


	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;
@@ -668,11 +668,11 @@ void rtl8723be_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw, 
		}

		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/rtl8723be/hw.c

+101 −101
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static void _rtl8723be_set_fw_clock_on(struct ieee80211_hw *hw, u8 rpwm_val, 
			if (content & IMR_CPWM) {

				rtl_write_word(rtlpriv, isr_regaddr, 0x0100);

				rtlhal->fw_ps_state = FW_PS_STATE_RF_ON;

				RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,

				rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,

					"Receive CPWM INT!!! Set pHalData->FwPSState = %X\n",

					rtlhal->fw_ps_state);

			}
@@ -331,7 +331,7 @@ void rtl8723be_get_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) 
	case HAL_DEF_WOWLAN:

		break;

	default:

		RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_ERR, DBG_LOUD,

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

		break;

	}
@@ -436,7 +436,7 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) 
	case HW_VAR_SLOT_TIME:{

		u8 e_aci;



		RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_MLME, DBG_LOUD,

			"HW_VAR_SLOT_TIME %x\n", val[0]);



		rtl_write_byte(rtlpriv, REG_SLOT, val[0]);
@@ -479,7 +479,7 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) 


			*val = min_spacing_to_set;



			RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,

			rtl_dbg(rtlpriv, COMP_MLME, DBG_LOUD,

				"Set HW_VAR_AMPDU_MIN_SPACE: %#x\n",

				mac->min_space_cfg);
@@ -494,7 +494,7 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) 
		density_to_set = *((u8 *)val);

		mac->min_space_cfg |= (density_to_set << 3);



		RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_MLME, DBG_LOUD,

			"Set HW_VAR_SHORTGI_DENSITY: %#x\n",

			mac->min_space_cfg);
@@ -534,7 +534,7 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) 


			}



			RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,

			rtl_dbg(rtlpriv, COMP_MLME, DBG_LOUD,

				"Set HW_VAR_AMPDU_FACTOR: %#x\n",

				factor_toset);

		}
@@ -571,7 +571,7 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) 
				acm_ctrl |= ACMHW_VOQEN;

				break;

			default:

				RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,

				rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,

					"HW_VAR_ACM_CTRL acm set failed: eACI is %d\n",

					acm);

				break;
@@ -588,14 +588,14 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) 
				acm_ctrl &= (~ACMHW_VOQEN);

				break;

			default:

				RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,

				rtl_dbg(rtlpriv, COMP_ERR, DBG_LOUD,

					"switch case %#x not processed\n",

					e_aci);

				break;

			}

		}



		RT_TRACE(rtlpriv, COMP_QOS, DBG_TRACE,

		rtl_dbg(rtlpriv, COMP_QOS, DBG_TRACE,

			"SetHwReg8190pci(): [HW_VAR_ACM_CTRL] Write 0x%X\n",

			acm_ctrl);

		rtl_write_byte(rtlpriv, REG_ACMHWCTRL, acm_ctrl);
@@ -705,7 +705,7 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) 
		}

		break;

	default:

		RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_ERR, DBG_LOUD,

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

		break;

	}
@@ -821,7 +821,7 @@ static bool _rtl8723be_init_mac(struct ieee80211_hw *hw) 
	if (!rtl_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK,

				      PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,

				      RTL8723_NIC_ENABLE_FLOW)) {

		RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

			"init MAC Fail as power on failure\n");

		return false;

	}
@@ -1121,13 +1121,13 @@ void rtl8723be_enable_hw_security_config(struct ieee80211_hw *hw) 
	struct rtl_priv *rtlpriv = rtl_priv(hw);

	u8 sec_reg_value;



	RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,

	rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG,

		"PairwiseEncAlgorithm = %d GroupEncAlgorithm = %d\n",

		rtlpriv->sec.pairwise_enc_algorithm,

		rtlpriv->sec.group_enc_algorithm);



	if (rtlpriv->cfg->mod_params->sw_crypto || rtlpriv->sec.use_sw_sec) {

		RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,

		rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,

			"not open hw encryption\n");

		return;

	}
@@ -1143,7 +1143,7 @@ void rtl8723be_enable_hw_security_config(struct ieee80211_hw *hw) 


	rtl_write_byte(rtlpriv, REG_CR + 1, 0x02);



	RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,

	rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,

		"The SECR-value %x\n", sec_reg_value);



	rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_WPA_CONFIG, &sec_reg_value);
@@ -1208,7 +1208,7 @@ static bool _rtl8723be_check_pcie_dma_hang(struct rtl_priv *rtlpriv) 
	 */

	tmp = rtl_read_byte(rtlpriv, REG_DBI_CTRL + 3);

	if ((tmp & BIT(0)) || (tmp & BIT(1))) {

		RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

			"CheckPcieDMAHang8723BE(): true!!\n");

		return true;

	}
@@ -1222,7 +1222,7 @@ static void _rtl8723be_reset_pcie_interface_dma(struct rtl_priv *rtlpriv, 
	bool release_mac_rx_pause;

	u8 backup_pcie_dma_pause;



	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

		"ResetPcieInterfaceDMA8723BE()\n");



	/* Revise Note: Follow the document "PCIe RX DMA Hang Reset Flow_v03"
@@ -1375,7 +1375,7 @@ int rtl8723be_hw_init(struct ieee80211_hw *hw) 


	err = rtl8723_download_fw(hw, true, FW_8723B_POLLING_TIMEOUT_COUNT);

	if (err) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,

		rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,

			"Failed to download FW. Init HW without FW now..\n");

		err = 1;

		goto exit;
@@ -1460,7 +1460,7 @@ static enum version_8723e _rtl8723be_read_chip_version(struct ieee80211_hw *hw) 


	value32 = rtl_read_dword(rtlpriv, REG_SYS_CFG1);

	if ((value32 & (CHIP_8723B)) != CHIP_8723B)

		RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "unknown chip version\n");

		rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "unknown chip version\n");

	else

		version = (enum version_8723e)CHIP_8723B;
@@ -1476,7 +1476,7 @@ static enum version_8723e _rtl8723be_read_chip_version(struct ieee80211_hw *hw) 
	if (((value32 & EXT_VENDOR_ID) >> 18) == 0x01)

		version = (enum version_8723e)(version | CHIP_VENDOR_SMIC);



	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

		"Chip RF Type: %s\n", (rtlphy->rf_type == RF_2T2R) ?

		"RF_2T2R" : "RF_1T1R");
@@ -1494,25 +1494,25 @@ static int _rtl8723be_set_media_status(struct ieee80211_hw *hw, 
	switch (type) {

	case NL80211_IFTYPE_UNSPECIFIED:

		mode = MSR_NOLINK;

		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,

		rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,

			"Set Network type to NO LINK!\n");

		break;

	case NL80211_IFTYPE_ADHOC:

	case NL80211_IFTYPE_MESH_POINT:

		mode = MSR_ADHOC;

		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,

		rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,

			"Set Network type to Ad Hoc!\n");

		break;

	case NL80211_IFTYPE_STATION:

		mode = MSR_INFRA;

		ledaction = LED_CTL_LINK;

		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,

		rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,

			"Set Network type to STA!\n");

		break;

	case NL80211_IFTYPE_AP:

		mode = MSR_AP;

		ledaction = LED_CTL_LINK;

		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,

		rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,

			"Set Network type to AP!\n");

		break;

	default:
@@ -1538,7 +1538,7 @@ static int _rtl8723be_set_media_status(struct ieee80211_hw *hw, 
		_rtl8723be_resume_tx_beacon(hw);

		_rtl8723be_disable_bcn_sub_func(hw);

	} else {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,

		rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,

			"Set HW_VAR_MEDIA_STATUS: No such media status(%x).\n",

			mode);

	}
@@ -1702,7 +1702,7 @@ void rtl8723be_set_beacon_interval(struct ieee80211_hw *hw) 
	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));

	u16 bcn_interval = mac->beacon_interval;



	RT_TRACE(rtlpriv, COMP_BEACON, DBG_DMESG,

	rtl_dbg(rtlpriv, COMP_BEACON, DBG_DMESG,

		"beacon_interval:%d\n", bcn_interval);

	rtl8723be_disable_interrupt(hw);

	rtl_write_word(rtlpriv, REG_BCN_INTERVAL, bcn_interval);
@@ -1715,7 +1715,7 @@ void rtl8723be_update_interrupt_mask(struct ieee80211_hw *hw, 
	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));



	RT_TRACE(rtlpriv, COMP_INTR, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_INTR, DBG_LOUD,

		"add_msr:%x, rm_msr:%x\n", add_msr, rm_msr);



	if (add_msr)
@@ -1747,14 +1747,14 @@ static void _rtl8723be_read_power_value_fromprom(struct ieee80211_hw *hw, 
	struct rtl_priv *rtlpriv = rtl_priv(hw);

	u32 path, addr = EEPROM_TX_PWR_INX, group, cnt = 0;



	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

		"hal_ReadPowerValueFromPROM8723BE(): PROMContent[0x%x]=0x%x\n",

		(addr + 1), hwinfo[addr + 1]);

	if (0xFF == hwinfo[addr + 1])  /*YJ,add,120316*/

		autoload_fail = true;



	if (autoload_fail) {

		RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

			"auto load fail : Use Default value!\n");

		for (path = 0; path < MAX_RF_PATH; path++) {

			/* 2.4G default value */
@@ -2099,7 +2099,7 @@ static void _rtl8723be_read_adapter_info(struct ieee80211_hw *hw, 
		rtlefuse->board_type |= BIT(2); /* ODM_BOARD_BT */



	rtlhal->board_type = rtlefuse->board_type;

	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

		"board_type = 0x%x\n", rtlefuse->board_type);



	rtlhal->package_type = _rtl8723be_read_package_type(hw);
@@ -2237,7 +2237,7 @@ static void _rtl8723be_hal_customized_behavior(struct ieee80211_hw *hw) 
	default:

		break;

	}

	RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,

	rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG,

		"RT Customized ID: 0x%02X\n", rtlhal->oem_id);

}
@@ -2255,18 +2255,18 @@ void rtl8723be_read_eeprom_info(struct ieee80211_hw *hw) 
	else

		rtlpriv->dm.rfpath_rxenable[0] =

		    rtlpriv->dm.rfpath_rxenable[1] = true;

	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "VersionID = 0x%4x\n",

	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "VersionID = 0x%4x\n",

		rtlhal->version);

	tmp_u1b = rtl_read_byte(rtlpriv, REG_9346CR);

	if (tmp_u1b & BIT(4)) {

		RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EEPROM\n");

		rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EEPROM\n");

		rtlefuse->epromtype = EEPROM_93C46;

	} else {

		RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EFUSE\n");

		rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EFUSE\n");

		rtlefuse->epromtype = EEPROM_BOOT_EFUSE;

	}

	if (tmp_u1b & BIT(5)) {

		RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");

		rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");

		rtlefuse->autoload_failflag = false;

		_rtl8723be_read_adapter_info(hw, false);

	} else {
@@ -2417,7 +2417,7 @@ static void rtl8723be_update_hal_rate_mask(struct ieee80211_hw *hw, 


	sta_entry->ratr_index = ratr_index;



	RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG,

	rtl_dbg(rtlpriv, COMP_RATR, DBG_DMESG,

		"ratr_bitmap :%x\n", ratr_bitmap);

	*(u32 *)&rate_mask = (ratr_bitmap & 0x0fffffff) |

				       (ratr_index << 28);
@@ -2431,7 +2431,7 @@ static void rtl8723be_update_hal_rate_mask(struct ieee80211_hw *hw, 
	rate_mask[5] = (u8)((ratr_bitmap & 0x00ff0000) >> 16);

	rate_mask[6] = (u8)((ratr_bitmap & 0xff000000) >> 24);



	RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG,

	rtl_dbg(rtlpriv, COMP_RATR, DBG_DMESG,

		"Rate_index:%x, ratr_val:%x, %x:%x:%x:%x:%x:%x:%x\n",

		ratr_index, ratr_bitmap,

		rate_mask[0], rate_mask[1],
@@ -2500,14 +2500,14 @@ bool rtl8723be_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid) 
		e_rfpowerstate_toset = (u1tmp & BIT(1)) ? ERFON : ERFOFF;



	if ((ppsc->hwradiooff) && (e_rfpowerstate_toset == ERFON)) {

		RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,

		rtl_dbg(rtlpriv, COMP_RF, DBG_DMESG,

			"GPIOChangeRF  - HW Radio ON, RF ON\n");



		e_rfpowerstate_toset = ERFON;

		ppsc->hwradiooff = false;

		b_actuallyset = true;

	} else if (!ppsc->hwradiooff && (e_rfpowerstate_toset == ERFOFF)) {

		RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,

		rtl_dbg(rtlpriv, COMP_RF, DBG_DMESG,

			"GPIOChangeRF  - HW Radio OFF, RF OFF\n");



		e_rfpowerstate_toset = ERFOFF;
@@ -2559,7 +2559,7 @@ void rtl8723be_set_key(struct ieee80211_hw *hw, u32 key_index, 
		u8 cam_offset = 0;

		u8 clear_number = 5;



		RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "clear_all\n");

		rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG, "clear_all\n");



		for (idx = 0; idx < clear_number; idx++) {

			rtl_cam_mark_invalid(hw, cam_offset + idx);
@@ -2587,7 +2587,7 @@ void rtl8723be_set_key(struct ieee80211_hw *hw, u32 key_index, 
			enc_algo = CAM_AES;

			break;

		default:

			RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,

			rtl_dbg(rtlpriv, COMP_ERR, DBG_LOUD,

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

			enc_algo = CAM_TKIP;

			break;
@@ -2618,17 +2618,17 @@ void rtl8723be_set_key(struct ieee80211_hw *hw, u32 key_index, 
		}



		if (rtlpriv->sec.key_len[key_index] == 0) {

			RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,

			rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,

				"delete one entry, entry_id is %d\n",

				entry_id);

			if (mac->opmode == NL80211_IFTYPE_AP)

				rtl_cam_del_entry(hw, p_macaddr);

			rtl_cam_delete_one_entry(hw, p_macaddr, entry_id);

		} else {

			RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,

			rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,

				"add one entry\n");

			if (is_pairwise) {

				RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,

				rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,

					"set Pairwise key\n");



				rtl_cam_add_one_entry(hw, macaddr, key_index,
@@ -2636,7 +2636,7 @@ void rtl8723be_set_key(struct ieee80211_hw *hw, u32 key_index, 
					       CAM_CONFIG_NO_USEDK,

					       rtlpriv->sec.key_buf[key_index]);

			} else {

				RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,

				rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,

					"set group key\n");



				if (mac->opmode == NL80211_IFTYPE_ADHOC) {

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

+5 −5
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ void rtl8723be_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) {
@@ -47,7 +47,7 @@ void rtl8723be_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);



	ledcfg = rtl_read_byte(rtlpriv, REG_LEDCFG2);
@@ -127,6 +127,6 @@ void rtl8723be_led_control(struct ieee80211_hw *hw, 
	     ledaction == LED_CTL_POWER_ON)) {

		return;

	}

	RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, "ledaction %d,\n", ledaction);

	rtl_dbg(rtlpriv, COMP_LED, DBG_LOUD, "ledaction %d,\n", ledaction);

	_rtl8723be_sw_led_control(hw, ledaction);

}

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

+155 −155

File changed.

Preview size limit exceeded, changes collapsed.