Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-11 13:41:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

rtw88: change rtw_info() to proper message level

Browse Source 
Larry reported funny log entries [1] when he used rtl8821ce. These
messages are not harmless, but not useful for users, so change them to
rtw_dbg() level. By the way, I review all rtw_info() and change others
to rtw_warn().

[1] https://lore.kernel.org/linux-wireless/c356d5ae-a7b3-3065-1121-64c446e70333@lwfinger.net/

Reported-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20220218035527.9835-1-pkshih@realtek.com
This commit is contained in:
Ping-Ke Shih 2022-02-18 11:55:27 +08:00 committed by Kalle Valo
parent a9e06f2e65
commit a0061be4e5
9 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/realtek/rtw88/debug.c
View File

@ -390,7 +390,7 @@ static ssize_t rtw_debugfs_set_h2c(struct file *filp,
&param[0], &param[1], &param[2], &param[3], &param[0], &param[1], &param[2], &param[3],
&param[4], &param[5], &param[6], &param[7]); &param[4], &param[5], &param[6], &param[7]);
if (num != 8) { if (num != 8) {
rtw_info(rtwdev, "invalid H2C command format for debug\n"); rtw_warn(rtwdev, "invalid H2C command format for debug\n");
return -EINVAL; return -EINVAL;
} }

1
drivers/net/wireless/realtek/rtw88/debug.h
View File

@ -23,6 +23,7 @@ enum rtw_debug_mask {
RTW_DBG_PATH_DIV = 0x00004000, RTW_DBG_PATH_DIV = 0x00004000,
RTW_DBG_ADAPTIVITY = 0x00008000, RTW_DBG_ADAPTIVITY = 0x00008000,
RTW_DBG_HW_SCAN = 0x00010000, RTW_DBG_HW_SCAN = 0x00010000,
RTW_DBG_STATE = 0x00020000,
RTW_DBG_ALL = 0xffffffff RTW_DBG_ALL = 0xffffffff
}; };

2
drivers/net/wireless/realtek/rtw88/fw.c
View File

@ -2146,7 +2146,7 @@ void rtw_hw_scan_status_report(struct rtw_dev *rtwdev, struct sk_buff *skb)
rtw_hw_scan_complete(rtwdev, vif, aborted); rtw_hw_scan_complete(rtwdev, vif, aborted);
if (aborted) if (aborted)
rtw_info(rtwdev, "HW scan aborted with code: %d\n", rc); rtw_dbg(rtwdev, RTW_DBG_HW_SCAN, "HW scan aborted with code: %d\n", rc);
} }
void rtw_store_op_chan(struct rtw_dev *rtwdev) void rtw_store_op_chan(struct rtw_dev *rtwdev)

8
drivers/net/wireless/realtek/rtw88/mac80211.c
View File

@ -208,7 +208,7 @@ static int rtw_ops_add_interface(struct ieee80211_hw *hw,
mutex_unlock(&rtwdev->mutex); mutex_unlock(&rtwdev->mutex);
rtw_info(rtwdev, "start vif %pM on port %d\n", vif->addr, rtwvif->port); rtw_dbg(rtwdev, RTW_DBG_STATE, "start vif %pM on port %d\n", vif->addr, rtwvif->port);
return 0; return 0;
} }
@ -219,7 +219,7 @@ static void rtw_ops_remove_interface(struct ieee80211_hw *hw,
struct rtw_vif *rtwvif = (struct rtw_vif *)vif->drv_priv; struct rtw_vif *rtwvif = (struct rtw_vif *)vif->drv_priv;
u32 config = 0; u32 config = 0;
rtw_info(rtwdev, "stop vif %pM on port %d\n", vif->addr, rtwvif->port); rtw_dbg(rtwdev, RTW_DBG_STATE, "stop vif %pM on port %d\n", vif->addr, rtwvif->port);
mutex_lock(&rtwdev->mutex); mutex_lock(&rtwdev->mutex);
@ -245,8 +245,8 @@ static int rtw_ops_change_interface(struct ieee80211_hw *hw,
{ {
struct rtw_dev *rtwdev = hw->priv; struct rtw_dev *rtwdev = hw->priv;
rtw_info(rtwdev, "change vif %pM (%d)->(%d), p2p (%d)->(%d)\n", rtw_dbg(rtwdev, RTW_DBG_STATE, "change vif %pM (%d)->(%d), p2p (%d)->(%d)\n",
vif->addr, vif->type, type, vif->p2p, p2p); vif->addr, vif->type, type, vif->p2p, p2p);
rtw_ops_remove_interface(hw, vif); rtw_ops_remove_interface(hw, vif);

8
drivers/net/wireless/realtek/rtw88/main.c
View File

@ -317,8 +317,8 @@ int rtw_sta_add(struct rtw_dev *rtwdev, struct ieee80211_sta *sta,
rtwdev->sta_cnt++; rtwdev->sta_cnt++;
rtwdev->beacon_loss = false; rtwdev->beacon_loss = false;
rtw_info(rtwdev, "sta %pM joined with macid %d\n", rtw_dbg(rtwdev, RTW_DBG_STATE, "sta %pM joined with macid %d\n",
sta->addr, si->mac_id); sta->addr, si->mac_id);
return 0; return 0;
} }
@ -339,8 +339,8 @@ void rtw_sta_remove(struct rtw_dev *rtwdev, struct ieee80211_sta *sta,
kfree(si->mask); kfree(si->mask);
rtwdev->sta_cnt--; rtwdev->sta_cnt--;
rtw_info(rtwdev, "sta %pM with macid %d left\n", rtw_dbg(rtwdev, RTW_DBG_STATE, "sta %pM with macid %d left\n",
sta->addr, si->mac_id); sta->addr, si->mac_id);
} }
struct rtw_fwcd_hdr { struct rtw_fwcd_hdr {

2
drivers/net/wireless/realtek/rtw88/rtw8821c.c
View File

@ -499,7 +499,7 @@ static s8 get_cck_rx_pwr(struct rtw_dev *rtwdev, u8 lna_idx, u8 vga_idx)
} }
if (lna_idx >= lna_gain_table_size) { if (lna_idx >= lna_gain_table_size) {
rtw_info(rtwdev, "incorrect lna index (%d)\n", lna_idx); rtw_warn(rtwdev, "incorrect lna index (%d)\n", lna_idx);
return -120; return -120;
} }

4
drivers/net/wireless/realtek/rtw88/rtw8822b.c
View File

@ -1012,12 +1012,12 @@ static int rtw8822b_set_antenna(struct rtw_dev *rtwdev,
antenna_tx, antenna_rx); antenna_tx, antenna_rx);
if (!rtw8822b_check_rf_path(antenna_tx)) { if (!rtw8822b_check_rf_path(antenna_tx)) {
rtw_info(rtwdev, "unsupported tx path 0x%x\n", antenna_tx); rtw_warn(rtwdev, "unsupported tx path 0x%x\n", antenna_tx);
return -EINVAL; return -EINVAL;
} }
if (!rtw8822b_check_rf_path(antenna_rx)) { if (!rtw8822b_check_rf_path(antenna_rx)) {
rtw_info(rtwdev, "unsupported rx path 0x%x\n", antenna_rx); rtw_warn(rtwdev, "unsupported rx path 0x%x\n", antenna_rx);
return -EINVAL; return -EINVAL;
} }

4
drivers/net/wireless/realtek/rtw88/rtw8822c.c
View File

@ -2798,7 +2798,7 @@ static int rtw8822c_set_antenna(struct rtw_dev *rtwdev,
case BB_PATH_AB: case BB_PATH_AB:
break; break;
default: default:
rtw_info(rtwdev, "unsupported tx path 0x%x\n", antenna_tx); rtw_warn(rtwdev, "unsupported tx path 0x%x\n", antenna_tx);
return -EINVAL; return -EINVAL;
} }
@ -2808,7 +2808,7 @@ static int rtw8822c_set_antenna(struct rtw_dev *rtwdev,
case BB_PATH_AB: case BB_PATH_AB:
break; break;
default: default:
rtw_info(rtwdev, "unsupported rx path 0x%x\n", antenna_rx); rtw_warn(rtwdev, "unsupported rx path 0x%x\n", antenna_rx);
return -EINVAL; return -EINVAL;
} }

8
drivers/net/wireless/realtek/rtw88/sar.c
View File

@ -91,10 +91,10 @@ int rtw_set_sar_specs(struct rtw_dev *rtwdev,
return -EINVAL; return -EINVAL;
power = sar->sub_specs[i].power; power = sar->sub_specs[i].power;
rtw_info(rtwdev, "On freq %u to %u, set SAR %d in 1/%lu dBm\n", rtw_dbg(rtwdev, RTW_DBG_REGD, "On freq %u to %u, set SAR %d in 1/%lu dBm\n",
rtw_common_sar_freq_ranges[idx].start_freq, rtw_common_sar_freq_ranges[idx].start_freq,
rtw_common_sar_freq_ranges[idx].end_freq, rtw_common_sar_freq_ranges[idx].end_freq,
power, BIT(RTW_COMMON_SAR_FCT)); power, BIT(RTW_COMMON_SAR_FCT));
for (j = 0; j < RTW_RF_PATH_MAX; j++) { for (j = 0; j < RTW_RF_PATH_MAX; j++) {
for (k = 0; k < RTW_RATE_SECTION_MAX; k++) { for (k = 0; k < RTW_RATE_SECTION_MAX; k++) {