rtw88: change rtw_info() to proper message level
Ping-Ke Shih
maintainerPATCH 1/1 rtw88: change rtw_info() to proper message level
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/[email protected]/
Reported-by Larry Finger <[email protected]>
Signed-off-by Ping-Ke Shih <[email protected]>
--- drivers/net/wireless/realtek/rtw88/debug.c | 2 +- drivers/net/wireless/realtek/rtw88/debug.h | 1 + drivers/net/wireless/realtek/rtw88/fw.c | 2 +- drivers/net/wireless/realtek/rtw88/mac80211.c | 8 ++++---- drivers/net/wireless/realtek/rtw88/main.c | 8 ++++---- drivers/net/wireless/realtek/rtw88/rtw8821c.c | 2 +- drivers/net/wireless/realtek/rtw88/rtw8822b.c | 4 ++-- drivers/net/wireless/realtek/rtw88/rtw8822c.c | 4 ++-- drivers/net/wireless/realtek/rtw88/sar.c | 8 ++++---- 9 files changed, 20 insertions(+), 19 deletions(-)
drivers/net/wireless/realtek/rtw88/debug.c +1 -1
@@ -390,7 +390,7 @@ static ssize_t rtw_debugfs_set_h2c(struct file *filp, ¶m[0 ], ¶m[1 ], ¶m[2 ], ¶m[3 ], ¶m[4], ¶m[5], ¶m[6], ¶m[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 ; }
drivers/net/wireless/realtek/rtw88/debug.h +1 -0
@@ -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 };
drivers/net/wireless/realtek/rtw88/fw.c +1 -1
@@ -2131,7 +2131,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)
drivers/net/wireless/realtek/rtw88/mac80211.c +4 -4
@@ -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 ; }
@@ -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);
@@ -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);
drivers/net/wireless/realtek/rtw88/main.c +4 -4
@@ -314,8 +314,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 ; }
@@ -336,8 +336,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 {
drivers/net/wireless/realtek/rtw88/rtw8821c.c +1 -1
@@ -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 ; }
drivers/net/wireless/realtek/rtw88/rtw8822b.c +2 -2
@@ -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 ; }
drivers/net/wireless/realtek/rtw88/rtw8822c.c +2 -2
@@ -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 ; }
@@ -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 ; }
drivers/net/wireless/realtek/rtw88/sar.c +4 -4
@@ -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++) {
Signature · 1 line
2.25.1
Quoted 9 lines · Ping-Ke Shih
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 allrtw_info()and change others tortw_warn().[1] https://lore.kernel.org/linux-wireless/[email protected]/
Reported-by Larry Finger <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
Patch applied to wireless-next.git, thanks.
a0061be4e54b rtw88: change rtw_info() to proper message level
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches