Skip to content

Commit

Permalink
rtw88: change rtw_info() to proper message level
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
Ping-Ke Shih authored and Kalle Valo committed Feb 22, 2022
1 parent a9e06f2 commit a0061be
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 19 deletions.
2 changes: 1 addition & 1 deletion drivers/net/wireless/realtek/rtw88/debug.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ static ssize_t rtw_debugfs_set_h2c(struct file *filp,
&param[0], &param[1], &param[2], &param[3],
&param[4], &param[5], &param[6], &param[7]);
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;
}

Expand Down
1 change: 1 addition & 0 deletions drivers/net/wireless/realtek/rtw88/debug.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ enum rtw_debug_mask {
RTW_DBG_PATH_DIV = 0x00004000,
RTW_DBG_ADAPTIVITY = 0x00008000,
RTW_DBG_HW_SCAN = 0x00010000,
RTW_DBG_STATE = 0x00020000,

RTW_DBG_ALL = 0xffffffff
};
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/wireless/realtek/rtw88/fw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

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)
Expand Down
8 changes: 4 additions & 4 deletions drivers/net/wireless/realtek/rtw88/mac80211.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ static int rtw_ops_add_interface(struct ieee80211_hw *hw,

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

Expand All @@ -219,7 +219,7 @@ static void rtw_ops_remove_interface(struct ieee80211_hw *hw,
struct rtw_vif *rtwvif = (struct rtw_vif *)vif->drv_priv;
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);

Expand All @@ -245,8 +245,8 @@ static int rtw_ops_change_interface(struct ieee80211_hw *hw,
{
struct rtw_dev *rtwdev = hw->priv;

rtw_info(rtwdev, "change vif %pM (%d)->(%d), p2p (%d)->(%d)\n",
vif->addr, vif->type, type, vif->p2p, p2p);
rtw_dbg(rtwdev, RTW_DBG_STATE, "change vif %pM (%d)->(%d), p2p (%d)->(%d)\n",
vif->addr, vif->type, type, vif->p2p, p2p);

rtw_ops_remove_interface(hw, vif);

Expand Down
8 changes: 4 additions & 4 deletions drivers/net/wireless/realtek/rtw88/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -317,8 +317,8 @@ int rtw_sta_add(struct rtw_dev *rtwdev, struct ieee80211_sta *sta,

rtwdev->sta_cnt++;
rtwdev->beacon_loss = false;
rtw_info(rtwdev, "sta %pM joined with macid %d\n",
sta->addr, si->mac_id);
rtw_dbg(rtwdev, RTW_DBG_STATE, "sta %pM joined with macid %d\n",
sta->addr, si->mac_id);

return 0;
}
Expand All @@ -339,8 +339,8 @@ void rtw_sta_remove(struct rtw_dev *rtwdev, struct ieee80211_sta *sta,
kfree(si->mask);

rtwdev->sta_cnt--;
rtw_info(rtwdev, "sta %pM with macid %d left\n",
sta->addr, si->mac_id);
rtw_dbg(rtwdev, RTW_DBG_STATE, "sta %pM with macid %d left\n",
sta->addr, si->mac_id);
}

struct rtw_fwcd_hdr {
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/wireless/realtek/rtw88/rtw8821c.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
rtw_info(rtwdev, "incorrect lna index (%d)\n", lna_idx);
rtw_warn(rtwdev, "incorrect lna index (%d)\n", lna_idx);
return -120;
}

Expand Down
4 changes: 2 additions & 2 deletions drivers/net/wireless/realtek/rtw88/rtw8822b.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1012,12 +1012,12 @@ static int rtw8822b_set_antenna(struct rtw_dev *rtwdev,
antenna_tx, antenna_rx);

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

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

Expand Down
4 changes: 2 additions & 2 deletions drivers/net/wireless/realtek/rtw88/rtw8822c.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2798,7 +2798,7 @@ static int rtw8822c_set_antenna(struct rtw_dev *rtwdev,
case BB_PATH_AB:
break;
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;
}

Expand All @@ -2808,7 +2808,7 @@ static int rtw8822c_set_antenna(struct rtw_dev *rtwdev,
case BB_PATH_AB:
break;
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;
}

Expand Down
8 changes: 4 additions & 4 deletions drivers/net/wireless/realtek/rtw88/sar.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,10 @@ int rtw_set_sar_specs(struct rtw_dev *rtwdev,
return -EINVAL;

power = sar->sub_specs[i].power;
rtw_info(rtwdev, "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].end_freq,
power, BIT(RTW_COMMON_SAR_FCT));
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].end_freq,
power, BIT(RTW_COMMON_SAR_FCT));

for (j = 0; j < RTW_RF_PATH_MAX; j++) {
for (k = 0; k < RTW_RATE_SECTION_MAX; k++) {
Expand Down

0 comments on commit a0061be

Please sign in to comment.