wifi: rtw89: add C2H event handlers of RFK log and report

Trigger a RFK (RF calibration) in firmware by a H2C command, and in
progress it reports log and a result finally by C2H events. Firstly, add
prototype of the C2H event handlers to have a simple picture of framework.

The callers who trigger H2C will wait until a C2H event is received,
so we must process these C2H events in receiving process. Thus, mark this
kind of C2H events as atomic. Also, timestamp is also useful for
debugging, mark C2H events carrying RFK log as atomic as well.

Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://msgid.link/20231213005054.10568-5-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw89/fw.c b/drivers/net/wireless/realtek/rtw89/fw.c
index c1ebf1b13c0f40e2f23718ff0d27fa3166b09113..8c1065278faf5c370a1619381e26bb7e6000f192 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/fw.c
+++ b/drivers/net/wireless/realtek/rtw89/fw.c
@@ -3566,6 +3566,8 @@ static bool rtw89_fw_c2h_chk_atomic(struct rtw89_dev *rtwdev,
                return false;
        case RTW89_C2H_CAT_MAC:
                return rtw89_mac_c2h_chk_atomic(rtwdev, class, func);
+       case RTW89_C2H_CAT_OUTSRC:
+               return rtw89_phy_c2h_chk_atomic(rtwdev, class, func);
        }
 }
 

diff --git a/drivers/net/wireless/realtek/rtw89/phy.c b/drivers/net/wireless/realtek/rtw89/phy.c
index bfb1d8cfc53113e91c005be78307998c6b58503e..8a4a72b0034009b9823e3f1752c9027a782aa4ef 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/phy.c
+++ b/drivers/net/wireless/realtek/rtw89/phy.c
@@ -2445,6 +2445,85 @@ void (* const rtw89_phy_c2h_ra_handler[])(struct rtw89_dev *rtwdev,
        [RTW89_PHY_C2H_FUNC_TXSTS] = NULL,
 };
 
+static void
+rtw89_phy_c2h_rfk_log_iqk(struct rtw89_dev *rtwdev, struct sk_buff *c2h, u32 len)
+{
+}
+
+static void
+rtw89_phy_c2h_rfk_log_dpk(struct rtw89_dev *rtwdev, struct sk_buff *c2h, u32 len)
+{
+}
+
+static void
+rtw89_phy_c2h_rfk_log_dack(struct rtw89_dev *rtwdev, struct sk_buff *c2h, u32 len)
+{
+}
+
+static void
+rtw89_phy_c2h_rfk_log_rxdck(struct rtw89_dev *rtwdev, struct sk_buff *c2h, u32 len)
+{
+}
+
+static void
+rtw89_phy_c2h_rfk_log_tssi(struct rtw89_dev *rtwdev, struct sk_buff *c2h, u32 len)
+{
+}
+
+static void
+rtw89_phy_c2h_rfk_log_txgapk(struct rtw89_dev *rtwdev, struct sk_buff *c2h, u32 len)
+{
+}
+
+static
+void (* const rtw89_phy_c2h_rfk_log_handler[])(struct rtw89_dev *rtwdev,
+                                              struct sk_buff *c2h, u32 len) = {
+       [RTW89_PHY_C2H_RFK_LOG_FUNC_IQK] = rtw89_phy_c2h_rfk_log_iqk,
+       [RTW89_PHY_C2H_RFK_LOG_FUNC_DPK] = rtw89_phy_c2h_rfk_log_dpk,
+       [RTW89_PHY_C2H_RFK_LOG_FUNC_DACK] = rtw89_phy_c2h_rfk_log_dack,
+       [RTW89_PHY_C2H_RFK_LOG_FUNC_RXDCK] = rtw89_phy_c2h_rfk_log_rxdck,
+       [RTW89_PHY_C2H_RFK_LOG_FUNC_TSSI] = rtw89_phy_c2h_rfk_log_tssi,
+       [RTW89_PHY_C2H_RFK_LOG_FUNC_TXGAPK] = rtw89_phy_c2h_rfk_log_txgapk,
+};
+
+static void
+rtw89_phy_c2h_rfk_report_state(struct rtw89_dev *rtwdev, struct sk_buff *c2h, u32 len)
+{
+}
+
+static
+void (* const rtw89_phy_c2h_rfk_report_handler[])(struct rtw89_dev *rtwdev,
+                                                 struct sk_buff *c2h, u32 len) = {
+       [RTW89_PHY_C2H_RFK_REPORT_FUNC_STATE] = rtw89_phy_c2h_rfk_report_state,
+};
+
+bool rtw89_phy_c2h_chk_atomic(struct rtw89_dev *rtwdev, u8 class, u8 func)
+{
+       switch (class) {
+       case RTW89_PHY_C2H_RFK_LOG:
+               switch (func) {
+               case RTW89_PHY_C2H_RFK_LOG_FUNC_IQK:
+               case RTW89_PHY_C2H_RFK_LOG_FUNC_DPK:
+               case RTW89_PHY_C2H_RFK_LOG_FUNC_DACK:
+               case RTW89_PHY_C2H_RFK_LOG_FUNC_RXDCK:
+               case RTW89_PHY_C2H_RFK_LOG_FUNC_TSSI:
+               case RTW89_PHY_C2H_RFK_LOG_FUNC_TXGAPK:
+                       return true;
+               default:
+                       return false;
+               }
+       case RTW89_PHY_C2H_RFK_REPORT:
+               switch (func) {
+               case RTW89_PHY_C2H_RFK_REPORT_FUNC_STATE:
+                       return true;
+               default:
+                       return false;
+               }
+       default:
+               return false;
+       }
+}
+
 void rtw89_phy_c2h_handle(struct rtw89_dev *rtwdev, struct sk_buff *skb,
                          u32 len, u8 class, u8 func)
 {
@@ -2456,6 +2535,14 @@ void rtw89_phy_c2h_handle(struct rtw89_dev *rtwdev, struct sk_buff *skb,
                if (func < RTW89_PHY_C2H_FUNC_RA_MAX)
                        handler = rtw89_phy_c2h_ra_handler[func];
                break;
+       case RTW89_PHY_C2H_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:
+               if (func < ARRAY_SIZE(rtw89_phy_c2h_rfk_report_handler))
+                       handler = rtw89_phy_c2h_rfk_report_handler[func];
+               break;
        case RTW89_PHY_C2H_CLASS_DM:
                if (func == RTW89_PHY_C2H_DM_FUNC_LOWRT_RTY)
                        return;

diff --git a/drivers/net/wireless/realtek/rtw89/phy.h b/drivers/net/wireless/realtek/rtw89/phy.h
index b60bc563d86f8137fe2c648436310495999380cf..3e379077c6cadc05a9d1731aa391c4599cf71296 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/phy.h
+++ b/drivers/net/wireless/realtek/rtw89/phy.h
@@ -147,6 +147,10 @@ enum rtw89_phy_c2h_rfk_log_func {
        RTW89_PHY_C2H_RFK_LOG_FUNC_NUM,
 };
 
+enum rtw89_phy_c2h_rfk_report_func {
+       RTW89_PHY_C2H_RFK_REPORT_FUNC_STATE = 0,
+};
+
 enum rtw89_phy_c2h_dm_func {
        RTW89_PHY_C2H_DM_FUNC_FW_TEST,
        RTW89_PHY_C2H_DM_FUNC_FW_TRIG_TX_RPT,
@@ -160,6 +164,8 @@ enum rtw89_phy_c2h_class {
        RTW89_PHY_C2H_CLASS_RUA,
        RTW89_PHY_C2H_CLASS_RA,
        RTW89_PHY_C2H_CLASS_DM,
+       RTW89_PHY_C2H_RFK_LOG = 0x8,
+       RTW89_PHY_C2H_RFK_REPORT = 0x9,
        RTW89_PHY_C2H_CLASS_BTC_MIN = 0x10,
        RTW89_PHY_C2H_CLASS_BTC_MAX = 0x17,
        RTW89_PHY_C2H_CLASS_MAX,
@@ -800,6 +806,7 @@ void rtw89_phy_ra_updata_sta(struct rtw89_dev *rtwdev, struct ieee80211_sta *sta
 void rtw89_phy_rate_pattern_vif(struct rtw89_dev *rtwdev,
                                struct ieee80211_vif *vif,
                                const struct cfg80211_bitrate_mask *mask);
+bool rtw89_phy_c2h_chk_atomic(struct rtw89_dev *rtwdev, u8 class, u8 func);
 void rtw89_phy_c2h_handle(struct rtw89_dev *rtwdev, struct sk_buff *skb,
                          u32 len, u8 class, u8 func);
 void rtw89_phy_cfo_track(struct rtw89_dev *rtwdev);