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

rtlwifi: rtl8192cu: Rename RT_TRACE to rtl_dbg 



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

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

+19 −19
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ void rtl92cu_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;
@@ -37,41 +37,41 @@ void rtl92cu_dm_dynamic_txpower(struct ieee80211_hw *hw) 
	if (mac->link_state >= MAC80211_LINKED) {

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

		}

	} else {

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

		rtl92c_phy_set_txpower_level(hw, rtlphy->current_channel);

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

+76 −76
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ static void _rtl92cu_hal_customized_behavior(struct ieee80211_hw *hw) 
	default:

		break;

	}

	RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "RT Customized ID: 0x%02X\n",

	rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, "RT Customized ID: 0x%02X\n",

		rtlhal->oem_id);

}
@@ -403,10 +403,10 @@ void rtl92cu_read_eeprom_info(struct ieee80211_hw *hw) 
	tmp_u1b = rtl_read_byte(rtlpriv, REG_9346CR);

	rtlefuse->epromtype = (tmp_u1b & BOOT_FROM_EEPROM) ?

			       EEPROM_93C46 : EEPROM_BOOT_EFUSE;

	RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from %s\n",

	rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from %s\n",

		tmp_u1b & BOOT_FROM_EEPROM ? "EERROM" : "EFUSE");

	rtlefuse->autoload_failflag = (tmp_u1b & EEPROM_EN) ? false : true;

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

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

		tmp_u1b & EEPROM_EN ? "OK!!" : "ERR!!");

	_rtl92cu_read_adapter_info(hw);

	_rtl92cu_hal_customized_behavior(hw);
@@ -424,7 +424,7 @@ static int _rtl92cu_init_power_on(struct ieee80211_hw *hw) 


	do {

		if (rtl_read_byte(rtlpriv, REG_APS_FSMCO) & PFM_ALDN) {

			RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,

			rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG,

				"Autoload Done!\n");

			break;

		}
@@ -443,7 +443,7 @@ static int _rtl92cu_init_power_on(struct ieee80211_hw *hw) 
	if (0 == (value8 & LDV12_EN)) {

		value8 |= LDV12_EN;

		rtl_write_byte(rtlpriv, REG_LDOV12D_CTRL, value8);

		RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,

		rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG,

			" power-on :REG_LDOV12D_CTRL Reg0x21:0x%02x\n",

			value8);

		udelay(100);
@@ -860,12 +860,12 @@ void rtl92cu_enable_hw_security_config(struct ieee80211_hw *hw) 
	u8 sec_reg_value = 0x0;

	struct rtl_hal *rtlhal = rtl_hal(rtlpriv);



	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

		"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 sw encryption\n");

		return;

	}
@@ -877,7 +877,7 @@ void rtl92cu_enable_hw_security_config(struct ieee80211_hw *hw) 
	if (IS_NORMAL_CHIP(rtlhal->version))

		sec_reg_value |= (SCR_RXBCUSEDK | SCR_TXBCUSEDK);

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

	RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, "The SECR-value %x\n",

	rtl_dbg(rtlpriv, COMP_SEC, DBG_LOUD, "The SECR-value %x\n",

		sec_reg_value);

	rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_WPA_CONFIG, &sec_reg_value);

}
@@ -958,7 +958,7 @@ int rtl92cu_hw_init(struct ieee80211_hw *hw) 
	}

	err = rtl92c_download_fw(hw);

	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;
@@ -1280,7 +1280,7 @@ static int _rtl92cu_set_media_status(struct ieee80211_hw *hw, 
		_rtl92cu_resume_tx_beacon(hw);

		_rtl92cu_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",

			type);

	}
@@ -1288,23 +1288,23 @@ static int _rtl92cu_set_media_status(struct ieee80211_hw *hw, 
	case NL80211_IFTYPE_UNSPECIFIED:

		bt_msr |= MSR_NOLINK;

		ledaction = LED_CTL_LINK;

		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:

		bt_msr |= 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:

		bt_msr |= 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:

		bt_msr |= MSR_AP;

		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,

		rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,

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

		break;

	default:
@@ -1438,7 +1438,7 @@ void rtl92cu_set_beacon_related_registers(struct ieee80211_hw *hw) 
	rtl_write_dword(rtlpriv, REG_TCR, value32);

	value32 |= TSFRST;

	rtl_write_dword(rtlpriv, REG_TCR, value32);

	RT_TRACE(rtlpriv, COMP_INIT|COMP_BEACON, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_INIT | COMP_BEACON, DBG_LOUD,

		"SetBeaconRelatedRegisters8192CUsb(): Set TCR(%x)\n",

		value32);

	/* TODO: Modify later (Find the right parameters)
@@ -1458,7 +1458,7 @@ void rtl92cu_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, "beacon_interval:%d\n",

	rtl_dbg(rtlpriv, COMP_BEACON, DBG_DMESG, "beacon_interval:%d\n",

		bcn_interval);

	rtl_write_word(rtlpriv, REG_BCN_INTERVAL, bcn_interval);

}
@@ -1599,7 +1599,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) 
			rtl_write_byte(rtlpriv, REG_MAC_SPEC_SIFS + 1, val[0]);

			rtl_write_byte(rtlpriv, REG_R2T_SIFS+1, val[0]);

			rtl_write_byte(rtlpriv, REG_T2T_SIFS+1, val[0]);

			RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD, "HW_VAR_SIFS\n");

			rtl_dbg(rtlpriv, COMP_MLME, DBG_LOUD, "HW_VAR_SIFS\n");

			break;

		}

	case HW_VAR_SLOT_TIME:{
@@ -1607,7 +1607,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) 
			u8 QOS_MODE = 1;



			rtl_write_byte(rtlpriv, REG_SLOT, val[0]);

			RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,

			rtl_dbg(rtlpriv, COMP_MLME, DBG_LOUD,

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

			if (QOS_MODE) {

				for (e_aci = 0; e_aci < AC_MAX; e_aci++)
@@ -1672,7 +1672,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) 
						     0xf8) |

						     min_spacing_to_set);

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

				rtl_write_byte(rtlpriv, REG_AMPDU_MIN_SPACE,
@@ -1687,7 +1687,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) 
			density_to_set &= 0x1f;

			mac->min_space_cfg &= 0x07;

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

			rtl_write_byte(rtlpriv, REG_AMPDU_MIN_SPACE,
@@ -1721,7 +1721,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) 
						       (REG_AGGLEN_LMT + index),

						       p_regtoset[index]);

				}

				RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,

				rtl_dbg(rtlpriv, COMP_MLME, DBG_LOUD,

					"Set HW_VAR_AMPDU_FACTOR: %#x\n",

					factor_toset);

			}
@@ -1740,7 +1740,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) 
			u4b_ac_param |= (u32) ((cw_max & 0xF) <<

					 AC_PARAM_ECW_MAX_OFFSET);

			u4b_ac_param |= (u32) tx_op << AC_PARAM_TXOP_OFFSET;

			RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,

			rtl_dbg(rtlpriv, COMP_MLME, DBG_LOUD,

				"queue:%x, ac_param:%x\n",

				e_aci, u4b_ac_param);

			switch (e_aci) {
@@ -1770,7 +1770,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) 
	case HW_VAR_RCR:{

			rtl_write_dword(rtlpriv, REG_RCR, ((u32 *) (val))[0]);

			mac->rx_conf = ((u32 *) (val))[0];

			RT_TRACE(rtlpriv, COMP_RECV, DBG_DMESG,

			rtl_dbg(rtlpriv, COMP_RECV, DBG_DMESG,

				"### Set RCR(0x%08x) ###\n", mac->rx_conf);

			break;

		}
@@ -1780,7 +1780,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) 
			rtl_write_word(rtlpriv, REG_RL,

				       retry_limit << RETRY_LIMIT_SHORT_SHIFT |

				       retry_limit << RETRY_LIMIT_LONG_SHIFT);

			RT_TRACE(rtlpriv, COMP_MLME, DBG_DMESG,

			rtl_dbg(rtlpriv, COMP_MLME, DBG_DMESG,

				"Set HW_VAR_RETRY_LIMIT(0x%08x)\n",

				retry_limit);

			break;
@@ -1987,7 +1987,7 @@ static void rtl92cu_update_hal_rate_table(struct ieee80211_hw *hw, 


	rtl_write_dword(rtlpriv, REG_ARFR0 + ratr_index * 4, ratr_value);



	RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG, "%x\n",

	rtl_dbg(rtlpriv, COMP_RATR, DBG_DMESG, "%x\n",

		rtl_read_dword(rtlpriv, REG_ARFR0));

}
@@ -2121,12 +2121,12 @@ static void rtl92cu_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);

	rate_mask[4] = macid | (shortgi ? 0x20 : 0x00) | 0x80;

	RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG,

	rtl_dbg(rtlpriv, COMP_RATR, DBG_DMESG,

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

		ratr_index, ratr_bitmap, rate_mask);

	memcpy(rtlpriv->rate_mask, rate_mask, 5);
@@ -2194,7 +2194,7 @@ bool rtl92cu_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 * valid) 
			u1tmp = rtl_read_byte(rtlpriv, REG_HSISR);

			e_rfpowerstate_toset = (u1tmp & BIT(7)) ?

					       ERFOFF : ERFON;

			RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG,

			rtl_dbg(rtlpriv, COMP_POWER, DBG_DMESG,

				"pwrdown, 0x5c(BIT7)=%02x\n", u1tmp);

		} else {

			rtl_write_byte(rtlpriv, REG_MAC_PINMUX_CFG,
@@ -2203,25 +2203,25 @@ bool rtl92cu_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 * valid) 
			u1tmp = rtl_read_byte(rtlpriv, REG_GPIO_IO_SEL);

			e_rfpowerstate_toset  = (u1tmp & BIT(3)) ?

						 ERFON : ERFOFF;

			RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG,

			rtl_dbg(rtlpriv, COMP_POWER, DBG_DMESG,

				"GPIO_IN=%02x\n", u1tmp);

		}

		RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, "N-SS RF =%x\n",

		rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD, "N-SS RF =%x\n",

			e_rfpowerstate_toset);

	}

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

		RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,

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

		ppsc->hwradiooff = false;

		actuallyset = true;

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

		    ERFOFF)) {

		RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,

			"GPIOChangeRF  - HW Radio OFF\n");

		ppsc->hwradiooff = true;

		actuallyset = true;

	} else {

		RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,

			"pHalData->bHwRadioOff and eRfPowerStateToSet do not match: pHalData->bHwRadioOff %x, eRfPowerStateToSet %x\n",

			 ppsc->hwradiooff, e_rfpowerstate_toset);

	}

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

+5 −5
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ void rtl92cu_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, "LedAddr:%X ledpin=%d\n",

	rtl_dbg(rtlpriv, COMP_LED, DBG_LOUD, "LedAddr:%X ledpin=%d\n",

		REG_LEDCFG2, pled->ledpin);

	ledcfg = rtl_read_byte(rtlpriv, REG_LEDCFG2);

	switch (pled->ledpin) {
@@ -49,7 +49,7 @@ void rtl92cu_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, "LedAddr:%X ledpin=%d\n",

	rtl_dbg(rtlpriv, COMP_LED, DBG_LOUD, "LedAddr:%X ledpin=%d\n",

		REG_LEDCFG2, pled->ledpin);

	ledcfg = rtl_read_byte(rtlpriv, REG_LEDCFG2);

	switch (pled->ledpin) {
@@ -113,6 +113,6 @@ void rtl92cu_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);

	_rtl92cu_sw_led_control(hw, ledaction);

}

drivers/net/wireless/realtek/rtlwifi/rtl8192cu/mac.c

+32 −32
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ void rtl92c_read_chip_version(struct ieee80211_hw *hw) 
		versionid = "UNKNOWN";

		break;

	}

	RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,

	rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,

		"Chip Version ID: %s\n", versionid);



	if (IS_92C_SERIAL(rtlhal->version))
@@ -99,7 +99,7 @@ void rtl92c_read_chip_version(struct ieee80211_hw *hw) 
			 (IS_92C_1T2R(rtlhal->version)) ? RF_1T2R : RF_2T2R;

	else

		rtlphy->rf_type = RF_1T1R;

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

	if (get_rf_type(rtlphy) == RF_1T1R)
@@ -107,7 +107,7 @@ void rtl92c_read_chip_version(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);

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

			rtl_cam_empty_entry(hw, cam_offset + idx);
@@ -269,21 +269,21 @@ void rtl92c_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\n");

			if (mac->opmode == NL80211_IFTYPE_AP ||

			    mac->opmode == NL80211_IFTYPE_MESH_POINT)

				rtl_cam_del_entry(hw, p_macaddr);

			rtl_cam_delete_one_entry(hw, p_macaddr, entry_id);

		} else {

			RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,

			rtl_dbg(rtlpriv, COMP_SEC, DBG_LOUD,

				"The insert KEY length is %d\n",

				 rtlpriv->sec.key_len[PAIRWISE_KEYIDX]);

			RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,

			rtl_dbg(rtlpriv, COMP_SEC, DBG_LOUD,

				"The insert KEY is %x %x\n",

				rtlpriv->sec.key_buf[0][0],

				rtlpriv->sec.key_buf[0][1]);

			RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,

			rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,

				"add one entry\n");

			if (is_pairwise) {

				RT_PRINT_DATA(rtlpriv, COMP_SEC, DBG_LOUD,
@@ -291,7 +291,7 @@ void rtl92c_set_key(struct ieee80211_hw *hw, u32 key_index, 
					      rtlpriv->sec.pairwise_key,

					      rtlpriv->sec.

					      key_len[PAIRWISE_KEYIDX]);

				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,
@@ -300,7 +300,7 @@ void rtl92c_set_key(struct ieee80211_hw *hw, u32 key_index, 
						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) {

					rtl_cam_add_one_entry(hw,
@@ -383,26 +383,26 @@ int rtl92c_set_network_type(struct ieee80211_hw *hw, enum nl80211_iftype type) 
	switch (type) {

	case NL80211_IFTYPE_UNSPECIFIED:

		value = NT_NO_LINK;

		RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,

		rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG,

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

		break;

	case NL80211_IFTYPE_ADHOC:

		value = NT_LINK_AD_HOC;

		RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,

		rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG,

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

		break;

	case NL80211_IFTYPE_STATION:

		value = NT_LINK_AP;

		RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,

		rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG,

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

		break;

	case NL80211_IFTYPE_AP:

		value = NT_AS_AP;

		RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,

		rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG,

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

		break;

	default:

		RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,

		rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG,

			"Network type %d not supported!\n", type);

		return -EOPNOTSUPP;

	}

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

+67 −67
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ u32 rtl92cu_phy_query_rf_reg(struct ieee80211_hw *hw, 
	u32 original_value, readback_value, bitshift;

	struct rtl_phy *rtlphy = &(rtlpriv->phy);



	RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,

	rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,

		"regaddr(%#x), rfpath(%#x), bitmask(%#x)\n",

		regaddr, rfpath, bitmask);

	if (rtlphy->rf_mode != RF_OP_BY_FW) {
@@ -34,7 +34,7 @@ u32 rtl92cu_phy_query_rf_reg(struct ieee80211_hw *hw, 
	}

	bitshift = _rtl92c_phy_calculate_bit_shift(bitmask);

	readback_value = (original_value & bitmask) >> bitshift;

	RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,

	rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,

		"regaddr(%#x), rfpath(%#x), bitmask(%#x), original_value(%#x)\n",

		regaddr, rfpath, bitmask, original_value);

	return readback_value;
@@ -48,7 +48,7 @@ void rtl92cu_phy_set_rf_reg(struct ieee80211_hw *hw, 
	struct rtl_phy *rtlphy = &(rtlpriv->phy);

	u32 original_value, bitshift;



	RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,

	rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,

		"regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",

		regaddr, bitmask, data, rfpath);

	if (rtlphy->rf_mode != RF_OP_BY_FW) {
@@ -74,7 +74,7 @@ void rtl92cu_phy_set_rf_reg(struct ieee80211_hw *hw, 
		}

		_rtl92c_phy_fw_rf_serial_write(hw, rfpath, regaddr, data);

	}

	RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,

	rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,

		"regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",

		regaddr, bitmask, data, rfpath);

}
@@ -121,10 +121,10 @@ bool _rtl92cu_phy_config_mac_with_headerfile(struct ieee80211_hw *hw) 
	u32 arraylength;

	u32 *ptrarray;



	RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Read Rtl819XMACPHY_ARRAY\n");

	rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE, "Read Rtl819XMACPHY_ARRAY\n");

	arraylength =  rtlphy->hwparam_tables[MAC_REG].length ;

	ptrarray = rtlphy->hwparam_tables[MAC_REG].pdata;

	RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Img:RTL8192CUMAC_2T_ARRAY\n");

	rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE, "Img:RTL8192CUMAC_2T_ARRAY\n");

	for (i = 0; i < arraylength; i = i + 2)

		rtl_write_byte(rtlpriv, ptrarray[i], (u8) ptrarray[i + 1]);

	return true;
@@ -158,7 +158,7 @@ bool _rtl92cu_phy_config_bb_with_headerfile(struct ieee80211_hw *hw, 
			rtl_set_bbreg(hw, phy_regarray_table[i], MASKDWORD,

				      phy_regarray_table[i + 1]);

			udelay(1);

			RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,

			rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,

				"The phy_regarray_table[0] is %x Rtl819XPHY_REGARRAY[1] is %x\n",

				phy_regarray_table[i],

				phy_regarray_table[i + 1]);
@@ -168,7 +168,7 @@ bool _rtl92cu_phy_config_bb_with_headerfile(struct ieee80211_hw *hw, 
			rtl_set_bbreg(hw, agctab_array_table[i], MASKDWORD,

				      agctab_array_table[i + 1]);

			udelay(1);

			RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,

			rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,

				"The agctab_array_table[0] is %x Rtl819XPHY_REGARRAY[1] is %x\n",

				agctab_array_table[i],

				agctab_array_table[i + 1]);
@@ -198,7 +198,7 @@ bool _rtl92cu_phy_config_bb_with_pgheaderfile(struct ieee80211_hw *hw, 
						  phy_regarray_table_pg[i + 2]);

		}

	} else {

		RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,

		rtl_dbg(rtlpriv, COMP_SEND, DBG_TRACE,

			"configtype != BaseBand_Config_PHY_REG\n");

	}

	return true;
@@ -220,21 +220,21 @@ bool rtl92cu_phy_config_rf_with_headerfile(struct ieee80211_hw *hw, 
		radioa_array_table = rtlphy->hwparam_tables[RADIOA_2T].pdata;

		radiob_arraylen = rtlphy->hwparam_tables[RADIOB_2T].length;

		radiob_array_table = rtlphy->hwparam_tables[RADIOB_2T].pdata;

		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,

		rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,

			"Radio_A:RTL8192CURADIOA_2TARRAY\n");

		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,

		rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,

			"Radio_B:RTL8192CU_RADIOB_2TARRAY\n");

	} else {

		radioa_arraylen = rtlphy->hwparam_tables[RADIOA_1T].length;

		radioa_array_table = rtlphy->hwparam_tables[RADIOA_1T].pdata;

		radiob_arraylen = rtlphy->hwparam_tables[RADIOB_1T].length;

		radiob_array_table = rtlphy->hwparam_tables[RADIOB_1T].pdata;

		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,

		rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,

			"Radio_A:RTL8192CU_RADIOA_1TARRAY\n");

		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,

		rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,

			"Radio_B:RTL8192CU_RADIOB_1TARRAY\n");

	}

	RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Radio No %x\n", rfpath);

	rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE, "Radio No %x\n", rfpath);

	switch (rfpath) {

	case RF90_PATH_A:

		for (i = 0; i < radioa_arraylen; i = i + 2) {
@@ -269,7 +269,7 @@ void rtl92cu_phy_set_bw_mode_callback(struct ieee80211_hw *hw) 
	u8 reg_bw_opmode;

	u8 reg_prsr_rsc;



	RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "Switch to %s bandwidth\n",

	rtl_dbg(rtlpriv, COMP_SCAN, DBG_TRACE, "Switch to %s bandwidth\n",

		rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ?

		"20MHz" : "40MHz");

	if (is_hal_stop(rtlhal)) {
@@ -319,7 +319,7 @@ void rtl92cu_phy_set_bw_mode_callback(struct ieee80211_hw *hw) 
	}

	rtl92cu_phy_rf6052_set_bandwidth(hw, rtlphy->current_chan_bw);

	rtlphy->set_bwmode_inprogress = false;

	RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "<==\n");

	rtl_dbg(rtlpriv, COMP_SCAN, DBG_TRACE, "<==\n");

}



void rtl92cu_bb_block_on(struct ieee80211_hw *hw)
@@ -390,15 +390,15 @@ static bool _rtl92cu_phy_set_rf_power_state(struct ieee80211_hw *hw, 


			do {

				init_count++;

				RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,

				rtl_dbg(rtlpriv, COMP_RF, DBG_DMESG,

					"IPS Set eRf nic enable\n");

				rtstatus = rtl_ps_enable_nic(hw);

			} while (!rtstatus && (init_count < 10));

			RT_CLEAR_PS_LEVEL(ppsc,

					  RT_RF_OFF_LEVL_HALT_NIC);

		} else {

			RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,

				 "Set ERFON sleeped:%d ms\n",

			rtl_dbg(rtlpriv, COMP_RF, DBG_DMESG,

				"Set ERFON slept:%d ms\n",

				jiffies_to_msecs(jiffies -

						 ppsc->last_sleep_jiffies));

			ppsc->last_awake_jiffies = jiffies;
@@ -421,7 +421,7 @@ static bool _rtl92cu_phy_set_rf_power_state(struct ieee80211_hw *hw, 
				queue_id++;

				continue;

			} else {

				RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,

				rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,

					"eRf Off/Sleep: %d times TcbBusyQueue[%d] =%d before doze!\n",

					i + 1,

					queue_id,
@@ -430,7 +430,7 @@ static bool _rtl92cu_phy_set_rf_power_state(struct ieee80211_hw *hw, 
				i++;

			}

			if (i >= MAX_DOZE_WAITING_TIMES_9x) {

				RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,

				rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,

					"ERFOFF: %d times TcbBusyQueue[%d] = %d !\n",

					MAX_DOZE_WAITING_TIMES_9x,

					queue_id,
@@ -439,7 +439,7 @@ static bool _rtl92cu_phy_set_rf_power_state(struct ieee80211_hw *hw, 
			}

		}

		if (ppsc->reg_rfps_level & RT_RF_OFF_LEVL_HALT_NIC) {

			RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,

			rtl_dbg(rtlpriv, COMP_RF, DBG_DMESG,

				"IPS Set eRf nic disable\n");

			rtl_ps_disable_nic(hw);

			RT_SET_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC);
@@ -463,7 +463,7 @@ static bool _rtl92cu_phy_set_rf_power_state(struct ieee80211_hw *hw, 
				queue_id++;

				continue;

			} else {

				RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,

				rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,

					"eRf Off/Sleep: %d times TcbBusyQueue[%d] =%d before doze!\n",

					i + 1, queue_id,

					skb_queue_len(&ring->queue));
@@ -471,7 +471,7 @@ static bool _rtl92cu_phy_set_rf_power_state(struct ieee80211_hw *hw, 
				i++;

			}

			if (i >= MAX_DOZE_WAITING_TIMES_9x) {

				RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,

				rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,

					"ERFSLEEP: %d times TcbBusyQueue[%d] = %d !\n",

					MAX_DOZE_WAITING_TIMES_9x,

					queue_id,
@@ -479,7 +479,7 @@ static bool _rtl92cu_phy_set_rf_power_state(struct ieee80211_hw *hw, 
				break;

			}

		}

		RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,

		rtl_dbg(rtlpriv, COMP_RF, DBG_DMESG,

			"Set ERFSLEEP awaked:%d ms\n",

			jiffies_to_msecs(jiffies - ppsc->last_awake_jiffies));

		ppsc->last_sleep_jiffies = jiffies;