wifi: rtw89: mcc: update format of RF notify MCC H2C command

The RF notify MCC H2C command format of 8852C different from other
chip, therefore add v0 format to update it.

Signed-off-by: Chih-Kang Chang <gary.chang@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://patch.msgid.link/20250610130034.14692-3-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h
index dca76b1c102943d991840f31c54380530c4b1378..8c2a71ecfc0d2adb83de86b0ec73eafdb93b6bf2 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/core.h
+++ b/drivers/net/wireless/realtek/rtw89/core.h
@@ -4525,6 +4525,7 @@ enum rtw89_fw_feature {
        RTW89_FW_FEATURE_NO_POWER_DIFFERENCE,
        RTW89_FW_FEATURE_BEACON_LOSS_COUNT_V1,
        RTW89_FW_FEATURE_SCAN_OFFLOAD_EXTRA_OP,
+       RTW89_FW_FEATURE_RFK_NTFY_MCC_V0,
 };
 
 struct rtw89_fw_suit {

diff --git a/drivers/net/wireless/realtek/rtw89/fw.c b/drivers/net/wireless/realtek/rtw89/fw.c
index 06fb97a05a8979f02eba4e6fe72bc0f53cebe6f9..cde22f692dc29a69ed77f7b43b43e5c3d8378c5e 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/fw.c
+++ b/drivers/net/wireless/realtek/rtw89/fw.c
@@ -833,6 +833,7 @@ static const struct __fw_feat_cfg fw_feat_tbl[] = {
        __CFG_FW_FEAT(RTL8852BT, ge, 0, 29, 91, 0, SCAN_OFFLOAD),
        __CFG_FW_FEAT(RTL8852BT, ge, 0, 29, 110, 0, BEACON_FILTER),
        __CFG_FW_FEAT(RTL8852C, le, 0, 27, 33, 0, NO_DEEP_PS),
+       __CFG_FW_FEAT(RTL8852C, ge, 0, 0, 0, 0, RFK_NTFY_MCC_V0),
        __CFG_FW_FEAT(RTL8852C, ge, 0, 27, 34, 0, TX_WAKE),
        __CFG_FW_FEAT(RTL8852C, ge, 0, 27, 36, 0, SCAN_OFFLOAD),
        __CFG_FW_FEAT(RTL8852C, ge, 0, 27, 40, 0, CRASH_TRIGGER),
@@ -5889,31 +5890,48 @@ fail:
 int rtw89_fw_h2c_rf_ntfy_mcc(struct rtw89_dev *rtwdev)
 {
        struct rtw89_rfk_mcc_info_data *rfk_mcc = rtwdev->rfk_mcc.data;
+       struct rtw89_fw_h2c_rf_get_mccch_v0 *mccch_v0;
        struct rtw89_fw_h2c_rf_get_mccch *mccch;
+       u32 len = sizeof(*mccch);
        struct sk_buff *skb;
+       u8 ver = U8_MAX;
        int ret;
        u8 idx;
 
-       skb = rtw89_fw_h2c_alloc_skb_with_hdr(rtwdev, sizeof(*mccch));
+       if (RTW89_CHK_FW_FEATURE(RFK_NTFY_MCC_V0, &rtwdev->fw)) {
+               len = sizeof(*mccch_v0);
+               ver = 0;
+       }
+
+       skb = rtw89_fw_h2c_alloc_skb_with_hdr(rtwdev, len);
        if (!skb) {
                rtw89_err(rtwdev, "failed to alloc skb for h2c cxdrv_ctrl\n");
                return -ENOMEM;
        }
-       skb_put(skb, sizeof(*mccch));
-       mccch = (struct rtw89_fw_h2c_rf_get_mccch *)skb->data;
+       skb_put(skb, len);
 
        idx = rfk_mcc->table_idx;
-       mccch->ch_0 = cpu_to_le32(rfk_mcc->ch[0]);
-       mccch->ch_1 = cpu_to_le32(rfk_mcc->ch[1]);
-       mccch->band_0 = cpu_to_le32(rfk_mcc->band[0]);
-       mccch->band_1 = cpu_to_le32(rfk_mcc->band[1]);
-       mccch->current_channel = cpu_to_le32(rfk_mcc->ch[idx]);
-       mccch->current_band_type = cpu_to_le32(rfk_mcc->band[idx]);
+       if (ver == 0) {
+               mccch_v0 = (struct rtw89_fw_h2c_rf_get_mccch_v0 *)skb->data;
+               mccch_v0->ch_0 = cpu_to_le32(rfk_mcc->ch[0]);
+               mccch_v0->ch_1 = cpu_to_le32(rfk_mcc->ch[1]);
+               mccch_v0->band_0 = cpu_to_le32(rfk_mcc->band[0]);
+               mccch_v0->band_1 = cpu_to_le32(rfk_mcc->band[1]);
+               mccch_v0->current_band_type = cpu_to_le32(rfk_mcc->band[idx]);
+               mccch_v0->current_channel = cpu_to_le32(rfk_mcc->ch[idx]);
+       } else {
+               mccch = (struct rtw89_fw_h2c_rf_get_mccch *)skb->data;
+               mccch->ch_0_0 = cpu_to_le32(rfk_mcc->ch[0]);
+               mccch->ch_0_1 = cpu_to_le32(rfk_mcc->ch[0]);
+               mccch->ch_1_0 = cpu_to_le32(rfk_mcc->ch[1]);
+               mccch->ch_1_1 = cpu_to_le32(rfk_mcc->ch[1]);
+               mccch->current_channel = cpu_to_le32(rfk_mcc->ch[idx]);
+       }
 
        rtw89_h2c_pkt_set_hdr(rtwdev, skb, FWCMD_TYPE_H2C,
                              H2C_CAT_OUTSRC, H2C_CL_OUTSRC_RF_FW_NOTIFY,
                              H2C_FUNC_OUTSRC_RF_GET_MCCCH, 0, 0,
-                             sizeof(*mccch));
+                             len);
 
        ret = rtw89_h2c_tx(rtwdev, skb, false);
        if (ret) {

diff --git a/drivers/net/wireless/realtek/rtw89/fw.h b/drivers/net/wireless/realtek/rtw89/fw.h
index 36abf1b592400bc395f15d826cf8c486d9804041..f9d5bcbc7c7e7429851cbe9fefe84be7320c6f1e 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/fw.h
+++ b/drivers/net/wireless/realtek/rtw89/fw.h
@@ -4356,6 +4356,14 @@ enum rtw89_rfk_offload_h2c_func {
 };
 
 struct rtw89_fw_h2c_rf_get_mccch {
+       __le32 ch_0_0;
+       __le32 ch_0_1;
+       __le32 ch_1_0;
+       __le32 ch_1_1;
+       __le32 current_channel;
+} __packed;
+
+struct rtw89_fw_h2c_rf_get_mccch_v0 {
        __le32 ch_0;
        __le32 ch_1;
        __le32 band_0;