Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e163e642 authored by Larry Finger's avatar Larry Finger Committed by Greg Kroah-Hartman
Browse files

rtlwifi: Replace RT_TRACE with rtl_dbg 



[ Upstream commit f108a420e50a62e0bc5cdcd7d4a2440986b526e3 ]

The macro name RT_TRACE makes it seem that it is used for tracing, when
is actually used for debugging. Change the name to rtl_dbg. Any Sparse
errors exposed by this change were also fixed.

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-3-Larry.Finger@lwfinger.net


Stable-dep-of: 905a9241e4e8 ("wifi: rtlwifi: fix incorrect error codes in rtl_debugfs_set_write_rfreg()")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent faec6b86

drivers/net/wireless/realtek/rtlwifi/base.c

+72 −72
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ static void _rtl_init_hw_ht_capab(struct ieee80211_hw *hw, 
	} else {

		if (get_rf_type(rtlphy) == RF_1T2R ||

		    get_rf_type(rtlphy) == RF_2T2R) {

			RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,

			rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG,

				"1T2R or 2T2R\n");

			ht_cap->mcs.rx_mask[0] = 0xFF;

			ht_cap->mcs.rx_mask[1] = 0xFF;
@@ -204,7 +204,7 @@ static void _rtl_init_hw_ht_capab(struct ieee80211_hw *hw, 
			ht_cap->mcs.rx_highest =

				 cpu_to_le16(MAX_BIT_RATE_40MHZ_MCS15);

		} else if (get_rf_type(rtlphy) == RF_1T1R) {

			RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "1T1R\n");

			rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, "1T1R\n");



			ht_cap->mcs.rx_mask[0] = 0xFF;

			ht_cap->mcs.rx_mask[1] = 0x00;
@@ -1324,7 +1324,7 @@ bool rtl_tx_mgmt_proc(struct ieee80211_hw *hw, struct sk_buff *skb) 
			rtlpriv->cfg->ops->chk_switch_dmdp(hw);

	}

	if (ieee80211_is_auth(fc)) {

		RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG, "MAC80211_LINKING\n");

		rtl_dbg(rtlpriv, COMP_SEND, DBG_DMESG, "MAC80211_LINKING\n");



		mac->link_state = MAC80211_LINKING;

		/* Dul mac */
@@ -1385,7 +1385,7 @@ bool rtl_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx) 
			if (mac->act_scanning)

				return false;



			RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG,

			rtl_dbg(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG,

				"%s ACT_ADDBAREQ From :%pM\n",

				is_tx ? "Tx" : "Rx", hdr->addr2);

			RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG, "req\n",
@@ -1400,7 +1400,7 @@ bool rtl_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx) 
				rcu_read_lock();

				sta = rtl_find_sta(hw, hdr->addr3);

				if (sta == NULL) {

					RT_TRACE(rtlpriv, COMP_SEND | COMP_RECV,

					rtl_dbg(rtlpriv, COMP_SEND | COMP_RECV,

						DBG_DMESG, "sta is NULL\n");

					rcu_read_unlock();

					return true;
@@ -1428,12 +1428,12 @@ bool rtl_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx) 
			}

			break;

		case ACT_ADDBARSP:

			RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG,

			rtl_dbg(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG,

				"%s ACT_ADDBARSP From :%pM\n",

				is_tx ? "Tx" : "Rx", hdr->addr2);

			break;

		case ACT_DELBA:

			RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG,

			rtl_dbg(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG,

				"ACT_ADDBADEL From :%pM\n", hdr->addr2);

			break;

		}
@@ -1519,7 +1519,7 @@ u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx, 
				/* 68 : UDP BOOTP client

				 * 67 : UDP BOOTP server

				 */

				RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV),

				rtl_dbg(rtlpriv, (COMP_SEND | COMP_RECV),

					DBG_DMESG, "dhcp %s !!\n",

					(is_tx) ? "Tx" : "Rx");
@@ -1540,7 +1540,7 @@ u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx, 
		rtlpriv->btcoexist.btc_info.in_4way = true;

		rtlpriv->btcoexist.btc_info.in_4way_ts = jiffies;



		RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG,

		rtl_dbg(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG,

			"802.1X %s EAPOL pkt!!\n", (is_tx) ? "Tx" : "Rx");



		if (is_tx) {
@@ -1583,11 +1583,11 @@ static void rtl_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb, 
	info = IEEE80211_SKB_CB(skb);

	ieee80211_tx_info_clear_status(info);

	if (ack) {

		RT_TRACE(rtlpriv, COMP_TX_REPORT, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_TX_REPORT, DBG_LOUD,

			"tx report: ack\n");

		info->flags |= IEEE80211_TX_STAT_ACK;

	} else {

		RT_TRACE(rtlpriv, COMP_TX_REPORT, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_TX_REPORT, DBG_LOUD,

			"tx report: not ack\n");

		info->flags &= ~IEEE80211_TX_STAT_ACK;

	}
@@ -1626,7 +1626,7 @@ static u16 rtl_get_tx_report_sn(struct ieee80211_hw *hw, 
	tx_report->last_sent_time = jiffies;

	tx_info->sn = sn;

	tx_info->send_time = tx_report->last_sent_time;

	RT_TRACE(rtlpriv, COMP_TX_REPORT, DBG_DMESG,

	rtl_dbg(rtlpriv, COMP_TX_REPORT, DBG_DMESG,

		"Send TX-Report sn=0x%X\n", sn);



	return sn;
@@ -1674,7 +1674,7 @@ void rtl_tx_report_handler(struct ieee80211_hw *hw, u8 *tmp_buf, u8 c2h_cmd_len) 
			break;

		}

	}

	RT_TRACE(rtlpriv, COMP_TX_REPORT, DBG_DMESG,

	rtl_dbg(rtlpriv, COMP_TX_REPORT, DBG_DMESG,

		"Recv TX-Report st=0x%02X sn=0x%X retry=0x%X\n",

		st, sn, retry);

}
@@ -1689,7 +1689,7 @@ bool rtl_check_tx_report_acked(struct ieee80211_hw *hw) 
		return true;



	if (time_before(tx_report->last_sent_time + 3 * HZ, jiffies)) {

		RT_TRACE(rtlpriv, COMP_TX_REPORT, DBG_WARNING,

		rtl_dbg(rtlpriv, COMP_TX_REPORT, DBG_WARNING,

			"Check TX-Report timeout!! s_sn=0x%X r_sn=0x%X\n",

			tx_report->last_sent_sn, tx_report->last_recv_sn);

		return true;	/* 3 sec. (timeout) seen as acked */
@@ -1707,7 +1707,7 @@ void rtl_wait_tx_report_acked(struct ieee80211_hw *hw, u32 wait_ms) 
		if (rtl_check_tx_report_acked(hw))

			break;

		usleep_range(1000, 2000);

		RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,

		rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,

			"Wait 1ms (%d/%d) to disable key.\n", i, wait_ms);

	}

}
@@ -1770,7 +1770,7 @@ int rtl_tx_agg_start(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
		return -ENXIO;

	tid_data = &sta_entry->tids[tid];



	RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG,

	rtl_dbg(rtlpriv, COMP_SEND, DBG_DMESG,

		"on ra = %pM tid = %d seq:%d\n", sta->addr, tid,

		*ssn);
@@ -1789,7 +1789,7 @@ int rtl_tx_agg_stop(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
	if (sta == NULL)

		return -EINVAL;



	RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG,

	rtl_dbg(rtlpriv, COMP_SEND, DBG_DMESG,

		"on ra = %pM tid = %d\n", sta->addr, tid);



	if (unlikely(tid >= MAX_TID_COUNT))
@@ -1829,7 +1829,7 @@ int rtl_rx_agg_start(struct ieee80211_hw *hw, 
		return -ENXIO;

	tid_data = &sta_entry->tids[tid];



	RT_TRACE(rtlpriv, COMP_RECV, DBG_DMESG,

	rtl_dbg(rtlpriv, COMP_RECV, DBG_DMESG,

		"on ra = %pM tid = %d\n", sta->addr, tid);



	tid_data->agg.rx_agg_state = RTL_RX_AGG_START;
@@ -1845,7 +1845,7 @@ int rtl_rx_agg_stop(struct ieee80211_hw *hw, 
	if (sta == NULL)

		return -EINVAL;



	RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG,

	rtl_dbg(rtlpriv, COMP_SEND, DBG_DMESG,

		"on ra = %pM tid = %d\n", sta->addr, tid);



	if (unlikely(tid >= MAX_TID_COUNT))
@@ -1866,7 +1866,7 @@ int rtl_tx_agg_oper(struct ieee80211_hw *hw, 
	if (sta == NULL)

		return -EINVAL;



	RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG,

	rtl_dbg(rtlpriv, COMP_SEND, DBG_DMESG,

		"on ra = %pM tid = %d\n", sta->addr, tid);



	if (unlikely(tid >= MAX_TID_COUNT))
@@ -1887,7 +1887,7 @@ void rtl_rx_ampdu_apply(struct rtl_priv *rtlpriv) 
		btc_ops->btc_get_ampdu_cfg(rtlpriv, &reject_agg,

					   &ctrl_agg_size, &agg_size);



	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,

	rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,

		"Set RX AMPDU: coex - reject=%d, ctrl_agg_size=%d, size=%d",

		reject_agg, ctrl_agg_size, agg_size);
@@ -1977,7 +1977,7 @@ void rtl_scan_list_expire(struct ieee80211_hw *hw) 
		list_del(&entry->list);

		rtlpriv->scan_list.num--;



		RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_SCAN, DBG_LOUD,

			"BSSID=%pM is expire in scan list (total=%d)\n",

			entry->bssid, rtlpriv->scan_list.num);

		kfree(entry);
@@ -2013,7 +2013,7 @@ void rtl_collect_scan_list(struct ieee80211_hw *hw, struct sk_buff *skb) 
		if (memcmp(entry->bssid, hdr->addr3, ETH_ALEN) == 0) {

			list_del_init(&entry->list);

			entry_found = true;

			RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD,

			rtl_dbg(rtlpriv, COMP_SCAN, DBG_LOUD,

				"Update BSSID=%pM to scan list (total=%d)\n",

				hdr->addr3, rtlpriv->scan_list.num);

			break;
@@ -2029,7 +2029,7 @@ void rtl_collect_scan_list(struct ieee80211_hw *hw, struct sk_buff *skb) 
		memcpy(entry->bssid, hdr->addr3, ETH_ALEN);

		rtlpriv->scan_list.num++;



		RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_SCAN, DBG_LOUD,

			"Add BSSID=%pM to scan list (total=%d)\n",

			hdr->addr3, rtlpriv->scan_list.num);

	}
@@ -2191,7 +2191,7 @@ void rtl_watchdog_wq_callback(void *data) 
		if ((rtlpriv->link_info.bcn_rx_inperiod +

		    rtlpriv->link_info.num_rx_inperiod) == 0) {

			rtlpriv->link_info.roam_times++;

			RT_TRACE(rtlpriv, COMP_ERR, DBG_DMESG,

			rtl_dbg(rtlpriv, COMP_ERR, DBG_DMESG,

				"AP off for %d s\n",

				(rtlpriv->link_info.roam_times * 2));
@@ -2305,10 +2305,10 @@ static void rtl_c2h_content_parsing(struct ieee80211_hw *hw, 


	switch (cmd_id) {

	case C2H_DBG:

		RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "[C2H], C2H_DBG!!\n");

		rtl_dbg(rtlpriv, COMP_FW, DBG_LOUD, "[C2H], C2H_DBG!!\n");

		break;

	case C2H_TXBF:

		RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,

		rtl_dbg(rtlpriv, COMP_FW, DBG_TRACE,

			"[C2H], C2H_TXBF!!\n");

		break;

	case C2H_TX_REPORT:
@@ -2319,19 +2319,19 @@ static void rtl_c2h_content_parsing(struct ieee80211_hw *hw, 
			hal_ops->c2h_ra_report_handler(hw, cmd_buf, cmd_len);

		break;

	case C2H_BT_INFO:

		RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,

		rtl_dbg(rtlpriv, COMP_FW, DBG_TRACE,

			"[C2H], C2H_BT_INFO!!\n");

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

			btc_ops->btc_btinfo_notify(rtlpriv, cmd_buf, cmd_len);

		break;

	case C2H_BT_MP:

		RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,

		rtl_dbg(rtlpriv, COMP_FW, DBG_TRACE,

			"[C2H], C2H_BT_MP!!\n");

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

			btc_ops->btc_btmpinfo_notify(rtlpriv, cmd_buf, cmd_len);

		break;

	default:

		RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,

		rtl_dbg(rtlpriv, COMP_FW, DBG_TRACE,

			"[C2H], Unknown packet!! cmd_id(%#X)!\n", cmd_id);

		break;

	}
@@ -2356,7 +2356,7 @@ void rtl_c2hcmd_launcher(struct ieee80211_hw *hw, int exec) 
		if (!skb)

			break;



		RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG, "C2H rx_desc_shift=%d\n",

		rtl_dbg(rtlpriv, COMP_FW, DBG_DMESG, "C2H rx_desc_shift=%d\n",

			*((u8 *)skb->cb));

		RT_PRINT_DATA(rtlpriv, COMP_FW, DBG_DMESG,

			      "C2H data: ", skb->data, skb->len);
@@ -2702,29 +2702,29 @@ void rtl_recognize_peer(struct ieee80211_hw *hw, u8 *data, unsigned int len) 
		(memcmp(mac->bssid, ap5_6, 3) == 0) ||

		vendor == PEER_ATH) {

		vendor = PEER_ATH;

		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, "=>ath find\n");

		rtl_dbg(rtlpriv, COMP_MAC80211, DBG_LOUD, "=>ath find\n");

	} else if ((memcmp(mac->bssid, ap4_4, 3) == 0) ||

		(memcmp(mac->bssid, ap4_5, 3) == 0) ||

		(memcmp(mac->bssid, ap4_1, 3) == 0) ||

		(memcmp(mac->bssid, ap4_2, 3) == 0) ||

		(memcmp(mac->bssid, ap4_3, 3) == 0) ||

		vendor == PEER_RAL) {

		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, "=>ral find\n");

		rtl_dbg(rtlpriv, COMP_MAC80211, DBG_LOUD, "=>ral find\n");

		vendor = PEER_RAL;

	} else if (memcmp(mac->bssid, ap6_1, 3) == 0 ||

		vendor == PEER_CISCO) {

		vendor = PEER_CISCO;

		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, "=>cisco find\n");

		rtl_dbg(rtlpriv, COMP_MAC80211, DBG_LOUD, "=>cisco find\n");

	} else if ((memcmp(mac->bssid, ap3_1, 3) == 0) ||

		(memcmp(mac->bssid, ap3_2, 3) == 0) ||

		(memcmp(mac->bssid, ap3_3, 3) == 0) ||

		vendor == PEER_BROAD) {

		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, "=>broad find\n");

		rtl_dbg(rtlpriv, COMP_MAC80211, DBG_LOUD, "=>broad find\n");

		vendor = PEER_BROAD;

	} else if (memcmp(mac->bssid, ap7_1, 3) == 0 ||

		vendor == PEER_MARV) {

		vendor = PEER_MARV;

		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, "=>marv find\n");

		rtl_dbg(rtlpriv, COMP_MAC80211, DBG_LOUD, "=>marv find\n");

	}



	mac->vendor = vendor;

drivers/net/wireless/realtek/rtlwifi/cam.c

+40 −42
Original line number Diff line number Diff line
@@ -43,12 +43,12 @@ static void rtl_cam_program_entry(struct ieee80211_hw *hw, u32 entry_no, 
			rtl_write_dword(rtlpriv, rtlpriv->cfg->maps[RWCAM],

					target_command);



			RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,

			rtl_dbg(rtlpriv, COMP_SEC, DBG_LOUD,

				"WRITE %x: %x\n",

				rtlpriv->cfg->maps[WCAMI], target_content);

			RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,

			rtl_dbg(rtlpriv, COMP_SEC, DBG_LOUD,

				"The Key ID is %d\n", entry_no);

			RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,

			rtl_dbg(rtlpriv, COMP_SEC, DBG_LOUD,

				"WRITE %x: %x\n",

				rtlpriv->cfg->maps[RWCAM], target_command);
@@ -64,9 +64,9 @@ static void rtl_cam_program_entry(struct ieee80211_hw *hw, u32 entry_no, 
			rtl_write_dword(rtlpriv, rtlpriv->cfg->maps[RWCAM],

					target_command);



			RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,

			rtl_dbg(rtlpriv, COMP_SEC, DBG_LOUD,

				"WRITE A4: %x\n", target_content);

			RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,

			rtl_dbg(rtlpriv, COMP_SEC, DBG_LOUD,

				"WRITE A0: %x\n", target_command);



		} else {
@@ -83,14 +83,14 @@ static void rtl_cam_program_entry(struct ieee80211_hw *hw, u32 entry_no, 
			rtl_write_dword(rtlpriv, rtlpriv->cfg->maps[RWCAM],

					target_command);



			RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,

			rtl_dbg(rtlpriv, COMP_SEC, DBG_LOUD,

				"WRITE A4: %x\n", target_content);

			RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,

			rtl_dbg(rtlpriv, COMP_SEC, DBG_LOUD,

				"WRITE A0: %x\n", target_command);

		}

	}



	RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_SEC, DBG_LOUD,

		"after set key, usconfig:%x\n", us_config);

}
@@ -101,13 +101,13 @@ u8 rtl_cam_add_one_entry(struct ieee80211_hw *hw, u8 *mac_addr, 
	u32 us_config;

	struct rtl_priv *rtlpriv = rtl_priv(hw);



	RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,

	rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,

		"EntryNo:%x, ulKeyId=%x, ulEncAlg=%x, ulUseDK=%x MacAddr %pM\n",

		ul_entry_idx, ul_key_id, ul_enc_alg,

		ul_default_key, mac_addr);



	if (ul_key_id == TOTAL_CAM_ENTRY) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,

		rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,

			"ulKeyId exceed!\n");

		return 0;

	}
@@ -120,7 +120,7 @@ u8 rtl_cam_add_one_entry(struct ieee80211_hw *hw, u8 *mac_addr, 
	rtl_cam_program_entry(hw, ul_entry_idx, mac_addr,

			      (u8 *)key_content, us_config);



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

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



	return 1;
@@ -133,7 +133,7 @@ int rtl_cam_delete_one_entry(struct ieee80211_hw *hw, 
	u32 ul_command;

	struct rtl_priv *rtlpriv = rtl_priv(hw);



	RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "key_idx:%d\n", ul_key_id);

	rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG, "key_idx:%d\n", ul_key_id);



	ul_command = ul_key_id * CAM_CONTENT_COUNT;

	ul_command = ul_command | BIT(31) | BIT(16);
@@ -141,10 +141,10 @@ int rtl_cam_delete_one_entry(struct ieee80211_hw *hw, 
	rtl_write_dword(rtlpriv, rtlpriv->cfg->maps[WCAMI], 0);

	rtl_write_dword(rtlpriv, rtlpriv->cfg->maps[RWCAM], ul_command);



	RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,

		 "rtl_cam_delete_one_entry(): WRITE A4: %x\n", 0);

	RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,

		 "rtl_cam_delete_one_entry(): WRITE A0: %x\n", ul_command);

	rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,

		"%s: WRITE A4: %x\n", __func__, 0);

	rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,

		"%s: WRITE A0: %x\n", __func__, ul_command);



	return 0;
@@ -195,10 +195,10 @@ void rtl_cam_mark_invalid(struct ieee80211_hw *hw, u8 uc_index) 
	rtl_write_dword(rtlpriv, rtlpriv->cfg->maps[WCAMI], ul_content);

	rtl_write_dword(rtlpriv, rtlpriv->cfg->maps[RWCAM], ul_command);



	RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,

		 "rtl_cam_mark_invalid(): WRITE A4: %x\n", ul_content);

	RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,

		 "rtl_cam_mark_invalid(): WRITE A0: %x\n", ul_command);

	rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,

		"%s: WRITE A4: %x\n", __func__, ul_content);

	rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,

		"%s: WRITE A0: %x\n", __func__, ul_command);

}

EXPORT_SYMBOL(rtl_cam_mark_invalid);
@@ -245,12 +245,10 @@ void rtl_cam_empty_entry(struct ieee80211_hw *hw, u8 uc_index) 
		rtl_write_dword(rtlpriv, rtlpriv->cfg->maps[WCAMI], ul_content);

		rtl_write_dword(rtlpriv, rtlpriv->cfg->maps[RWCAM], ul_command);



		RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,

			 "rtl_cam_empty_entry(): WRITE A4: %x\n",

			 ul_content);

		RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,

			 "rtl_cam_empty_entry(): WRITE A0: %x\n",

			 ul_command);

		rtl_dbg(rtlpriv, COMP_SEC, DBG_LOUD,

			"%s: WRITE A4: %x\n", __func__, ul_content);

		rtl_dbg(rtlpriv, COMP_SEC, DBG_LOUD,

			"%s: WRITE A0: %x\n", __func__, ul_command);

	}



}
@@ -313,7 +311,7 @@ void rtl_cam_del_entry(struct ieee80211_hw *hw, u8 *sta_addr) 
			/* Remove from HW Security CAM */

			eth_zero_addr(rtlpriv->sec.hwsec_cam_sta_addr[i]);

			rtlpriv->sec.hwsec_cam_bitmap &= ~(BIT(0) << i);

			RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,

			rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,

				"&&&&&&&&&del entry %d\n", i);

		}

	}

drivers/net/wireless/realtek/rtlwifi/core.c

+130 −129

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/wireless/realtek/rtlwifi/debug.c

+2 −2
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ static ssize_t rtl_debugfs_set_write_rfreg(struct file *filp, 
		     &path, &addr, &bitmask, &data);



	if (num != 4) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_DMESG,

		rtl_dbg(rtlpriv, COMP_ERR, DBG_DMESG,

			"Format is <path> <addr> <mask> <data>\n");

		return count;

	}

drivers/net/wireless/realtek/rtlwifi/efuse.c

+36 −36
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ void efuse_write_1byte(struct ieee80211_hw *hw, u16 address, u8 value) 
	const u32 efuse_len =

		rtlpriv->cfg->maps[EFUSE_REAL_CONTENT_SIZE];



	RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD, "Addr=%x Data =%x\n",

	rtl_dbg(rtlpriv, COMP_EFUSE, DBG_LOUD, "Addr=%x Data =%x\n",

		address, value);



	if (address < efuse_len) {
@@ -211,9 +211,9 @@ void read_efuse(struct ieee80211_hw *hw, u16 _offset, u16 _size_byte, u8 *pbuf) 
	u8 efuse_usage;



	if ((_offset + _size_byte) > rtlpriv->cfg->maps[EFUSE_HWSET_MAX_SIZE]) {

		RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD,

			 "read_efuse(): Invalid offset(%#x) with read bytes(%#x)!!\n",

			 _offset, _size_byte);

		rtl_dbg(rtlpriv, COMP_EFUSE, DBG_LOUD,

			"%s: Invalid offset(%#x) with read bytes(%#x)!!\n",

			__func__, _offset, _size_byte);

		return;

	}
@@ -376,9 +376,9 @@ bool efuse_shadow_update_chk(struct ieee80211_hw *hw) 
	    (EFUSE_MAX_SIZE - rtlpriv->cfg->maps[EFUSE_OOB_PROTECT_BYTES_LEN]))

		result = false;



	RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD,

		 "efuse_shadow_update_chk(): totalbytes(%#x), hdr_num(%#x), words_need(%#x), efuse_used(%d)\n",

		 totalbytes, hdr_num, words_need, efuse_used);

	rtl_dbg(rtlpriv, COMP_EFUSE, DBG_LOUD,

		"%s: totalbytes(%#x), hdr_num(%#x), words_need(%#x), efuse_used(%d)\n",

		__func__, totalbytes, hdr_num, words_need, efuse_used);



	return result;

}
@@ -416,7 +416,7 @@ bool efuse_shadow_update(struct ieee80211_hw *hw) 
	u8 word_en = 0x0F;

	u8 first_pg = false;



	RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD, "\n");

	rtl_dbg(rtlpriv, COMP_EFUSE, DBG_LOUD, "\n");



	if (!efuse_shadow_update_chk(hw)) {

		efuse_read_all_map(hw, &rtlefuse->efuse_map[EFUSE_INIT_MAP][0]);
@@ -424,7 +424,7 @@ bool efuse_shadow_update(struct ieee80211_hw *hw) 
		       &rtlefuse->efuse_map[EFUSE_INIT_MAP][0],

		       rtlpriv->cfg->maps[EFUSE_HWSET_MAX_SIZE]);



		RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_EFUSE, DBG_LOUD,

			"efuse out of capacity!!\n");

		return false;

	}
@@ -464,7 +464,7 @@ bool efuse_shadow_update(struct ieee80211_hw *hw) 


			if (!efuse_pg_packet_write(hw, (u8) offset, word_en,

						   tmpdata)) {

				RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,

				rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,

					"PG section(%#x) fail!!\n", offset);

				break;

			}
@@ -478,7 +478,7 @@ bool efuse_shadow_update(struct ieee80211_hw *hw) 
	       &rtlefuse->efuse_map[EFUSE_INIT_MAP][0],

	       rtlpriv->cfg->maps[EFUSE_HWSET_MAX_SIZE]);



	RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD, "\n");

	rtl_dbg(rtlpriv, COMP_EFUSE, DBG_LOUD, "\n");

	return true;

}
@@ -616,7 +616,7 @@ static int efuse_one_byte_write(struct ieee80211_hw *hw, u16 addr, u8 data) 
	struct rtl_priv *rtlpriv = rtl_priv(hw);

	u8 tmpidx = 0;



	RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_EFUSE, DBG_LOUD,

		"Addr = %x Data=%x\n", addr, data);



	rtl_write_byte(rtlpriv,
@@ -997,7 +997,7 @@ static int efuse_pg_packet_write(struct ieee80211_hw *hw, 


	if (efuse_addr >= (EFUSE_MAX_SIZE -

		rtlpriv->cfg->maps[EFUSE_OOB_PROTECT_BYTES_LEN])) {

		RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_EFUSE, DBG_LOUD,

			"efuse_addr(%#x) Out of size!!\n", efuse_addr);

	}
@@ -1038,7 +1038,7 @@ static u8 enable_efuse_data_write(struct ieee80211_hw *hw, 
	u8 tmpdata[8];



	memset(tmpdata, 0xff, PGPKT_DATA_SIZE);

	RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_EFUSE, DBG_LOUD,

		"word_en = %x efuse_addr=%x\n", word_en, efuse_addr);



	if (!(word_en & BIT(0))) {
@@ -1242,11 +1242,11 @@ int rtl_get_hwinfo(struct ieee80211_hw *hw, struct rtl_priv *rtlpriv, 


	eeprom_id = *((u16 *)&hwinfo[0]);

	if (eeprom_id != params[0]) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,

		rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,

			"EEPROM ID(%#x) is invalid!!\n", eeprom_id);

		rtlefuse->autoload_failflag = true;

	} else {

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

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

		rtlefuse->autoload_failflag = false;

	}
@@ -1257,29 +1257,29 @@ int rtl_get_hwinfo(struct ieee80211_hw *hw, struct rtl_priv *rtlpriv, 
	rtlefuse->eeprom_did = *(u16 *)&hwinfo[params[2]];

	rtlefuse->eeprom_svid = *(u16 *)&hwinfo[params[3]];

	rtlefuse->eeprom_smid = *(u16 *)&hwinfo[params[4]];

	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

		"EEPROMId = 0x%4x\n", eeprom_id);

	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

		"EEPROM VID = 0x%4x\n", rtlefuse->eeprom_vid);

	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

		"EEPROM DID = 0x%4x\n", rtlefuse->eeprom_did);

	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

		"EEPROM SVID = 0x%4x\n", rtlefuse->eeprom_svid);

	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

		"EEPROM SMID = 0x%4x\n", rtlefuse->eeprom_smid);



	for (i = 0; i < 6; i += 2) {

		usvalue = *(u16 *)&hwinfo[params[5] + i];

		*((u16 *)(&rtlefuse->dev_addr[i])) = usvalue;

	}

	RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "%pM\n", rtlefuse->dev_addr);

	rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, "%pM\n", rtlefuse->dev_addr);



	rtlefuse->eeprom_channelplan = *&hwinfo[params[6]];

	rtlefuse->eeprom_version = *(u16 *)&hwinfo[params[7]];

	rtlefuse->txpwr_fromeprom = true;

	rtlefuse->eeprom_oemid = *&hwinfo[params[8]];



	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 to world wide 13 */