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/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

diff --git a/drivers/net/wireless/realtek/rtw88/debug.c b/drivers/net/wireless/realtek/rtw88/debug.c
index 03a08137066fe4f3fdeccdbfd171d1130770fa6c..1a52ff585fbc72878fc069ae6b8bd6fa85ede20b 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/debug.c
+++ b/drivers/net/wireless/realtek/rtw88/debug.c
@@ -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;
        }
 

diff --git a/drivers/net/wireless/realtek/rtw88/debug.h b/drivers/net/wireless/realtek/rtw88/debug.h
index 61f8369fe2d61a7e3f7892f9391b4e1fa6680c29..066792dd96afb479f51cf87e29bdcc79707b744e 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/debug.h
+++ b/drivers/net/wireless/realtek/rtw88/debug.h
@@ -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
 };

diff --git a/drivers/net/wireless/realtek/rtw88/fw.c b/drivers/net/wireless/realtek/rtw88/fw.c
index ac581df6290e87c0e843ae4c30db43eaefa7c5f4..aa2aeb5fb2ccd509ee2e7d97409dddfea44703e9 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/fw.c
+++ b/drivers/net/wireless/realtek/rtw88/fw.c
@@ -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)

diff --git a/drivers/net/wireless/realtek/rtw88/mac80211.c b/drivers/net/wireless/realtek/rtw88/mac80211.c
index 647d2662955ba95f00a9a00f41b608e609aeadee..5cdc54c9a9aae07a6d21374868958a3effdc5be7 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/mac80211.c
+++ b/drivers/net/wireless/realtek/rtw88/mac80211.c
@@ -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);
 

diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c
index 79a8e0282aa0baff1573965673aa0535e8321bca..8b9899e41b0bb4f311f8207fc6ba1118bb1401b9 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/main.c
+++ b/drivers/net/wireless/realtek/rtw88/main.c
@@ -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;
 }
@@ -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 {

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821c.c b/drivers/net/wireless/realtek/rtw88/rtw8821c.c
index a1ae1e7e59f67f8f91fc1a3dffe3e12895c70954..99eee128ae9454af8882567dd3ce1eac96fcc586 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8821c.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.c
@@ -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;
        }
 

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822b.c b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
index c9cedc349924a041e505388cd23fd2f989f37e10..eee7bf0354030b8a5c6df93f19ebb7a347cbaa18 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8822b.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
@@ -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;
        }
 

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.c b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
index 87ff1cf4ad7ec8e6975f6fff422dd0397d1f1550..cd74607a61a288258ce83254172b729a91f766f1 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
@@ -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;
        }
 

diff --git a/drivers/net/wireless/realtek/rtw88/sar.c b/drivers/net/wireless/realtek/rtw88/sar.c
index 3383726c4d90fc6509369caeac51376029cc5b04..c472f1502b82a714a7161f161a967cd6f4b5b058 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/sar.c
+++ b/drivers/net/wireless/realtek/rtw88/sar.c
@@ -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++) {