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

rtlwifi: rtl8821ae: Rename RT_TRACE to rtl_dbg 



Change the misleading macro name to one that is more descriptive for
rtl8821ae. 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/20200831184536.29950-1-Larry.Finger@lwfinger.net
parent 2c92790b

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

+410 −411

File changed.

Preview size limit exceeded, changes collapsed.

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

+67 −67
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ static void _rtl8821ae_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);
@@ -75,7 +75,7 @@ static int _rtl8821ae_fw_free_to_go(struct ieee80211_hw *hw) 
		 (!(value32 & FWDL_CHKSUM_RPT)));



	if (counter >= FW_8821AE_POLLING_TIMEOUT_COUNT) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_ERR, DBG_LOUD,

			"chksum report fail! REG_MCUFWDL:0x%08x .\n",

			value32);

		goto exit;
@@ -154,13 +154,13 @@ int rtl8821ae_download_fw(struct ieee80211_hw *hw, bool buse_wake_on_wlan_fw) 
		fwsize = rtlhal->fwsize;

	}



	RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,

	rtl_dbg(rtlpriv, COMP_FW, DBG_DMESG,

		"%s Firmware SIZE %d\n",

		buse_wake_on_wlan_fw ? "Wowlan" : "Normal", fwsize);



	if (IS_FW_HEADER_EXIST_8812(pfwheader) ||

	    IS_FW_HEADER_EXIST_8821(pfwheader)) {

		RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,

		rtl_dbg(rtlpriv, COMP_FW, DBG_DMESG,

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

			pfwheader->version, pfwheader->signature);
@@ -180,10 +180,10 @@ int rtl8821ae_download_fw(struct ieee80211_hw *hw, bool buse_wake_on_wlan_fw) 


	err = _rtl8821ae_fw_free_to_go(hw);

	if (err) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_DMESG,

		rtl_dbg(rtlpriv, COMP_ERR, DBG_DMESG,

			"Firmware is not ready to run!\n");

	} else {

		RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_FW, DBG_LOUD,

			"Firmware is ready to run!\n");

	}
@@ -199,12 +199,12 @@ void rtl8821ae_set_fw_related_for_wowlan(struct ieee80211_hw *hw, 
	struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));

	/* 1. Before WoWLAN or After WOWLAN we need to re-download Fw. */

	if (rtl8821ae_download_fw(hw, used_wowlan_fw)) {

		RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,

		rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG,

			"Re-Download Firmware failed!!\n");

		rtlhal->fw_ready = false;

		return;

	}

	RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,

	rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG,

		"Re-Download Firmware Success !!\n");

	rtlhal->fw_ready = true;
@@ -249,12 +249,12 @@ static void _rtl8821ae_fill_h2c_command(struct ieee80211_hw *hw, 
	unsigned long flag = 0;

	u8 idx = 0;



	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);
@@ -262,7 +262,7 @@ static void _rtl8821ae_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);
@@ -300,7 +300,7 @@ static void _rtl8821ae_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;

		}
@@ -324,7 +324,7 @@ static void _rtl8821ae_fill_h2c_command(struct ieee80211_hw *hw, 
				/*wait until Fw 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;
@@ -335,14 +335,14 @@ static void _rtl8821ae_fill_h2c_command(struct ieee80211_hw *hw, 
				isfw_read =

				  _rtl8821ae_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;
@@ -351,7 +351,7 @@ static void _rtl8821ae_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);
@@ -389,7 +389,7 @@ static void _rtl8821ae_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;

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

	}
@@ -409,7 +409,7 @@ static void _rtl8821ae_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 rtl8821ae_fill_h2c_cmd(struct ieee80211_hw *hw,
@@ -458,7 +458,7 @@ void rtl8821ae_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,

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

}
@@ -478,7 +478,7 @@ void rtl8821ae_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) {
@@ -590,7 +590,7 @@ void rtl8821ae_set_fw_wowlan_mode(struct ieee80211_hw *hw, bool func_en) 
	struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));

	u8 fw_wowlan_info[H2C_8821AE_WOWLAN_LENGTH] = {0};



	RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, "enable(%d)\n", func_en);

	rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD, "enable(%d)\n", func_en);



	SET_8812_H2CCMD_WOWLAN_FUNC_ENABLE(fw_wowlan_info,

					   (func_en ? true : false));
@@ -624,7 +624,7 @@ void rtl8821ae_set_fw_remote_wake_ctrl_cmd(struct ieee80211_hw *hw, 
	struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));

	u8 remote_wake_ctrl_parm[H2C_8821AE_REMOTE_WAKE_CTRL_LEN] = {0};



	RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,

		"enable=%d, ARP offload=%d, GTK offload=%d\n",

		enable, ppsc->arp_offload_enable, ppsc->gtk_offload_enable);
@@ -651,7 +651,7 @@ void rtl8821ae_set_fw_keep_alive_cmd(struct ieee80211_hw *hw, 
	struct rtl_priv *rtlpriv = rtl_priv(hw);

	u8 keep_alive_info[H2C_8821AE_KEEP_ALIVE_CTRL_LENGTH] = {0};



	RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, "Enable(%d)\n", func_en);

	rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD, "Enable(%d)\n", func_en);



	SET_8812_H2CCMD_KEEP_ALIVE_ENABLE(keep_alive_info, func_en);

	/* 1: the period is controled by driver, 0: by Fw default */
@@ -690,7 +690,7 @@ void rtl8821ae_set_fw_global_info_cmd(struct ieee80211_hw *hw) 
	struct rtl_security *sec = &rtlpriv->sec;

	u8 remote_wakeup_sec_info[H2C_8821AE_AOAC_GLOBAL_INFO_LEN] = {0};



	RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,

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

		sec->pairwise_enc_algorithm, sec->group_enc_algorithm);
@@ -1646,7 +1646,7 @@ void rtl8812ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, 
	}



	if (!b_dlok)

		RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,

		rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,

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

}
@@ -1771,7 +1771,7 @@ void rtl8821ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, 
		b_dlok = true;



	if (!b_dl_finished && 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, 5);
@@ -1788,7 +1788,7 @@ void rtl8821ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, 
	}



	if (!b_dlok) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,

		rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,

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

	}

}
@@ -1815,11 +1815,11 @@ void rtl8821ae_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;
@@ -1873,11 +1873,11 @@ void rtl8821ae_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/rtl8821ae/hw.c

+228 −228

File changed.

Preview size limit exceeded, changes collapsed.

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

+16 −16
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ void rtl8821ae_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) {
@@ -37,7 +37,7 @@ void rtl8821ae_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;

	}
@@ -64,7 +64,7 @@ void rtl8812ae_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled) 
		break;

	}



	RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_LED, DBG_LOUD,

		"In SwLedOn, LedAddr:%X LEDPIN=%d\n",

		ledreg, pled->ledpin);
@@ -81,7 +81,7 @@ void rtl8821ae_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);
@@ -109,7 +109,7 @@ void rtl8821ae_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;

	}
@@ -135,7 +135,7 @@ void rtl8812ae_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled) 
		break;

	}



	RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_LED, DBG_LOUD,

		"In SwLedOff,LedAddr:%X LEDPIN=%d\n",

		ledreg, pled->ledpin);

	/*Open-drain arrangement for controlling the LED*/
@@ -207,7 +207,7 @@ void rtl8821ae_led_control(struct ieee80211_hw *hw, 
	     ledaction == LED_CTL_POWER_ON)) {

		return;

	}

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

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

		ledaction);

	_rtl8821ae_sw_led_control(hw, ledaction);

}

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

+265 −262

File changed.

Preview size limit exceeded, changes collapsed.