There are more unsupported functions than just LOWRT_RTY. Improve on
commit 3b66519b023b ("wifi: rtw89: phy: add dummy c2h handler to avoid
warning message") by printing a message just once when we first
encounter an unsupported class. Do the same for each unsupported func of
the supported classes. This prevents messages like
rtw89_8922ae 0000:81:00.0: PHY c2h class 2 not support
from filling up dmesg.
Signed-off-by: Sean Anderson <sean.anderson@xxxxxxxxx>
---
Changes in v2:
- Also suppress unsupported func messages
drivers/net/wireless/realtek/rtw89/phy.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtw89/phy.c b/drivers/net/wireless/realtek/rtw89/phy.c
index f4eee642e5ce..9484d80eea9b 100644
--- a/drivers/net/wireless/realtek/rtw89/phy.c
+++ b/drivers/net/wireless/realtek/rtw89/phy.c
@@ -3535,17 +3535,25 @@ void rtw89_phy_c2h_handle(struct rtw89_dev *rtwdev, struct sk_buff *skb,
{
void (*handler)(struct rtw89_dev *rtwdev,
struct sk_buff *c2h, u32 len) = NULL;
+ static DECLARE_BITMAP(printed_ra, U8_MAX);
+ static DECLARE_BITMAP(printed_rfk_log, U8_MAX);
+ static DECLARE_BITMAP(printed_rfk_report, U8_MAX);
+ static DECLARE_BITMAP(printed_class, U8_MAX);
+ unsigned long *printed;
switch (class) {
case RTW89_PHY_C2H_CLASS_RA:
+ printed = printed_ra;
if (func < RTW89_PHY_C2H_FUNC_RA_MAX)
handler = rtw89_phy_c2h_ra_handler[func];
break;
case RTW89_PHY_C2H_RFK_LOG:
+ printed = printed_rfk_log;
if (func < ARRAY_SIZE(rtw89_phy_c2h_rfk_log_handler))
handler = rtw89_phy_c2h_rfk_log_handler[func];
break;
case RTW89_PHY_C2H_RFK_REPORT:
+ printed = printed_rfk_report;
if (func < ARRAY_SIZE(rtw89_phy_c2h_rfk_report_handler))
handler = rtw89_phy_c2h_rfk_report_handler[func];
break;
@@ -3554,12 +3562,16 @@ void rtw89_phy_c2h_handle(struct rtw89_dev *rtwdev, struct sk_buff *skb,
return;
fallthrough;
default:
- rtw89_info(rtwdev, "PHY c2h class %d not support\n", class);
+ if (!test_and_set_bit(class, printed_class))
+ rtw89_info(rtwdev, "PHY c2h class %d not supported\n",
+ class);
return;
}
if (!handler) {
- rtw89_info(rtwdev, "PHY c2h class %d func %d not support\n", class,
- func);
+ if (!test_and_set_bit(func, printed))
+ rtw89_info(rtwdev,
+ "PHY c2h class %d func %d not supported\n",
+ class, func);
return;
}
handler(rtwdev, skb, len);
--
2.35.1.1320.gc452695387.dirty
