wifi: rtw89: 8922a: new implementation for RFK pre-notify H2C

For firmware version 0.35.31 and above, update H2C RFK
pre-notify to new implementation. Rename existing H2C
to v0 for backward compatibility.

Signed-off-by: Kuan-Chung Chen <damon.chen@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://patch.msgid.link/20240731070506.46100-2-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h
index fc31655d9e7cc8c8b88d7c24ef2574cbb4d78a6b..fec28f743eae16f5efc0678ef6fe8186769fce0a 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/core.h
+++ b/drivers/net/wireless/realtek/rtw89/core.h
@@ -4368,6 +4368,7 @@ enum rtw89_fw_feature {
        RTW89_FW_FEATURE_BEACON_FILTER,
        RTW89_FW_FEATURE_MACID_PAUSE_SLEEP,
        RTW89_FW_FEATURE_WOW_REASON_V1,
+       RTW89_FW_FEATURE_RFK_PRE_NOTIFY_V0,
 };
 
 struct rtw89_fw_suit {

diff --git a/drivers/net/wireless/realtek/rtw89/fw.c b/drivers/net/wireless/realtek/rtw89/fw.c
index b9bf9ae3a512123ac096bf0b777b99a1a8d1e5d3..fcbc7de48ddd86322a52548593f4d93ab91b7383 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/fw.c
+++ b/drivers/net/wireless/realtek/rtw89/fw.c
@@ -685,6 +685,7 @@ static const struct __fw_feat_cfg fw_feat_tbl[] = {
        __CFG_FW_FEAT(RTL8922A, ge, 0, 34, 35, 0, SCAN_OFFLOAD),
        __CFG_FW_FEAT(RTL8922A, ge, 0, 35, 12, 0, BEACON_FILTER),
        __CFG_FW_FEAT(RTL8922A, ge, 0, 35, 22, 0, WOW_REASON_V1),
+       __CFG_FW_FEAT(RTL8922A, lt, 0, 35, 31, 0, RFK_PRE_NOTIFY_V0),
 };
 
 static void rtw89_fw_iterate_feature_cfg(struct rtw89_fw_info *fw,
@@ -5136,14 +5137,21 @@ int rtw89_fw_h2c_rf_pre_ntfy(struct rtw89_dev *rtwdev,
                             enum rtw89_phy_idx phy_idx)
 {
        struct rtw89_rfk_mcc_info *rfk_mcc = &rtwdev->rfk_mcc;
+       struct rtw89_fw_h2c_rfk_pre_info_v0 *h2c_v0;
        struct rtw89_fw_h2c_rfk_pre_info *h2c;
        u8 tbl_sel = rfk_mcc->table_idx;
        u32 len = sizeof(*h2c);
        struct sk_buff *skb;
+       u8 ver = U8_MAX;
        u8 tbl, path;
        u32 val32;
        int ret;
 
+       if (RTW89_CHK_FW_FEATURE(RFK_PRE_NOTIFY_V0, &rtwdev->fw)) {
+               len = sizeof(*h2c_v0);
+               ver = 0;
+       }
+
        skb = rtw89_fw_h2c_alloc_skb_with_hdr(rtwdev, len);
        if (!skb) {
                rtw89_err(rtwdev, "failed to alloc skb for h2c rfk_pre_ntfy\n");
@@ -5152,41 +5160,53 @@ int rtw89_fw_h2c_rf_pre_ntfy(struct rtw89_dev *rtwdev,
        skb_put(skb, len);
        h2c = (struct rtw89_fw_h2c_rfk_pre_info *)skb->data;
 
-       h2c->mlo_mode = cpu_to_le32(rtwdev->mlo_dbcc_mode);
+       h2c->common.mlo_mode = cpu_to_le32(rtwdev->mlo_dbcc_mode);
 
        BUILD_BUG_ON(NUM_OF_RTW89_FW_RFK_TBL > RTW89_RFK_CHS_NR);
 
        for (tbl = 0; tbl < NUM_OF_RTW89_FW_RFK_TBL; tbl++) {
                for (path = 0; path < NUM_OF_RTW89_FW_RFK_PATH; path++) {
-                       h2c->dbcc.ch[path][tbl] = cpu_to_le32(rfk_mcc->ch[tbl]);
-                       h2c->dbcc.band[path][tbl] = cpu_to_le32(rfk_mcc->band[tbl]);
+                       h2c->common.dbcc.ch[path][tbl] =
+                               cpu_to_le32(rfk_mcc->ch[tbl]);
+                       h2c->common.dbcc.band[path][tbl] =
+                               cpu_to_le32(rfk_mcc->band[tbl]);
                }
        }
 
        for (path = 0; path < NUM_OF_RTW89_FW_RFK_PATH; path++) {
-               h2c->tbl.cur_ch[path] = cpu_to_le32(rfk_mcc->ch[tbl_sel]);
-               h2c->tbl.cur_band[path] = cpu_to_le32(rfk_mcc->band[tbl_sel]);
+               h2c->common.tbl.cur_ch[path] = cpu_to_le32(rfk_mcc->ch[tbl_sel]);
+               h2c->common.tbl.cur_band[path] = cpu_to_le32(rfk_mcc->band[tbl_sel]);
        }
 
-       h2c->phy_idx = cpu_to_le32(phy_idx);
-       h2c->cur_band = cpu_to_le32(rfk_mcc->band[tbl_sel]);
-       h2c->cur_bw = cpu_to_le32(rfk_mcc->bw[tbl_sel]);
-       h2c->cur_center_ch = cpu_to_le32(rfk_mcc->ch[tbl_sel]);
-
-       val32 = rtw89_phy_read32_mask(rtwdev, R_COEF_SEL, B_COEF_SEL_IQC_V1);
-       h2c->ktbl_sel0 = cpu_to_le32(val32);
-       val32 = rtw89_phy_read32_mask(rtwdev, R_COEF_SEL_C1, B_COEF_SEL_IQC_V1);
-       h2c->ktbl_sel1 = cpu_to_le32(val32);
-       val32 = rtw89_read_rf(rtwdev, RF_PATH_A, RR_CFGCH, RFREG_MASK);
-       h2c->rfmod0 = cpu_to_le32(val32);
-       val32 = rtw89_read_rf(rtwdev, RF_PATH_B, RR_CFGCH, RFREG_MASK);
-       h2c->rfmod1 = cpu_to_le32(val32);
+       h2c->common.phy_idx = cpu_to_le32(phy_idx);
 
-       if (rtw89_is_mlo_1_1(rtwdev))
-               h2c->mlo_1_1 = cpu_to_le32(1);
+       if (ver == 0) { /* RFK_PRE_NOTIFY_V0 */
+               h2c_v0 = (struct rtw89_fw_h2c_rfk_pre_info_v0 *)skb->data;
+
+               h2c_v0->cur_band = cpu_to_le32(rfk_mcc->band[tbl_sel]);
+               h2c_v0->cur_bw = cpu_to_le32(rfk_mcc->bw[tbl_sel]);
+               h2c_v0->cur_center_ch = cpu_to_le32(rfk_mcc->ch[tbl_sel]);
+
+               val32 = rtw89_phy_read32_mask(rtwdev, R_COEF_SEL, B_COEF_SEL_IQC_V1);
+               h2c_v0->ktbl_sel0 = cpu_to_le32(val32);
+               val32 = rtw89_phy_read32_mask(rtwdev, R_COEF_SEL_C1, B_COEF_SEL_IQC_V1);
+               h2c_v0->ktbl_sel1 = cpu_to_le32(val32);
+               val32 = rtw89_read_rf(rtwdev, RF_PATH_A, RR_CFGCH, RFREG_MASK);
+               h2c_v0->rfmod0 = cpu_to_le32(val32);
+               val32 = rtw89_read_rf(rtwdev, RF_PATH_B, RR_CFGCH, RFREG_MASK);
+               h2c_v0->rfmod1 = cpu_to_le32(val32);
 
-       h2c->rfe_type = cpu_to_le32(rtwdev->efuse.rfe_type);
+               if (rtw89_is_mlo_1_1(rtwdev))
+                       h2c_v0->mlo_1_1 = cpu_to_le32(1);
 
+               h2c_v0->rfe_type = cpu_to_le32(rtwdev->efuse.rfe_type);
+
+               goto done;
+       }
+
+       if (rtw89_is_mlo_1_1(rtwdev))
+               h2c->mlo_1_1 = cpu_to_le32(1);
+done:
        rtw89_h2c_pkt_set_hdr(rtwdev, skb, FWCMD_TYPE_H2C,
                              H2C_CAT_OUTSRC, H2C_CL_OUTSRC_RF_FW_RFK,
                              H2C_FUNC_RFK_PRE_NOTIFY, 0, 0,

diff --git a/drivers/net/wireless/realtek/rtw89/fw.h b/drivers/net/wireless/realtek/rtw89/fw.h
index 7d48383c6244d8f61466e41b2b441d280571560d..dccda3a126160ddc774029c2864bf0a3219861df 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/fw.h
+++ b/drivers/net/wireless/realtek/rtw89/fw.h
@@ -4106,7 +4106,7 @@ struct rtw89_fw_h2c_rf_get_mccch {
 #define NUM_OF_RTW89_FW_RFK_PATH 2
 #define NUM_OF_RTW89_FW_RFK_TBL 3
 
-struct rtw89_fw_h2c_rfk_pre_info {
+struct rtw89_fw_h2c_rfk_pre_info_common {
        struct {
                __le32 ch[NUM_OF_RTW89_FW_RFK_PATH][NUM_OF_RTW89_FW_RFK_TBL];
                __le32 band[NUM_OF_RTW89_FW_RFK_PATH][NUM_OF_RTW89_FW_RFK_TBL];
@@ -4119,6 +4119,11 @@ struct rtw89_fw_h2c_rfk_pre_info {
        } __packed tbl;
 
        __le32 phy_idx;
+} __packed;
+
+struct rtw89_fw_h2c_rfk_pre_info_v0 {
+       struct rtw89_fw_h2c_rfk_pre_info_common common;
+
        __le32 cur_band;
        __le32 cur_bw;
        __le32 cur_center_ch;
@@ -4138,6 +4143,11 @@ struct rtw89_fw_h2c_rfk_pre_info {
        } __packed mlo;
 } __packed;
 
+struct rtw89_fw_h2c_rfk_pre_info {
+       struct rtw89_fw_h2c_rfk_pre_info_common common;
+       __le32 mlo_1_1;
+} __packed;
+
 struct rtw89_h2c_rf_tssi {
        __le16 len;
        u8 phy;