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

rtlwifi: rtl8192ee: Rename RT_TRACE to rtl_dbg 



Change the misleading macro name to one that is more descriptive for
rtl8192ee. 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-10-Larry.Finger@lwfinger.net
parent 6bf8bc19

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

+33 −33
Original line number Diff line number Diff line
@@ -86,13 +86,13 @@ static void rtl92ee_dm_false_alarm_counter_statistics(struct ieee80211_hw *hw) 
	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, falsealm_cnt->cnt_all);
@@ -174,7 +174,7 @@ static void rtl92ee_dm_dig(struct ieee80211_hw *hw) 
	} else {

		dm_dig->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) {
@@ -334,7 +334,7 @@ static void rtl92ee_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) {
@@ -342,24 +342,24 @@ static void rtl92ee_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,

	rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD,

		"MinUndecoratedPWDBForDM =%d\n",

		rtl_dm_dig->min_undec_pwdb_for_dm);

}
@@ -687,7 +687,7 @@ static void rtl92ee_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;

			}
@@ -842,7 +842,7 @@ static bool _rtl92ee_dm_ra_state_check(struct ieee80211_hw *hw, 
		low_rssithresh_for_ra += go_up_gap;

		break;

	default:

		RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG,

		rtl_dbg(rtlpriv, COMP_RATR, DBG_DMESG,

			"wrong rssi level setting %d !\n", *ratr_state);

		break;

	}
@@ -872,13 +872,13 @@ static void rtl92ee_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;

	}

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

+51 −51
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ static void _rtl92ee_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);
@@ -118,11 +118,11 @@ int rtl92ee_download_fw(struct ieee80211_hw *hw, bool buse_wake_on_wlan_fw) 
	rtlhal->fw_subversion = pfwheader->subversion;

	pfwdata = (u8 *)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));
@@ -130,7 +130,7 @@ int rtl92ee_download_fw(struct ieee80211_hw *hw, bool buse_wake_on_wlan_fw) 
		pfwdata = pfwdata + sizeof(struct rtlwifi_firmware_header);

		fwsize = fwsize - sizeof(struct rtlwifi_firmware_header);

	} else {

		RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,

		rtl_dbg(rtlpriv, COMP_FW, DBG_DMESG,

			"Firmware no Header, Signature(%#x)\n",

			pfwheader->signature);

	}
@@ -180,12 +180,12 @@ static void _rtl92ee_fill_h2c_command(struct ieee80211_hw *hw, u8 element_id, 


	if (ppsc->dot11_psmode != EACTIVE ||

	    ppsc->inactive_pwrstate == ERFOFF) {

		RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD ,

		rtl_dbg(rtlpriv, COMP_CMD, DBG_LOUD,

			"FillH2CCommand8192E(): Return because RF is off!!!\n");

		return;

	}



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

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



	/* 1. Prevent race condition in setting H2C cmd.

	 * (copy from MgntActSet_RF_State().)
@@ -193,7 +193,7 @@ static void _rtl92ee_fill_h2c_command(struct ieee80211_hw *hw, u8 element_id, 
	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);
@@ -201,7 +201,7 @@ static void _rtl92ee_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);
@@ -240,7 +240,7 @@ static void _rtl92ee_fill_h2c_command(struct ieee80211_hw *hw, u8 element_id, 
			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;

		}
@@ -263,7 +263,7 @@ static void _rtl92ee_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;
@@ -272,7 +272,7 @@ static void _rtl92ee_fill_h2c_command(struct ieee80211_hw *hw, u8 element_id, 
				isfw_read =

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

			}
@@ -282,7 +282,7 @@ static void _rtl92ee_fill_h2c_command(struct ieee80211_hw *hw, u8 element_id, 
		 * H2C cmd, break and give up this H2C.

		 */

		if (!isfw_read) {

			RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD ,

			rtl_dbg(rtlpriv, COMP_CMD, DBG_LOUD,

				"Write H2C reg BOX[%d] fail,Fw don't read.\n",

				boxnum);

			break;
@@ -291,7 +291,7 @@ static void _rtl92ee_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);
@@ -329,7 +329,7 @@ static void _rtl92ee_fill_h2c_command(struct ieee80211_hw *hw, u8 element_id, 
			}

			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;

		}
@@ -340,7 +340,7 @@ static void _rtl92ee_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);

	}
@@ -349,7 +349,7 @@ static void _rtl92ee_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 rtl92ee_fill_h2c_cmd(struct ieee80211_hw *hw,
@@ -388,7 +388,7 @@ void rtl92ee_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)));



	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD ,

	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

		"  _8051Reset92E(): 8051 reset success .\n");

}
@@ -408,7 +408,7 @@ void rtl92ee_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) {
@@ -750,14 +750,14 @@ void rtl92ee_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_LOUD ,

			      "H2C_RSVDPAGE:\n", u1rsvdpageloc, 3);

		rtl92ee_fill_h2c_cmd(hw, H2C_92E_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");

	}

}
@@ -783,11 +783,11 @@ void rtl92ee_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;
@@ -838,11 +838,11 @@ void rtl92ee_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/rtl8192ee/hw.c

+104 −104
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static void _rtl92ee_set_fw_clock_on(struct ieee80211_hw *hw, 
			if (content & IMR_CPWM) {

				rtl_write_word(rtlpriv, isr_regaddr, 0x0100);

				rtlhal->fw_ps_state = FW_PS_STATE_RF_ON_92E;

				RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,

				rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,

					"Receive CPWM INT!!! PSState = %X\n",

					rtlhal->fw_ps_state);

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

		break;

	default:

		RT_TRACE(rtlpriv, COMP_ERR, DBG_DMESG,

		rtl_dbg(rtlpriv, COMP_ERR, DBG_DMESG,

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

		break;

	}
@@ -390,7 +390,7 @@ static void _rtl92ee_download_rsvd_page(struct ieee80211_hw *hw) 
	} while (!(bcnvalid_reg & BIT(0)) && dlbcn_count < 5);



	if (!(bcnvalid_reg & BIT(0)))

		RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

			"Download RSVD page failed!\n");



	/* Enable Bcn */
@@ -447,7 +447,7 @@ void rtl92ee_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_TRACE,

		rtl_dbg(rtlpriv, COMP_MLME, DBG_TRACE,

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



		rtl_write_byte(rtlpriv, REG_SLOT, val[0]);
@@ -494,7 +494,7 @@ void rtl92ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) 
					       (REG_AGGLEN_LMT + i),

					       reg[i]);

			}

			RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,

			rtl_dbg(rtlpriv, COMP_MLME, DBG_LOUD,

				"Set HW_VAR_AMPDU_FACTOR:%#x\n", fac);

		}

		}
@@ -528,7 +528,7 @@ void rtl92ee_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;
@@ -545,14 +545,14 @@ void rtl92ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) 
				acm_ctrl &= (~ACMHW_VOQEN);

				break;

			default:

				RT_TRACE(rtlpriv, COMP_ERR, DBG_DMESG,

				rtl_dbg(rtlpriv, COMP_ERR, DBG_DMESG,

					"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);
@@ -665,7 +665,7 @@ void rtl92ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) 
		}

		break;

	default:

		RT_TRACE(rtlpriv, COMP_ERR, DBG_DMESG,

		rtl_dbg(rtlpriv, COMP_ERR, DBG_DMESG,

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

		break;

	}
@@ -771,7 +771,7 @@ static bool _rtl92ee_init_mac(struct ieee80211_hw *hw) 
	if (!rtl_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,

				      PWR_INTF_PCI_MSK,

				      RTL8192E_NIC_ENABLE_FLOW)) {

		RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

			"init MAC Fail as rtl_hal_pwrseqcmdparsing\n");

		return false;

	}
@@ -795,7 +795,7 @@ static bool _rtl92ee_init_mac(struct ieee80211_hw *hw) 


	if (!rtlhal->mac_func_enable) {

		if (_rtl92ee_llt_table_init(hw) == false) {

			RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

			rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

				"LLT table init fail\n");

			return false;

		}
@@ -1107,13 +1107,13 @@ void rtl92ee_enable_hw_security_config(struct ieee80211_hw *hw) 
	u8 sec_reg_value;

	u8 tmp;



	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;

	}
@@ -1130,7 +1130,7 @@ void rtl92ee_enable_hw_security_config(struct ieee80211_hw *hw) 
	tmp = rtl_read_byte(rtlpriv, REG_CR + 1);

	rtl_write_byte(rtlpriv, REG_CR + 1, tmp | BIT(1));



	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);
@@ -1153,7 +1153,7 @@ static bool _rtl8192ee_check_pcie_dma_hang(struct rtl_priv *rtlpriv) 
	 */

	tmp = rtl_read_byte(rtlpriv, REG_BACKDOOR_DBI_DATA + 3);

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

		RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

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

		return true;

	}
@@ -1167,7 +1167,7 @@ static void _rtl8192ee_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,

		"ResetPcieInterfaceDMA8192EE()\n");



	/* Revise Note: Follow the document "PCIe RX DMA Hang Reset Flow_v03"
@@ -1281,7 +1281,7 @@ int rtl92ee_hw_init(struct ieee80211_hw *hw) 
	u8 tmp_u1b, u1byte;

	u32 tmp_u4b;



	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, " Rtl8192EE hw init\n");

	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, " Rtl8192EE hw init\n");

	rtlpriv->rtlhal.being_init_adapter = true;

	rtlpriv->intf_ops->disable_aspm(hw);
@@ -1295,7 +1295,7 @@ int rtl92ee_hw_init(struct ieee80211_hw *hw) 
	}



	if (_rtl8192ee_check_pcie_dma_hang(rtlpriv)) {

		RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "92ee dma hang!\n");

		rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, "92ee dma hang!\n");

		_rtl8192ee_reset_pcie_interface_dma(rtlpriv,

						    rtlhal->mac_func_enable);

		rtlhal->mac_func_enable = false;
@@ -1324,7 +1324,7 @@ int rtl92ee_hw_init(struct ieee80211_hw *hw) 
	rtl_write_word(rtlpriv, REG_PCIE_CTRL_REG, 0x8000);

	err = rtl92ee_download_fw(hw, false);

	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;

		rtlhal->fw_ready = false;
@@ -1401,12 +1401,12 @@ int rtl92ee_hw_init(struct ieee80211_hw *hw) 
	efuse_one_byte_read(hw, 0x1FA, &tmp_u1b);

	if (!(tmp_u1b & BIT(0))) {

		rtl_set_rfreg(hw, RF90_PATH_A, 0x15, 0x0F, 0x05);

		RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "PA BIAS path A\n");

		rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "PA BIAS path A\n");

	}



	if ((!(tmp_u1b & BIT(1))) && (rtlphy->rf_type == RF_2T2R)) {

		rtl_set_rfreg(hw, RF90_PATH_B, 0x15, 0x0F, 0x05);

		RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "PA BIAS path B\n");

		rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "PA BIAS path B\n");

	}



	rtl_write_byte(rtlpriv, REG_NAV_UPPER, ((30000 + 127) / 128));
@@ -1421,7 +1421,7 @@ int rtl92ee_hw_init(struct ieee80211_hw *hw) 


	rtl_write_dword(rtlpriv, 0x4fc, 0);



	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

		"end of Rtl8192EE hw init %x\n", err);

	return 0;

}
@@ -1441,7 +1441,7 @@ static enum version_8192e _rtl92ee_read_chip_version(struct ieee80211_hw *hw) 
	else

		version = (enum version_8192e)VERSION_NORMAL_CHIP_2T2R_8192E;



	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");
@@ -1459,25 +1459,25 @@ static int _rtl92ee_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:
@@ -1503,7 +1503,7 @@ static int _rtl92ee_set_media_status(struct ieee80211_hw *hw, 
		_rtl92ee_resume_tx_beacon(hw);

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

	}
@@ -1611,7 +1611,7 @@ static void _rtl92ee_poweroff_adapter(struct ieee80211_hw *hw) 


	rtlhal->mac_func_enable = false;



	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "POWER OFF adapter\n");

	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "POWER OFF adapter\n");



	/* Run LPS WL RFOFF flow */

	rtl_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,
@@ -1651,7 +1651,7 @@ void rtl92ee_card_disable(struct ieee80211_hw *hw) 
	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));

	enum nl80211_iftype opmode;



	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "RTL8192ee card disable\n");

	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "RTL8192ee card disable\n");



	RT_SET_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC);
@@ -1710,7 +1710,7 @@ void rtl92ee_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);

	rtl_write_word(rtlpriv, REG_BCN_INTERVAL, bcn_interval);

}
@@ -1721,7 +1721,7 @@ void rtl92ee_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)
@@ -1788,14 +1788,14 @@ static void _rtl8192ee_read_power_value_fromprom(struct ieee80211_hw *hw, 
	struct rtl_priv *rtlpriv = rtl_priv(hw);

	u32 rf, addr = EEPROM_TX_PWR_INX, group, i = 0;



	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

		"hal_ReadPowerValueFromPROM92E(): 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 (rf = 0 ; rf < MAX_RF_PATH ; rf++) {

			/* 2.4G default value */
@@ -2113,7 +2113,7 @@ static void _rtl92ee_read_adapter_info(struct ieee80211_hw *hw) 
	if (rtlefuse->eeprom_oemid == 0xFF)

		rtlefuse->eeprom_oemid = 0;



	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

		"EEPROM Customer ID: 0x%2x\n", rtlefuse->eeprom_oemid);

	/* set channel plan from efuse */

	rtlefuse->channel_plan = rtlefuse->eeprom_channelplan;
@@ -2134,7 +2134,7 @@ static void _rtl92ee_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);

	/*parse xtal*/

	rtlefuse->crystalcap = hwinfo[EEPROM_XTAL_92E];
@@ -2172,7 +2172,7 @@ static void _rtl92ee_hal_customized_behavior(struct ieee80211_hw *hw) 


	rtlpriv->ledctl.led_opendrain = true;



	RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,

	rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG,

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

}
@@ -2191,18 +2191,18 @@ void rtl92ee_read_eeprom_info(struct ieee80211_hw *hw) 
		rtlpriv->dm.rfpath_rxenable[0] = true;

		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;

		_rtl92ee_read_adapter_info(hw);

	} else {
@@ -2361,7 +2361,7 @@ static void rtl92ee_update_hal_rate_mask(struct ieee80211_hw *hw, 
	ratr_index = _rtl92ee_mrate_idx_to_arfr_id(hw, ratr_index);

	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);
@@ -2372,7 +2372,7 @@ static void rtl92ee_update_hal_rate_mask(struct ieee80211_hw *hw, 
	rate_mask[4] = (u8)((ratr_bitmap & 0x0000ff00) >> 8);

	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],

		rate_mask[2], rate_mask[3], rate_mask[4],
@@ -2438,7 +2438,7 @@ void rtl92ee_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);
@@ -2466,7 +2466,7 @@ void rtl92ee_set_key(struct ieee80211_hw *hw, u32 key_index, 
			enc_algo = CAM_AES;

			break;

		default:

			RT_TRACE(rtlpriv, COMP_ERR, DBG_DMESG,

			rtl_dbg(rtlpriv, COMP_ERR, DBG_DMESG,

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

			enc_algo = CAM_TKIP;

			break;
@@ -2498,7 +2498,7 @@ void rtl92ee_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 ||
@@ -2506,10 +2506,10 @@ void rtl92ee_set_key(struct ieee80211_hw *hw, u32 key_index, 
				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,
@@ -2517,7 +2517,7 @@ void rtl92ee_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) {
@@ -2603,7 +2603,7 @@ void rtl92ee_allow_all_destaddr(struct ieee80211_hw *hw, 
	if (write_into_reg)

		rtl_write_dword(rtlpriv, REG_RCR, rtlpci->receive_config);



	RT_TRACE(rtlpriv, COMP_TURBO | COMP_INIT, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_TURBO | COMP_INIT, DBG_LOUD,

		"receive_config=0x%08X, write_into_reg=%d\n",

		rtlpci->receive_config, write_into_reg);

}

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

+9 −9
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ void rtl92ee_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled) 
	u32 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) {
@@ -38,7 +38,7 @@ void rtl92ee_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled) 


		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;

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

	u32 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) {
@@ -68,7 +68,7 @@ void rtl92ee_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled) 


		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;

	}
@@ -118,6 +118,6 @@ void rtl92ee_led_control(struct ieee80211_hw *hw, enum led_ctl_mode ledaction) 
	     ledaction == LED_CTL_POWER_ON)) {

		return;

	}

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

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

	_rtl92ee_sw_led_control(hw, ledaction);

}

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

+179 −179

File changed.

Preview size limit exceeded, changes collapsed.